Merge branch 'master' into userprefs

meshtastic · Nov 30, 2024 · 41998ab · 41998ab
2 parents d518bfe + fe8e071
commit 41998ab
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build_native.yml b/.github/workflows/build_native.yml
@@ -14,7 +14,7 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev
 
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/build_raspbian.yml b/.github/workflows/build_raspbian.yml
@@ -14,7 +14,7 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update -y --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev
 
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/build_raspbian_armv7l.yml b/.github/workflows/build_raspbian_armv7l.yml
@@ -14,7 +14,7 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update -y --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev
 
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/src/gps/GPS.h b/src/gps/GPS.h
@@ -158,8 +158,8 @@ class GPS : private concurrency::OSThread
     uint32_t rx_gpio = 0;
     uint32_t tx_gpio = 0;
 
-    int speedSelect = 0;
-    int probeTries = 0;
+    uint8_t speedSelect = 0;
+    uint8_t probeTries = 0;
 
     /**
      * hasValidLocation - indicates that the position variables contain a complete
@@ -239,4 +239,4 @@ class GPS : private concurrency::OSThread
 };
 
 extern GPS *gps;
-#endif // Exclude GPS
+#endif // Exclude GPS
diff --git a/src/input/cardKbI2cImpl.cpp b/src/input/cardKbI2cImpl.cpp
@@ -49,10 +49,11 @@ void CardKbI2cImpl::init()
                 kb_model = 0x00;
             }
         }
-        LOG_DEBUG("Keyboard Type: 0x%02x Model: 0x%02x Address: 0x%02x", kb_info.type, kb_model, cardkb_found.address);
         if (cardkb_found.address == 0x00) {
             disable();
             return;
+        } else {
+            LOG_DEBUG("Keyboard Type: 0x%02x Model: 0x%02x Address: 0x%02x", kb_info.type, kb_model, cardkb_found.address);
         }
     }
 #else

diff --git a/version.properties b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 5
-build = 14
+build = 16