Revert breaking change

Aircoookie · Mar 20, 2024 · 33fe68d · 33fe68d
1 parent 2dafa96
commit 33fe68d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/usermods/usermod_v2_four_line_display_ALT/readme.md b/usermods/usermod_v2_four_line_display_ALT/readme.md
@@ -56,10 +56,10 @@ These options are configurable in Config > Usermods
     * 3 = I2C SSD1306 128x64 (4 double-height lines)
     * 4 = I2C SSD1305 128x32
     * 5 = I2C SSD1305 128x64 (4 double-height lines)
-    * 6 = I2C SSD1309 128x64 (4 double-height lines)
-    * 7 = SPI SSD1306 128x32
-    * 8 = SPI SSD1306 128x64 (4 double-height lines)
-    * 9 = SPI SSD1309 128x64 (4 double-height lines)
+    * 6 = SPI SSD1306 128x32
+    * 7 = SPI SSD1306 128x64 (4 double-height lines)
+    * 8 = SPI SSD1309 128x64 (4 double-height lines)
+    * 9 = I2C SSD1309 128x64 (4 double-height lines)
 * `pin` - GPIO pins used for display; SPI displays can use SCK, MOSI, CS, DC & RST
 * `flip` - flip/rotate display 180°
 * `contrast` - set display contrast (higher contrast may reduce display lifetime)

diff --git a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h
@@ -87,10 +87,10 @@ typedef enum {
   SSD1306_64,       // U8X8_SSD1306_128X64_NONAME_HW_I2C
   SSD1305,          // U8X8_SSD1305_128X32_ADAFRUIT_HW_I2C
   SSD1305_64,       // U8X8_SSD1305_128X64_ADAFRUIT_HW_I2C
-  SSD1309_64,       // U8X8_SSD1309_128X64_NONAME0_HW_I2C
   SSD1306_SPI,      // U8X8_SSD1306_128X32_NONAME_HW_SPI
   SSD1306_SPI64,    // U8X8_SSD1306_128X64_NONAME_HW_SPI
-  SSD1309_SPI64     // U8X8_SSD1309_128X64_NONAME0_4W_HW_SPI
+  SSD1309_SPI64,    // U8X8_SSD1309_128X64_NONAME0_4W_HW_SPI
+  SSD1309_64        // U8X8_SSD1309_128X64_NONAME0_HW_I2C
 } DisplayType;
 
 
@@ -1207,10 +1207,10 @@ void FourLineDisplayUsermod::appendConfigData() {
   oappend(SET_F("addOption(dd,'SSD1306 128x64',3);"));
   oappend(SET_F("addOption(dd,'SSD1305',4);"));
   oappend(SET_F("addOption(dd,'SSD1305 128x64',5);"));
-  oappend(SET_F("addOption(dd,'SSD1309 128x64',6);"));
-  oappend(SET_F("addOption(dd,'SSD1306 SPI',7);"));
-  oappend(SET_F("addOption(dd,'SSD1306 SPI 128x64',8);"));
-  oappend(SET_F("addOption(dd,'SSD1309 SPI 128x64',9);"));
+  oappend(SET_F("addOption(dd,'SSD1309 128x64',9);"));
+  oappend(SET_F("addOption(dd,'SSD1306 SPI',6);"));
+  oappend(SET_F("addOption(dd,'SSD1306 SPI 128x64',7);"));
+  oappend(SET_F("addOption(dd,'SSD1309 SPI 128x64',8);"));
   oappend(SET_F("addInfo('4LineDisplay:type',1,'<br><i class=\"warn\">Change may require reboot</i>','');"));
   oappend(SET_F("addInfo('4LineDisplay:pin[]',0,'','SPI CS');"));
   oappend(SET_F("addInfo('4LineDisplay:pin[]',1,'','SPI DC');"));