Merge pull request #168 from tmobile/Catchup-to-v3.4.0-rc3-plus-1

Catchup to v3.4.0 rc3 plus 1

Author: DRuffer-tmo

.github/workflows/mirror.yml

@@ -0,0 +1,26 @@
+name: Public Mirror To Private
+
+on:
+  workflow_dispatch:
+
+jobs:
+  mirror:
+    runs-on: self-hosted-ubuntu-20-04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ssh-key: ${{ secrets.MIRROR_KEY }}
+      - run: |
+          echo "cloning upstream"
+          git clone --mirror https://github.com/tmobile/DevEdge-IoTDevKit-ZephyrSDK.git
+          cd DevEdge-IoTDevKit-ZephyrSDK.git
+          mkdir -p ~/.ssh
+          ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+          echo "${{ secrets.MIRROR_KEY }}" > ~/.ssh/id_rsa
+          chmod 0400 ~/.ssh/id_rsa
+          ls -la ~/.ssh
+          eval $(ssh-agent -s)
+          ssh-add ~/.ssh/id_rsa
+          echo "pushing all from upstream to ours"
+          git push -f --all [email protected]:TmoBrandedHw/firmware-zephyrsdk.git
+          git push --tags [email protected]:TmoBrandedHw/firmware-zephyrsdk.git

samples/tmo_shell/prj.conf

@@ -94,6 +94,7 @@ CONFIG_BT_DEBUG=n
 # Sensors
 CONFIG_SENSOR=y
 CONFIG_SENSOR_SHELL=y
+CONFIG_SENSOR_ASYNC_API=y
 
 # Stack sizes
 CONFIG_MAIN_STACK_SIZE=4096
@@ -105,7 +106,7 @@ CONFIG_MBEDTLS_BUILTIN=y
 
 # CONFIG_NEWLIB_LIBC=y
 CONFIG_MINIMAL_LIBC_MALLOC=y
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=2048
+# CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=2048
 
 # Set number IPv4 network interfaces
 CONFIG_NET_IF_MAX_IPV4_COUNT=2

samples/tmo_shell/src/tmo_ble_demo.c

@@ -1006,8 +1006,9 @@ bool fetch_pressure(struct sensor_value *press)
 	}
 	return false;
 }
+#if 0
 SYS_INIT(tmo_ble_demo_init, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
-
+#endif
 
 int cmd_ble_adv_conn(const struct shell *shell, size_t argc, char **argv)
 {

samples/tmo_shell/src/tmo_fuel_gauge.c

@@ -26,7 +26,7 @@ int get_pmic_status(uint8_t *charging, uint8_t *vbus, uint8_t *attached, uint8_t
 	props[0].property_type = FUEL_GAUGE_STATUS;
 	props[1].property_type = FUEL_GAUGE_CONNECT_STATE;
 	props[2].property_type = FUEL_GAUGE_PRESENT_STATE;
-	props[3].property_type = FUEL_GAUGE_MODE;
+	props[3].property_type = FUEL_GAUGE_SBS_MODE;
 
 	ret = fuel_gauge_get_prop(alpc, props, ARRAY_SIZE(props));
 
@@ -44,10 +44,10 @@ int get_pmic_status(uint8_t *charging, uint8_t *vbus, uint8_t *attached, uint8_t
 		*attached = props[2].value.flags;
 	}
 	if (fault) {
-		*fault = props[3].value.mode == PMIC_FAULT_MODE_VALUE;
+		*fault = props[3].value.sbs_mode == PMIC_FAULT_MODE_VALUE;
 	}
 	if (charge_status) {
-		*charge_status  = props[3].value.mode;
+		*charge_status  = props[3].value.sbs_mode;
 	}
 
 	return 0;