use canaryone throughout for consistency.

.github/workflows/main_matrix.yml

@@ -111,7 +111,7 @@ jobs:
           - board: rak4631_eink
           - board: monteops_hw1
           - board: t-echo
-          - board: canary
+          - board: canaryone
           - board: pca10059_diy_eink
           - board: feather_diy
           - board: nano-g2-ultra

bin/check-all.sh

@@ -13,7 +13,7 @@ if [[ $# -gt 0 ]]; then
 	# can override which environment by passing arg
 	BOARDS="$@"
 else
-	BOARDS="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 rak4631 rak4631_eink rak11200 t-echo canary pca10059_diy_eink"
+	BOARDS="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 rak4631 rak4631_eink rak11200 t-echo canaryone pca10059_diy_eink"
 fi
 
 echo "BOARDS:${BOARDS}"

bin/check-dependencies.sh

@@ -8,7 +8,7 @@ if [[ $# -gt 0 ]]; then
 	# 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 canaryone 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}"

boards/canary.json → boards/canaryone.json

@@ -8,9 +8,9 @@
     "extra_flags": "-DARDUINO_NRF52840_CANARY -DNRF52840_XXAA",
     "f_cpu": "64000000L",
     "hwids": [["0x239A", "0x4405"]],
-    "usb_product": "Canary",
+    "usb_product": "CanaryOne",
     "mcu": "nrf52840",
-    "variant": "canary",
+    "variant": "canaryone",
     "variants_dir": "variants",
     "bsp": {
       "name": "adafruit"

platformio.ini

@@ -18,7 +18,7 @@ default_envs = tbeam
 ;default_envs = tlora-t3s3-v1
 ;default_envs = lora-relay-v1 # nrf board
 ;default_envs = t-echo
-;default_envs = canary
+;default_envs = canaryone
 ;default_envs = nrf52840dk-geeksville
 ;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
 ;default_envs = nano-g1

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

@@ -64,7 +64,7 @@ typedef enum _meshtastic_HardwareModel {
     /* LoRAType device: https://loratype.org/ */
     meshtastic_HardwareModel_LORA_TYPE = 19,
     /* CanaryRadio.io LLC Handheld https://canaryradio.io */
-    meshtastic_HardwareModel_CANARY_V1_0 = 22,
+    meshtastic_HardwareModel_CANARYONE = 22,
     /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */
     meshtastic_HardwareModel_STATION_G1 = 25,
     /* RAK11310 (RP2040 + SX1262) */

src/modules/SerialModule.cpp

@@ -58,7 +58,7 @@
 SerialModule *serialModule;
 SerialModuleRadio *serialModuleRadio;
 
-#if defined(TTGO_T_ECHO) || defined(CANARY_V1_0)
+#if defined(TTGO_T_ECHO) || defined(CANARYONE)
 SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("SerialModule") {}
 static Print *serialPrint = &Serial;
 #else
@@ -140,7 +140,7 @@ int32_t SerialModule::runOnce()
                 Serial.begin(baud);
                 Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
             }
-#elif !defined(TTGO_T_ECHO) && !defined(CANARY_V1_0)
+#elif !defined(TTGO_T_ECHO) && !defined(CANARYONE)
             if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
 #ifdef ARCH_RP2040
                 Serial2.setFIFOSize(RX_BUFFER);
@@ -188,7 +188,7 @@ int32_t SerialModule::runOnce()
                     }
                 }
             }
-#if !defined(TTGO_T_ECHO) && !defined(CANARY_V1_0)
+#if !defined(TTGO_T_ECHO) && !defined(CANARYONE)
             else {
                 while (Serial2.available()) {
                     serialPayloadSize = Serial2.readBytes(serialBytes, meshtastic_Constants_DATA_PAYLOAD_LEN);

variants/canary/platformio.ini → variants/canaryone/platformio.ini

@@ -1,13 +1,13 @@
 ; Public Beta oled/nrf52840/sx1262 device
-[env:canary]
+[env:canaryone]
 extends = nrf52840_base
-board = canary
+board = canaryone
 debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
-build_flags = ${nrf52840_base.build_flags} -D CANARYONE -I variants/canary
+build_flags = ${nrf52840_base.build_flags} -Ivariants/canaryone
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m4/fpv4-sp-d16-hard"
-build_src_filter = ${nrf52_base.build_src_filter} +<../variants/canary>
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/canaryone>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   adafruit/Adafruit BusIO@^1.13.2

variants/canary/variant.h → variants/canaryone/variant.h

@@ -16,8 +16,8 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef _VARIANT_CANARY_V1_0_
-#define _VARIANT_CANARY_V1_0_
+#ifndef _VARIANT_CANARYONE
+#define _VARIANT_CANARYONE
 
 /** Master clock frequency */
 #define VARIANT_MCK (64000000ul)
@@ -34,7 +34,7 @@
 extern "C" {
 #endif // __cplusplus
 
-#define CANARY_V1_0
+#define CANARYONE
 
 #define GPIO_PORT0 0
 #define GPIO_PORT1 32