Merge branch 'meshtastic:master' into 30-build-custom-firmware

mesh-mk-ua · Dec 14, 2024 · f393466 · f393466
2 parents f6cfbb2 + 44cf6d3
commit f393466
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 14 deletions.
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
@@ -4,31 +4,32 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.4
+      ref: v1.6.6
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - [email protected]
+    - [email protected]
+    - [email protected]
     - [email protected]
-    - bandit@1.7.10
-    - [email protected].287
+    - bandit@1.8.0
+    - [email protected].334
     - [email protected]
-    - trivy@0.56.2
+    - trivy@0.58.0
     #- [email protected]
     - [email protected]
-    - ruff@0.7.3
+    - ruff@0.8.3
     - [email protected]
-    - markdownlint@0.42.0
-    - [email protected].2
+    - markdownlint@0.43.0
+    - [email protected].3
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected].0
+    - [email protected].1-beta
     - [email protected]
     - [email protected]
     - [email protected]
     - git-diff-check
-    - [email protected].1
+    - [email protected].2
     - [email protected]
     #- [email protected]
   ignore:
@@ -39,11 +40,11 @@ runtimes:
   enabled:
     - [email protected]
     - [email protected]
-    - node@18.12.1
+    - node@18.20.5
 actions:
   disabled:
     - trunk-announce
   enabled:
     - trunk-fmt-pre-commit
     - trunk-check-pre-push
-    - trunk-upgrade-available
+    - trunk-upgrade-available
diff --git a/bin/config.d/OpenWRT-One-mikroBUS-LR-IOT-CLICK.yaml b/bin/config.d/OpenWRT-One-mikroBUS-LR-IOT-CLICK.yaml
@@ -0,0 +1,9 @@
+##  https://www.mikroe.com/lr-iot-click
+Lora:
+  Module: lr1110  # OpenWRT ONE mikroBUS with LR-IOT-CLICK
+#  CS: 25
+  IRQ: 10
+  Busy: 12
+#  Reset: 2
+  spidev: spidev2.0
+  DIO3_TCXO_VOLTAGE: 1.6
diff --git a/platformio.ini b/platformio.ini
@@ -16,6 +16,7 @@ default_envs = tbeam
 ;default_envs = tlora-v2
 ;default_envs = tlora-v2-1-1_6
 ;default_envs = tlora-v2-1-1_6-tcxo
+;default_envs = tlora-v3-3-0-tcxo
 ;default_envs = tlora-t3s3-v1
 ;default_envs = t-echo
 ;default_envs = canaryone

diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp
@@ -87,7 +87,8 @@ void getMacAddr(uint8_t *dmac)
         if (strlen(optionMac) >= 12) {
             MAC_from_string(optionMac, dmac);
         } else {
-            uint32_t hwId = sscanf(optionMac, "%u", &hwId);
+            uint32_t hwId;
+            sscanf(optionMac, "%u", &hwId);
             dmac[0] = 0x80;
             dmac[1] = 0;
             dmac[2] = hwId >> 24;
@@ -532,4 +533,4 @@ bool MAC_from_string(std::string mac_str, uint8_t *dmac)
     } else {
         return false;
     }
-}
+}
diff --git a/variants/tlora_v2_1_16_tcxo/platformio.ini b/variants/tlora_v2_1_16_tcxo/platformio.ini
@@ -1,5 +1,6 @@
 [env:tlora-v2-1-1_6-tcxo]
 extends = esp32_base
+board_level = extra
 board = ttgo-lora32-v21
 build_flags = 
   ${esp32_base.build_flags}

diff --git a/variants/tlora_v2_1_18/platformio.ini b/variants/tlora_v2_1_18/platformio.ini
@@ -1,5 +1,6 @@
 [env:tlora-v2-1-1_8]
 extends = esp32_base
+board_level = extra
 board = ttgo-lora32-v21
 
 build_flags = 

diff --git a/variants/tlora_v3_3_0_tcxo/platformio.ini b/variants/tlora_v3_3_0_tcxo/platformio.ini
@@ -0,0 +1,11 @@
+[env:tlora-v3-3-0-tcxo]
+extends = esp32_base
+board = ttgo-lora32-v21
+board_level = extra
+build_flags = 
+  ${esp32_base.build_flags}
+  -D TLORA_V2_1_16
+  -I variants/tlora_v2_1_16
+  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -D LORA_TCXO_GPIO=12
+  -D BUTTON_PIN=0