Merge branch 'main' of github.com:jakkra/ZSWatch into BLE_enhancement…

…s#124
jakkra · Nov 22, 2023 · a2258ce · a2258ce
2 parents 46525c8 + 5022651
commit a2258ce
Show file tree

Hide file tree

Showing 22 changed files with 262 additions and 148 deletions.
diff --git a/GETTING_STARTED.md b/GETTING_STARTED.md
@@ -48,7 +48,7 @@ west update
 
 ### Use Bosch BSEC2
 To use the air quality features of the BME688 the Bosch BSEC2 binaries needs to be downloaded, this is optional.<br>
-By downloading (running below commands) you approve this [License](https://www.bosch-sensortec.com/media/boschsensortec/downloads/software/bme688_development_software/2023_04/license_terms_bme688_bme680_bsec..pdf)<br>
+By downloading (running below commands) you approve this [License](https://www.bosch-sensortec.com/media/boschsensortec/downloads/software/bme688_development_software/2023_04/license_terms_bme688_bme680_bsec.pdf)<br>
 ```
 west config manifest.group-filter +bsec2
 west update

diff --git a/app/drivers/sensor/apds9306/CMakeLists.txt b/app/drivers/sensor/apds9306/CMakeLists.txt
@@ -3,7 +3,4 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# TODO: Doesn´t work with CMakeList.txt of the drivers directory -> Check it
-#zephyr_library()
-
 zephyr_sources(avago_apds9306.c)
diff --git a/app/drivers/sensor/apds9306/Kconfig b/app/drivers/sensor/apds9306/Kconfig
@@ -17,4 +17,8 @@ if APDS9306
         bool "Enable this option if you are using the APDS-9306-065"
         default n
 
+module = AVAGO_APDS9306
+module-str = AVAGO_APDS9306
+source "subsys/logging/Kconfig.template.log_config"
+
 endif
diff --git a/app/drivers/sensor/apds9306/avago_apds9306.c b/app/drivers/sensor/apds9306/avago_apds9306.c
@@ -53,7 +53,7 @@
 
 #define DT_DRV_COMPAT                       avago_apds9306
 
-LOG_MODULE_REGISTER(avago_apds9306, CONFIG_SENSOR_LOG_LEVEL);
+LOG_MODULE_REGISTER(avago_apds9306, CONFIG_AVAGO_APDS9306_LOG_LEVEL);
 
 #if(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 0)
 #warning "apds9306 driver enabled without any devices"

diff --git a/app/drivers/sensor/bme68x_iaq/CMakeLists.txt b/app/drivers/sensor/bme68x_iaq/CMakeLists.txt
@@ -1,3 +1,8 @@
+# Copyright (c) 2023, Daniel Kampert
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
 if(CONFIG_EXTERNAL_USE_BOSCH_BSEC)
     zephyr_compile_definitions_ifdef(CONFIG_BME68X_IAQ_SAMPLE_RATE_ULTRA_LOW_POWER
     BSEC_SAMPLE_RATE=BSEC_SAMPLE_RATE_ULP

diff --git a/app/drivers/sensor/bme68x_iaq/Kconfig b/app/drivers/sensor/bme68x_iaq/Kconfig
@@ -1,5 +1,8 @@
+# BME68x encironmental sensor configuration options.
+
 #
-# Copyright (c) 2023 Nordic Semiconductor
+# Copyright (c) 2023, Nordic Semiconductor
+# Copyright (c) 2023, Daniel Kampert
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
@@ -23,17 +26,9 @@ config BME68X_IAQ_THREAD_STACK_SIZE
 	int "BSEC thread stack size"
 	default 4096
 
-config BME68X_IAQ_EXPECTED_AMBIENT_TEMP
-	int "Expected ambient temperature in C"
-	default 25
-
 config BME68X_IAQ_TEMPERATURE_OFFSET
 	int "BSEC temperature offset in centidegrees"
-	default 200 if BOARD_THINGY91_NRF9160_NS
-	default 200 if BOARD_THINGY53_NRF5340_CPUAPP
-	default 200 if BOARD_THINGY53_NRF5340_CPUAPP_NS
-	default 200 if BOARD_THINGY53_NRF5340_CPUNET
-	default 100
+	default 0
 	help
 	  BSEC temperature offset. To account for external heat sources on the board.
 	  The actual value is divided by 100. This is due to the Kconfig parser
@@ -71,4 +66,4 @@ module = BME68X_IAQ
 module-str = BME68X_IAQ
 source "subsys/logging/Kconfig.template.log_config"
 
-endif
+endif