build.sh

@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# ========= CONFIG =========
-PORT="/dev/ttyACM0"
-
-FQBN="esp32:esp32:esp32s3:\
-UploadSpeed=921600,\
-USBMode=hwcdc,\
-CDCOnBoot=default,\
-MSCOnBoot=default,\
-DFUOnBoot=default,\
-UploadMode=default,\
-CPUFreq=240,\
-FlashMode=qio,\
-FlashSize=16M,\
-PartitionScheme=fatflash,\
-DebugLevel=none,\
-PSRAM=opi,\
-LoopCore=1,\
-EventsCore=1,\
-EraseFlash=none,\
-JTAGAdapter=default,\
-ZigbeeMode=default"
-
-# ========= FLAGS =========
-UPLOAD=false
-SKETCH_PATH="./firmware"
-
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        -u|--upload)
-            UPLOAD=true
-            shift
-            ;;
-        *)
-            SKETCH_PATH="$1"
-            shift
-            ;;
-    esac
-done
-
-# ========= BUILD =========
-echo "Compiling sketch..."
-
-arduino-cli compile \
-    --fqbn "$FQBN" \
-    "$SKETCH_PATH"
-
-echo "Compile successful."
-
-# ========= UPLOAD =========
-if [ "$UPLOAD" = true ]; then
-    echo "Uploading to $PORT..."
-
-    arduino-cli upload \
-        -p "$PORT" \
-        --fqbn "$FQBN" \
-        "$SKETCH_PATH"
-
-    echo "Upload complete."
-fi

firmware/device_check.cpp

@@ -37,20 +37,35 @@ bool checkNRF(RF24 &radio)
 }
 
 // ===== CC1101 CHECK =====
-bool checkCC1101(uint8_t csPin)
+bool checkCC1101_1()
 {
     ELECHOUSE_cc1101.setSpiPin(
         cc1101_SCK,
         cc1101_MISO,
         cc1101_MOSI,
-        csPin
+        CC1101_CS
     );
 
-    delay(5);
+    delay(5); // important stabilization
 
     return ELECHOUSE_cc1101.getCC1101();
 }
 
+bool checkCC1101_2()
+{
+    ELECHOUSE_cc1101.setSpiPin(
+        cc1101_SCK,
+        cc1101_MISO,
+        cc1101_MOSI,
+        CC1101_2_CS
+    );
+
+    delay(5); // important stabilization
+
+    return ELECHOUSE_cc1101.getCC1101();
+}
+
+
 // ===== BUTTON CHECK =====
 bool checkButtons()
 {
@@ -66,9 +81,7 @@ bool checkButtons()
         if (!digitalRead(BTN_UP) ||
             !digitalRead(BTN_DOWN) ||
             !digitalRead(BTN_SELECT) ||
-            !digitalRead(BTN_BACK) ||
+            !digitalRead(BTN_BACK))
-            !digitalRead(BTN_RIGHT) ||
-            !digitalRead(BTN_LEFT))
         {
             return true;
         }
@@ -84,8 +97,8 @@ bool checkButtons()
 const char* labels[MAX_ITEMS] = {
     "NRF1",
     "NRF2",
-    "CC1101-1",
+    "CC1101_1",
-    "CC1101-2",
+    "CC1101_2",
     "BUTTONS",
     "OLED"
 };
@@ -104,7 +117,6 @@ void drawStatus(DeviceStatus &s)
     values[4] = s.buttons;
     values[5] = s.oled;
 
-
     u8g2.clearBuffer();
     u8g2.setFont(u8g2_font_6x10_tr);
 
@@ -142,6 +154,7 @@ void drawStatus(DeviceStatus &s)
     u8g2.sendBuffer();
 }
 
+
 // ===== MAIN =====
 void device_check_run()
 {
@@ -150,12 +163,13 @@ void device_check_run()
     Serial.println("Running device diagnostics...");
 
     // NRF
+    // NRF link test
     status.nrf1 = checkNRF(radio1);
     status.nrf2 = checkNRF(radio2);
 
     // CC1101
-    status.cc1101_1 = checkCC1101(CC1101_CS);
+    status.cc1101_1 = checkCC1101_1();
-    status.cc1101_2 = checkCC1101(CC1101_2_CS);
+    status.cc1101_2 = checkCC1101_1();
 
     // Buttons
     status.buttons = checkButtons();