diff --git a/bin/check-dependencies.sh b/bin/check-dependencies.sh
index 2a9ad8d167..08d0366b28 100644
--- a/bin/check-dependencies.sh
+++ b/bin/check-dependencies.sh
@@ -5,17 +5,17 @@
set -e
if [[ $# -gt 0 ]]; then
- # can override which environment by passing arg
- BOARDS="$@"
+ # can override which environment by passing arg
+ BOARDS="$@"
else
- BOARDS="rak4631 rak4631_eink t-echo canary pca10059_diy_eink pico rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 station-g1 m5stack-core m5stack-coreink tbeam-s3-core"
+ BOARDS="rak4631 rak4631_eink t-echo canary pca10059_diy_eink pico rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 station-g1 m5stack-core m5stack-coreink tbeam-s3-core"
fi
echo "BOARDS:${BOARDS}"
CHECK=""
for BOARD in $BOARDS; do
- CHECK="${CHECK} -e ${BOARD}"
+ CHECK="${CHECK} -e ${BOARD}"
done
echo $CHECK
diff --git a/protobufs b/protobufs
index 44e369e181..092f7c0430 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 44e369e1813f8ec9c7aefe1aac7d0adc75e11f8a
+Subproject commit 092f7c04305e6d8b6d4417a127fba695546857d8
diff --git a/src/configuration.h b/src/configuration.h
index 5eb84f5f68..d8b0dba5f4 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -162,7 +162,6 @@ along with this program. If not, see .
/* Step #3: mop up with disabled values for HAS_ options not handled by the above two */
-
// -----------------------------------------------------------------------------
// GPS
// -----------------------------------------------------------------------------
@@ -174,7 +173,6 @@ along with this program. If not, see .
#define GPS_THREAD_INTERVAL 100
#endif
-
#ifndef HAS_WIFI
#define HAS_WIFI 0
#endif
diff --git a/variants/canary/variant.cpp b/variants/canary/variant.cpp
index 2ad38cefb8..5967a2a96a 100644
--- a/variants/canary/variant.cpp
+++ b/variants/canary/variant.cpp
@@ -53,5 +53,4 @@ void initVariant()
// Pull the LoRa out of reset
pinMode(LORA_RF_PWR, OUTPUT);
digitalWrite(LORA_RF_PWR, HIGH);
-
}
diff --git a/variants/canary/variant.h b/variants/canary/variant.h
index ded6dfe9e0..9261f96794 100644
--- a/variants/canary/variant.h
+++ b/variants/canary/variant.h
@@ -46,7 +46,7 @@ extern "C" {
#define NUM_ANALOG_OUTPUTS (0)
// LEDs
-#define PIN_LED1 (GPIO_PORT1 + 1) // blue P1.01
+#define PIN_LED1 (GPIO_PORT1 + 1) // blue P1.01
#define PIN_LED2 (GPIO_PORT0 + 14) // yellow P0.14
#define PIN_LED3 (GPIO_PORT1 + 3) // green P1.03
@@ -110,8 +110,8 @@ static const uint8_t A0 = PIN_A0;
#define USE_SX1262
#define SX126X_CS (GPIO_PORT0 + 24)
#define SX126X_DIO1 (GPIO_PORT1 + 11)
-//#define SX126X_DIO3 (GPIO_PORT0 + 21)
-//#define SX126X_DIO2 () // LORA_BUSY // LoRa RX/TX
+// #define SX126X_DIO3 (GPIO_PORT0 + 21)
+// #define SX126X_DIO2 () // LORA_BUSY // LoRa RX/TX
#define SX126X_BUSY (GPIO_PORT0 + 17)
#define SX126X_RESET (GPIO_PORT0 + 25)
#define LORA_RF_PWR (GPIO_PORT0 + 28) // LORA_RF_SWITCH
@@ -121,7 +121,7 @@ static const uint8_t A0 = PIN_A0;
*/
#define HAS_GPS 1
#define GPS_UBLOX
-#define GPS_BAUDRATE 38400
+#define GPS_BAUDRATE 38400
// #define PIN_GPS_WAKE (GPIO_PORT1 + 2) // An output to wake GPS, low means allow sleep, high means force wake
// Seems to be missing on this new board
@@ -146,8 +146,8 @@ static const uint8_t A0 = PIN_A0;
#define PIN_SPI_MOSI (GPIO_PORT0 + 22)
#define PIN_SPI_SCK (GPIO_PORT0 + 19)
-//#define PIN_SPI1_MISO (GPIO_PORT1 + 6) // FIXME not really needed, but for now the SPI code requires something to be defined,
-// pick an used GPIO #define PIN_SPI1_MOSI (GPIO_PORT1 + 8) #define PIN_SPI1_SCK (GPIO_PORT1 + 9)
+// #define PIN_SPI1_MISO (GPIO_PORT1 + 6) // FIXME not really needed, but for now the SPI code requires something to be defined,
+// pick an used GPIO #define PIN_SPI1_MOSI (GPIO_PORT1 + 8) #define PIN_SPI1_SCK (GPIO_PORT1 + 9)
#define PIN_PWR_EN (GPIO_PORT0 + 12)
@@ -177,7 +177,6 @@ static const uint8_t A0 = PIN_A0;
#define ADC_MULTIPLIER VBAT_DIVIDER_COMP
#define VBAT_RAW_TO_SCALED(x) (REAL_VBAT_MV_PER_LSB * x)
-
#ifdef __cplusplus
}
#endif