[ESP32-C6] WebTop update

lyusupov · Sep 9, 2024 · ec2c761 · ec2c761
1 parent 530321e
commit ec2c761
Show file tree

Hide file tree

Showing 8 changed files with 532 additions and 64 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -467,20 +467,20 @@ jobs:
             fi ;
           #fi ;
           if [[ "$BOARD" =~ "esp32:esp32:esp32h2" ]]; then
-            #  SkyView is not available for H2
+            #  SkyWatch is not available for H2
             true ;
           else
             if [[ "$BOARD" =~ "esp32:esp32:"       ]]; then
-            rm -rf $HOME/Arduino/libraries/ArduinoBLE-${ARDUINO_BLE_VERSION} ;
-            arduino --verify --verbose-build --board $BOARD $PWD/software/firmware/source/SkyView/SkyView.ino ;
+            arduino --verify                 --board $BOARD $PWD/software/firmware/source/SkyWatch/SkyWatch.ino ;
             fi ;
           fi ;
           if [[ "$BOARD" =~ "esp32:esp32:esp32h2" ]]; then
-            #  SkyWatch is not available for H2
+            #  SkyView is not available for H2
             true ;
           else
             if [[ "$BOARD" =~ "esp32:esp32:"       ]]; then
-            arduino --verify                 --board $BOARD $PWD/software/firmware/source/SkyWatch/SkyWatch.ino ;
+            rm -rf $HOME/Arduino/libraries/ArduinoBLE-${ARDUINO_BLE_VERSION} ;
+            arduino --verify --verbose-build --board $BOARD $PWD/software/firmware/source/SkyView/SkyView.ino ;
             fi ;
           fi ;
           if [[ "$BOARD" =~ "STM32:stm32:"         ]]; then

diff --git a/software/firmware/source/SkyView/WebHelper.cpp b/software/firmware/source/SkyView/WebHelper.cpp
@@ -135,7 +135,8 @@ void handleSettings() {
   size -= len;
 
   /* SoC specific part 1 */
-  if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S2 || SoC->id == SOC_ESP32C3) {
+  if (SoC->id == SOC_ESP32   || SoC->id == SOC_ESP32S2 ||
+      SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6) {
     snprintf_P ( offset, size,
       PSTR("\
 <tr>\
@@ -225,7 +226,8 @@ void handleSettings() {
 
   /* SoC specific part 4 */
   if (SoC->id == SOC_ESP32   || SoC->id == SOC_ESP32S3 ||
-      SoC->id == SOC_ESP32C3 || SoC->id == SOC_RP2040) {
+      SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6 ||
+      SoC->id == SOC_RP2040) {
     snprintf_P ( offset, size, PSTR("<option %s value='%d'>Bluetooth LE</option>"),
     (settings->connection == CON_BLUETOOTH_LE  ? "selected" : ""), CON_BLUETOOTH_LE);
     len = strlen(offset);
@@ -282,7 +284,7 @@ void handleSettings() {
   /* SoC specific part 6 */
   if (SoC->id == SOC_ESP32   || SoC->id == SOC_ESP32S2 ||
       SoC->id == SOC_ESP32S3 || SoC->id == SOC_ESP32C3 ||
-      SoC->id == SOC_RP2040) {
+      SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040) {
     snprintf_P ( offset, size,
       PSTR("\
 <option %s value='%d'>115200</option>\
@@ -437,7 +439,7 @@ void handleSettings() {
 #if !defined(EXCLUDE_AUDIO)
   /* SoC specific part 7 */
   if (SoC->id == SOC_ESP32   || SoC->id == SOC_ESP32S2 ||
-      SoC->id == SOC_ESP32C3) {
+      SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6) {
     snprintf_P ( offset, size,
       PSTR("\
 <tr>\