[SD] Add some overhead for pico2, generate json checksum data script

Author: brentru

config.json

@@ -0,0 +1 @@
+{"exportVersion": "1.0.0", "exportedBy": "tester", "exportedAt": "2024-10-28T18:58:23.976Z", "exportedFromDevice": {"board": "metroesp32s3", "firmwareVersion": "1.0.0-beta.93", "referenceVoltage": 2.6, "totalGPIOPins": 11, "totalAnalogPins": 6, "rtc": "DS3231", "statusLEDBrightness": 0.1}, "components": [{"componentAPI": "analogio", "name": "Analog Pin", "pinName": "A0", "type": "analog_pin", "mode": "ANALOG", "direction": "INPUT", "sampleMode": "TIMER", "analogReadMode": "PIN_VALUE", "period": 30}, {"componentAPI": "ds18x20", "name": "DS18B20: Temperature Sensor (\u00b0F)", "sensorTypeCount": 2, "sensorType1": "object-temp-fahrenheit", "sensorType2": "object-temp", "pinName": "D4", "sensorResolution": 12, "period": 30}], "checksum": 236}

generate_json_checksum.py

@@ -0,0 +1,26 @@
+# generates the 8-bit checksum from a JSON file, provided its path is given as an argument
+import sys
+import json
+
+# load json file from provided path
+with open(sys.argv[1], 'r') as f:
+    json_data = json.load(f)
+if not json_data:
+    print("Error: JSON file did not contain any data or path didn't match exactly, exiting...")
+    exit(1)
+
+# convert json dict->string and sum
+str_json_data = json.dumps(json_data)
+sum_json_data = sum(bytearray(str_json_data.encode()))
+print('Sum (hex): ', hex(sum_json_data))
+
+# calculate checksum
+calculated_checksum = sum(bytearray(str_json_data.encode())) & 0xFF
+print('Checksum: ', calculated_checksum)
+print('Checksum (hex): ', hex(calculated_checksum))
+
+# store and write checksum to new file
+json_data['checksum'] = calculated_checksum
+with open(sys.argv[1], 'w') as f:
+    json.dump(json_data, f)
+print('SUCCESS: Checksum written to JSON file!')

platformio.ini

@@ -409,6 +409,15 @@ build_flags = -DUSE_TINYUSB=1
               -DADAFRUIT_METRO_M4_AIRLIFT_LITE
 upload_port = /dev/cu.usbmodem1201
 
+[env:raspberrypi_pico_2]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#develop
+board = rpipico2
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git
+board_build.filesystem_size = 0.5m
+build_flags = -DUSE_TINYUSB
+; Once https://github.com/platformio/platformio-core > 6.1.11 these can be removed
+lib_ignore = WiFiNINA, WiFi101, Adafruit Zero DMA Library
+lib_compat_mode = soft  ; can be strict once pio detects SleepyDog on RP2350
 
 [env:raspberypi_picow]
 extends = common:rp2040

src/Wippersnapper_Boards.h

@@ -206,6 +206,12 @@
 #define USE_STATUS_LED
 #define STATUS_LED_PIN 32
 #define SD_CS_PIN 17
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_2)
+#define BOARD_ID "rpi-pico-2"
+#define USE_TINYUSB
+#define USE_STATUS_LED
+#define STATUS_LED_PIN LED_BUILTIN
+#define SD_CS_PIN 17
 #else
 #warning "Board type not identified within Wippersnapper_Boards.h!"
 #endif

src/Wippersnapper_V2.cpp

@@ -1097,8 +1097,8 @@ void Wippersnapper_V2::pingBrokerV2() {
 void Wippersnapper_V2::feedWDTV2() {
     #ifndef OFFLINE_MODE_WOKWI
     // TODO: This is a temporary fix for watchdog.reset() not firing
-    // Watchdog.reset();
-    esp_task_wdt_reset();
+    Watchdog.reset();
+    //esp_task_wdt_reset(); // TODO: Putback for ESP32 WDT
     #endif
 }
 

src/components/analogIO/hardware.cpp

@@ -140,6 +140,6 @@ float AnalogIOHardware::GetPinVoltage(uint8_t pin) {
 #ifdef ARDUINO_ARCH_ESP32
   return analogReadMilliVolts(pin) / 1000.0;
 #else
-  return (getPinValue(pin) * _ref_voltage) / 65536;
+  return (GetPinValue(pin) * _ref_voltage) / 65536;
 #endif // ARDUINO_ARCH_ESP32
 }

src/provisioning/tinyusb/Wippersnapper_FS_V2.cpp

@@ -26,7 +26,8 @@
     defined(ARDUINO_RASPBERRY_PI_PICO_W) ||                                    \
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT) ||                        \
     defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT) ||                        \
-    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2)
+    defined(ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2) || \
+    defined(ARDUINO_RASPBERRY_PI_PICO_2)
 #include "Wippersnapper_FS_V2.h"
 // On-board external flash (QSPI or SPI) macros should already
 // defined in your board variant if supported