Fix partition layout for ipstube clock

judge2005 · Dec 7, 2024 · 413849a · 413849a
1 parent 4279c30
commit 413849a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -15,8 +15,8 @@ framework = arduino
 platform_packages = framework-arduinoespressif32 @ 3.20014.231204
 board_build.partitions = partitions.csv
 board_build.filesystem = littlefs
-upload_port = /dev/cu.usbserial-1330
-monitor_port = /dev/cu.usbserial-1330
+upload_port = /dev/cu.usbserial-1320
+monitor_port = /dev/cu.usbserial-1320
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder
 build_flags = 

diff --git a/src/main.cpp b/src/main.cpp
@@ -59,7 +59,7 @@ IRAMPtrArray<char*> manifest {
 	"Unknown clock hardware",
 #endif
 	// Firmware version
-	"1.6.0",
+	"1.6.1",
 	// Hardware chip/variant
 	"ESP32",
 	// Device name
@@ -127,7 +127,21 @@ String ssid("EleksTubeIPS");
 String chipId = getChipId();
 
 // Persistent Configuration
+#if defined(HARDWARE_PunkCyber_CLOCK)
+StringConfigItem hostName("hostname", 63, "punkcyber");
+#elif defined(HARDWARE_Elekstube_CLOCK)
 StringConfigItem hostName("hostname", 63, "elekstubeips");
+#elif defined(HARDWARE_Elekstube_CLOCK_V2)
+StringConfigItem hostName("hostname", 63, "elekstubeipsv2");
+#elif defined(HARDWARE_NovelLife_SE_CLOCK)
+StringConfigItem hostName("hostname", 63, "novellifese");
+#elif defined(HARDWARE_SI_HAI_CLOCK)
+StringConfigItem hostName("hostname", 63, "sihai");
+#elif defined(HARDWARE_IPSTube_CLOCK)
+StringConfigItem hostName("hostname", 63, "ipstube");
+#else
+StringConfigItem hostName("hostname", 63, "ipsclock");
+#endif
 
 // Clock config
 

diff --git a/version.py b/version.py
@@ -1 +1 @@
-version = "1.6.0"
+version = "1.6.1"
diff --git a/web/esp-web-tools-manifest-ipstube-firmware-only.json b/web/esp-web-tools-manifest-ipstube-firmware-only.json
@@ -1,13 +1,13 @@
 {
-    "name": "EleksTubeIPS V1 Replacement Firmware",
+    "name": "IPSTube Replacement Firmware",
     "version": "$version$",
     "new_install_prompt_erase": true,
     "builds": [
       {
         "chipFamily": "ESP32",
         "improv": false,
         "parts": [
-          { "path": "firmware-elekstubev1-$version$.bin", "offset": 65536 }
+          { "path": "firmware-ipstube-$version$.bin", "offset": 65536 }
         ]
       }
     ]

diff --git a/web/esp-web-tools-manifest-ipstube.json b/web/esp-web-tools-manifest-ipstube.json
@@ -9,10 +9,10 @@
         "improv": false,
         "parts": [
           { "path": "bootloader.bin", "offset": 4096 },
-          { "path": "partitions.bin", "offset": 32768 },
+          { "path": "partitions8MB.bin", "offset": 32768 },
           { "path": "boot_app0.bin", "offset": 57344 },
           { "path": "firmware-ipstube-$version$.bin", "offset": 65536 },
-          { "path": "littlefs-$version$.bin", "offset": 1572864 }
+          { "path": "littlefs8MB-$version$.bin", "offset": 1572864 }
         ]
       }
     ]