Merge branch 'master' into tft-gui-work

boards/canaryone.json

@@ -7,7 +7,7 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DARDUINO_NRF52840_CANARY -DNRF52840_XXAA",
     "f_cpu": "64000000L",
-    "hwids": [["0x239A", "0x4405"]],
+    "hwids": [["0x239A", "0x4405"], ["0x239A", "0x009F"]],
     "usb_product": "CanaryOne",
     "mcu": "nrf52840",
     "variant": "canaryone",

protobufs

@@ -1 +1 @@
-Subproject commit 62b7d8b884d70aed5ff18c3b0e228095eeb48de2
+Subproject commit 5a97acb17543a10e114675a205e3274a83e721af

src/main.cpp

@@ -699,6 +699,11 @@ void setup()
     digitalWrite(SX126X_ANT_SW, 1);
 #endif
 
+#ifdef PIN_PWR_DELAY_MS
+    // This may be required to give the peripherals time to power up.
+    delay(PIN_PWR_DELAY_MS);
+#endif
+
 #ifdef ARCH_PORTDUINO
     if (settingsMap[use_sx1262]) {
         if (!rIf) {

src/mesh/generated/meshtastic/portnums.pb.h

@@ -38,19 +38,19 @@ typedef enum _meshtastic_PortNum {
  ENCODING: Protobuf */
     meshtastic_PortNum_REMOTE_HARDWARE_APP = 2,
     /* The built-in position messaging app.
- Payload is a [Position](/docs/developers/protobufs/api#position) message
+ Payload is a Position message.
  ENCODING: Protobuf */
     meshtastic_PortNum_POSITION_APP = 3,
     /* The built-in user info app.
- Payload is a [User](/docs/developers/protobufs/api#user) message
+ Payload is a User message.
  ENCODING: Protobuf */
     meshtastic_PortNum_NODEINFO_APP = 4,
     /* Protocol control packets for mesh protocol use.
- Payload is a [Routing](/docs/developers/protobufs/api#routing) message
+ Payload is a Routing message.
  ENCODING: Protobuf */
     meshtastic_PortNum_ROUTING_APP = 5,
     /* Admin control packets.
- Payload is a [AdminMessage](/docs/developers/protobufs/api#adminmessage) message
+ Payload is a AdminMessage message.
  ENCODING: Protobuf */
     meshtastic_PortNum_ADMIN_APP = 6,
     /* Compressed TEXT_MESSAGE payloads.
@@ -60,7 +60,7 @@ typedef enum _meshtastic_PortNum {
  any incoming TEXT_MESSAGE_COMPRESSED_APP payload and convert to TEXT_MESSAGE_APP. */
     meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP = 7,
     /* Waypoint payloads.
- Payload is a [Waypoint](/docs/developers/protobufs/api#waypoint) message
+ Payload is a Waypoint message.
  ENCODING: Protobuf */
     meshtastic_PortNum_WAYPOINT_APP = 8,
     /* Audio Payloads.

src/mesh/generated/meshtastic/telemetry.pb.h

@@ -41,7 +41,9 @@ typedef enum _meshtastic_TelemetrySensorType {
     /* PM2.5 air quality sensor */
     meshtastic_TelemetrySensorType_PMSA003I = 13,
     /* INA3221 3 Channel Voltage / Current Sensor */
-    meshtastic_TelemetrySensorType_INA3221 = 14
+    meshtastic_TelemetrySensorType_INA3221 = 14,
+    /* BMP085/BMP180 High accuracy temperature and pressure (older Version of BMP280) */
+    meshtastic_TelemetrySensorType_BMP085 = 15
 } meshtastic_TelemetrySensorType;
 
 /* Struct definitions */
@@ -141,8 +143,8 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_INA3221
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_INA3221+1))
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_BMP085
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_BMP085+1))
 
 
 

variants/canaryone/variant.h

@@ -103,6 +103,9 @@ static const uint8_t A0 = PIN_A0;
 #define EXTERNAL_FLASH_DEVICES MX25R1635F
 #define EXTERNAL_FLASH_USE_QSPI
 
+// Add a delay on startup to allow LoRa and GPS to power up
+#define PIN_PWR_DELAY_MS 100
+
 /*
  * Lora radio
  */