Added missing ship mode to merged branch

Author: bitbank2

include/qa.h

@@ -10,4 +10,14 @@ void testResultScreen(bool result);
 
 bool checkIfAlreadyPassed();
 
-void savePassedTest();
+void savePassedTest();
+
+bool checkIfAlreadyShipped();
+
+bool saveShipmentDone();
+
+bool checkIfShipmentStarted();
+
+bool saveShipmentStarted();
+
+bool enableShipmentMode();

platformio.ini

@@ -28,7 +28,8 @@ lib_deps =
 
 [env]
 framework = arduino, espidf
-platform = espressif32@6.12.0
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
+; platform = espressif32@6.12.0
 ; platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.32/platform-espressif32.zip
 check_tool = clangtidy
 check_flags =
@@ -124,6 +125,12 @@ build_flags =
 	-D BOARD_TRMNL
 	-D PNG_MAX_BUFFERED_PIXELS=6432
 
+board_build.embed_txtfiles =
+    managed_components/espressif__esp_insights/server_certs/https_server.crt
+  	managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
+    managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
+    managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
+
 [env:trmnl_4clr]
 extends = env:esp32-c3-devkitc-02
 extra_scripts = scripts/git_version.py
@@ -159,6 +166,12 @@ build_flags =
 	# light sleep interrupts the serial connection and we miss logs
 	-D DO_NOT_LIGHT_SLEEP=1
 
+board_build.embed_txtfiles =
+    managed_components/espressif__esp_insights/server_certs/https_server.crt
+  	managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
+    managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
+    managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
+
 [env:seeed_xiao_esp32c3]
 extends = env:esp32_base
 board = seeed_xiao_esp32c3

src/main.cpp

@@ -3,7 +3,62 @@
 #include "esp_ota_ops.h" 
 #include "qa.h"
 
+#ifdef BOARD_TRMNL_X
+#include "display.h"
+#include "esp_sleep.h"
+#include "filesystem.h"
+#include "modem.h"
+#include "logo_medium.h"
 
+// TRMNL X setup (quite different from OG)
+void setup()
+{
+#ifndef NO_QA
+
+  bool isShipped = checkIfAlreadyShipped();
+  if (!isShipped) {
+   bool shipmentStarted = checkIfShipmentStarted();
+
+   if (shipmentStarted && check_usb_power()) {
+      // Battery died during shipping, now powered by USB charger
+      // Skip shipment mode and mark as complete
+      saveShipmentDone();
+      ESP.restart();
+   }
+   else {
+      Serial.begin(115200);
+      display_init();
+      filesystem_init();
+
+      Serial.println("[MODEM] Resetting modem...");
+
+      modem_reset_target();
+      delay(500);  // let modem reach bootloader
+
+      display_show_msg(const_cast<uint8_t *>(logo_medium),MODEM_FLASHING);
+
+      Modem modem(115200);
+      if (modem.flashFromFile("/system/factory_ESP32C5-4MB.bin")) {
+        Serial.println("[MODEM] Factory flash complete.");
+      }
+      else {
+        Serial.println("[MODEM] Factory flash FAILED.");
+      }
+
+      display_show_msg(const_cast<uint8_t *>(logo_medium),READY_TO_SHIP);
+      // enableShipmentMode() will block until charger is connected
+      enableShipmentMode();
+
+      // Charger detected, save shipment status to preferences
+      saveShipmentDone();
+      ESP.restart();
+   }
+  }
+#endif // NO_QA
+
+  bl_init();
+}
+#else // TRMNL OG setup()
 void setup()
 {
 
@@ -14,6 +69,7 @@ void setup()
   esp_ota_mark_app_valid_cancel_rollback();
   bl_init();
 }
+#endif // !BOARD_TRMNL_X
 
 void loop()
 {