v2.1.3 (#5) RP2350 support & minor UI/UX improvements

Author: VuqarAhadli

include/apps/tools/calc.h

@@ -1,7 +1,11 @@
 #ifndef CALC_H
 #define CALC_H
 
-#define E  2.71828182845904523536
+#include <cstddef>
+
+namespace calc_consts {
+	static constexpr double CALC_E = 2.71828182845904523536;
+}
 
 #include <string> 
 

include/coresys/commands.h

@@ -24,8 +24,6 @@
 #include "tools/utils.h"
 #include "tools/sysinfo.h"
 #include "tools/settings.h"
-#include <esp_system.h>
-#include <WiFi.h>
 #include <math.h>
 #include <string>
 #include <sstream>

include/coresys/config.h

@@ -22,12 +22,22 @@
     #define TFT_RST 4 
 
     #define DEVICE_NAME "ESP32-S3"
+
+#elif defined(DEVICE_RP2350)
+    #define TFT_CS   17
+    #define TFT_RST  20
+    #define TFT_DC   26
+    #define TFT_MOSI 19
+    #define TFT_SCLK 18
+
+    #define DEVICE_NAME "RP-2350"
 #else
     // Default fallback (ESP32 Standard)
     #define TFT_CS 5
     #define TFT_DC 2
     #define TFT_RST 4
     #define DEVICE_NAME "ESP32"
+
 #endif
 
 // #define MAX_Y    230

include/drivers/display.h

@@ -3,6 +3,9 @@
 #include <Arduino.h>
 #include <Adafruit_ST7789.h>
 #include <string>
+#if defined(DEVICE_RP2350) && !defined(__FREERTOS)
+#define __FREERTOS 1
+#endif
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
 

include/drivers/network.h

@@ -2,11 +2,12 @@
 #define NETWORK_H
 
 #include <Arduino.h>
-#include <WiFi.h>
-#include <HTTPClient.h>
 #include <string>
 #include "tools/network_utils.h"
 
+#if !defined(DEVICE_RP2350)
+#include <WiFi.h>
+#endif
 
 extern std::string WIFI_SSID;
 extern std::string WIFI_PASS;

include/kernel/kernel.h

@@ -2,6 +2,9 @@
 #define KERNEL_H
 
 #include <Arduino.h>
+#if defined(DEVICE_RP2350) && !defined(__FREERTOS)
+#define __FREERTOS 1
+#endif
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include <vector>

platformio.ini

@@ -6,7 +6,6 @@ lib_deps =
 
 [common_flags]
 build_flags =
-    -DCONFIG_ESP_TASK_WDT_TIMEOUT_S=10
     -I include
     -I include/apps
     -I include/coresys
@@ -28,6 +27,7 @@ monitor_speed = 115200
 
 build_flags = 
     ${common_flags.build_flags}
+    -DCONFIG_ESP_TASK_WDT_TIMEOUT_S=10
     -DDEVICE_ESP32_STANDARD
 
 ; 240MHz
@@ -45,8 +45,26 @@ monitor_speed = 115200
 
 build_flags = 
     ${common_flags.build_flags}
+    -DCONFIG_ESP_TASK_WDT_TIMEOUT_S=10
     -DDEVICE_ESP32_S3
     -DSTS_SPI_SPEED=40000000 
 
 ; 240MHz
-board_build.f_cpu = 240000000L
+board_build.f_cpu = 240000000L
+
+[env:waveshare_rp2350_pizero]
+platform = raspberrypi
+board = waveshare_rp2350_pizero
+framework = arduino
+
+lib_deps = 
+    https://github.com/adafruit/Adafruit-ST7735-Library
+    https://github.com/adafruit/Adafruit-GFX-Library
+    
+
+build_flags = 
+    ${common_flags.build_flags}
+    -DDEVICE_RP2350
+    -D__FREERTOS=1
+    -DSTS_SPI_SPEED=40000000 
+    -fexceptions

src/apps/games/coin.cpp

@@ -2,7 +2,18 @@
 #include "coin.h"
 #include <cstdlib>
 #include <time.h>
+#if !defined(DEVICE_RP2350)
 #include <esp_random.h>
+#endif
+
+static uint32_t getRandom32() {
+#if !defined(DEVICE_RP2350)
+    return esp_random();
+#else
+    return ((uint32_t)std::rand() << 17) ^ ((uint32_t)std::rand() << 2) ^ (uint32_t)(std::rand() & 1);
+#endif
+}
+
 static const int CX = X_MAX / 2;
 static const int CY = Y_MAX / 2 - 10;
 static const int R  = 80;  
@@ -96,13 +107,12 @@ void coinGame() {
             }
 
             if (doFlip) {
-                CoinState state = (CoinState)((esp_random() >> 31) & 1);
+                    CoinState state = (CoinState)((getRandom32() >> 31) & 1);
 
 
                 for (int f = 0; f < 3; f++) {
                     eraseCoin();
-                    CoinState fake = (CoinState)((esp_random() >> 31) & 1);
-                    drawCoin(fake);
+                    CoinState fake = (CoinState)((getRandom32() >> 31) & 1);
                     vTaskDelay(65 / portTICK_PERIOD_MS);
                 }
 

src/apps/misc/grapher.cpp

@@ -7,7 +7,6 @@
 #include <cmath>
 #include <string>
 
-#define E 2.71828182845904523536
 
 namespace Operation{
     /*
@@ -73,8 +72,8 @@ bool evaluateWithX(const std::string& expression, float xValue, float& result) {
     }
     pos = expr.find("e");
     while (pos != std::string::npos) {
-        expr.replace(pos, 1, std::to_string(E));
-        pos = expr.find("e", pos + std::to_string(E).length());
+        expr.replace(pos, 1, std::to_string(calc_consts::CALC_E));
+        pos = expr.find("e", pos + std::to_string(calc_consts::CALC_E).length());
     }
 
     if (expr.length() == 0) {

src/apps/misc/timeutils.cpp

@@ -7,9 +7,14 @@
 #include "config.h"
 #include "pug.h"
 #include "timeutils.h"
+#if !defined(DEVICE_RP2350)
 #include <WiFi.h>
 #include <HTTPClient.h>
+#endif
 #include <time.h>
+#if defined(DEVICE_RP2350) && !defined(__FREERTOS)
+#define __FREERTOS 1
+#endif
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include <string>
@@ -18,6 +23,7 @@
 Alarm systemAlarm = {false, 0, 0, ""};
 
 void syncTime() {
+#if !defined(DEVICE_RP2350)
     if (WiFi.status() != WL_CONNECTED) {
         printLine("WiFi not connected.");
         printLine("Use 'wifi' first.");
@@ -42,6 +48,9 @@ void syncTime() {
         printLine("");
         printLine("Time sync failed.");
     }
+#else
+    printLine("Time sync is not supported on this device.");
+#endif
 
     vTaskDelay(pdMS_TO_TICKS(100));
     while (Serial.available() > 0) {