applications: clime: Add soil sensor lrw encoding

Signed-off-by: Marek Maškarinec <[email protected]>

Author: marekmaskarinec

applications/clime/Kconfig

@@ -18,13 +18,6 @@ config SHIELD_CTR_S2
 
 config CTR_HYGRO
 	default y
-# SUBSYSTEM-DS18B20
-config SHIELD_CTR_DS18B20
-	bool "Enable SHIELD_CTR_DS18B20"
-	default y
-
-config CTR_DS18B20
-	default y
 # SUBSYSTEM-LRW
 config SHIELD_CTR_LRW
 	bool "Enable SHIELD_CTR_LRW"

applications/clime/app.overlay

@@ -50,68 +50,6 @@
 		};
 	};
 };
-/* SUBSYSTEM-DS18B20  */
-&ds2484 {
-	ds18b20_0: ds18b20_0 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-
-	ds18b20_1: ds18b20_1 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-
-	ds18b20_2: ds18b20_2 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-
-	ds18b20_3: ds18b20_3 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-
-	ds18b20_4: ds18b20_4 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-
-	ds18b20_5: ds18b20_5 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-
-	ds18b20_6: ds18b20_6 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-
-	ds18b20_7: ds18b20_7 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-
-	ds18b20_8: ds18b20_8 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-
-	ds18b20_9: ds18b20_9 {
-		compatible = "maxim,ds18b20";
-		resolution = <12>;
-		family-code = <0x28>;
-	};
-};
 /* SUBSYSTEM-LRW   */
 &ctr_lrw_if {
 	status = "okay";

applications/clime/codec/cs-decoder.js

@@ -46,7 +46,7 @@ function decodeUplink(input) {
     }
   }
 
-  if ((header & 0x04) !== 0 && (header & 0x08) == 0) {
+  if ((header & 0x04) !== 0) {
     data.therm_temperature = s16();
     if (data.therm_temperature === 0x7fff) {
       data.therm_temperature = null;
@@ -273,8 +273,14 @@ function s32() {
 }
 
 if (false) {
+<<<<<<< HEAD
   var hex = "af01070eda0d23022e094f096d0d2887c4e46400145c0000";
   var buf = Buffer.from(hex, "hex");
   console.log(decodeUplink({ bytes: buf }));
+=======
+  var hex = "9703ffffffffff0221094c093f000100000000";
+  var buf = Buffer.from(hex, "hex");
+  console.log(JSON.stringify(decodeUplink({ bytes: buf })));
+>>>>>>> 46a8f6ff (applications: clime: Add soil sensor lrw encoding)
 }
 

applications/clime/prj.conf

@@ -46,8 +46,6 @@ CONFIG_PM_PARTITION_REGION_LITTLEFS_EXTERNAL=y
 CONFIG_CTR_CONFIG=y
 # SUBSYSTEM-DEFAULTS
 CONFIG_CTR_DEFAULTS=y
-# SUBSYSTEM-DS18B20
-CONFIG_CTR_DS18B20=y
 # SUBSYSTEM-INFO
 CONFIG_CTR_INFO=y
 # SUBSYSTEM-LED

applications/clime/project.yaml

@@ -44,40 +44,80 @@ variants:
   fw_version: v3.0.1
   features:
     - hardware-chester-sps30
+=======
+  - name: CHESTER Clime
+    fw_bundle: com.hardwario.chester.app.clime
+    fw_name: hio-chester-clime
+    fw_version: v3.0.0
+    features:
+      - hardware-chester-s2
+  - name: CHESTER Clime Z
+    fw_bundle: com.hardwario.chester.app.clime.z
+    fw_name: hio-chester-clime-z
+    fw_version: v3.0.0
+    features:
+      - hardware-chester-z
+      - hardware-chester-s2
+    remark: Support for CHESTER-Z
+  - name: CHESTER Clime IAQ
+    fw_bundle: com.hardwario.chester.app.clime.iaq
+    fw_name: hio-chester-clime-iaq
+    fw_version: v3.0.0
+    features:
+      - hardware-chester-s1
+      - hardware-chester-x10
+  - name: CHESTER Clime RTD
+    fw_bundle: com.hardwario.chester.app.clime.rtd
+    fw_name: hio-chester-clime-rtd
+    fw_version: v3.0.0
+    features:
+      - hardware-chester-rtd-a
+  - name: CHESTER Clime 1W
+    fw_bundle: com.hardwario.chester.app.clime.1w
+    fw_name: hio-chester-clime-1w
+    fw_version: v3.0.0
+    remark:
+  - name: CHESTER Clime TC
+    fw_bundle: com.hardwario.chester.app.clime.tc
+    fw_name: hio-chester-clime-tc
+    fw_version: v3.0.0
+    features:
+      - hardware-chester-tc-a
+>>>>>>> 6ab59302 (Add soil sensor lrw encoding support)
 project:
   variant: Clime
   company: 2024 HARDWARIO a.s.
-  license: 'SPDX-License-Identifier: LicenseRef-HARDWARIO-5-Clause'
+  license: "SPDX-License-Identifier: LicenseRef-HARDWARIO-5-Clause"
   fw_name: CHESTER Clime
   fw_bundle: com.hardwario.chester.app.clime
   fw_version: v3.0.0
 features:
-- subsystem-accel
-- subsystem-batt
-- subsystem-button
-- subsystem-ble
-- subsystem-ble-tag
-- subsystem-bt-filter-accept-list
-- subsystem-bt-observer
-- subsystem-buf
-- subsystem-cloud
-- subsystem-config
-- subsystem-defaults
-- subsystem-info
-- subsystem-led
-- subsystem-log
-- subsystem-rtc
-- subsystem-shell
-- subsystem-therm
-- subsystem-wdog
-- subsystem-tinycrypt
-- subsystem-tinycrypt-sha256
-- subsystem-zcbor
-- subsystem-lte-v2
-- subsystem-lrw
-- subsystem-ds18b20
-- subsystem-soil-sensor
-- chester-app-report-jitter
+  - subsystem-accel
+  - subsystem-batt
+  - subsystem-button
+  - subsystem-ble
+  - subsystem-ble-tag
+  - subsystem-bt-filter-accept-list
+  - subsystem-bt-observer
+  - subsystem-buf
+  - subsystem-cloud
+  - subsystem-config
+  - subsystem-defaults
+  - subsystem-info
+  - subsystem-led
+  - subsystem-log
+  - subsystem-rtc
+  - subsystem-shell
+  - subsystem-therm
+  - subsystem-wdog
+  - subsystem-tinycrypt
+  - subsystem-tinycrypt-sha256
+  - subsystem-zcbor
+  - subsystem-lte-v2
+  - subsystem-lrw
+  #- subsystem-ds18b20
+  - subsystem-soil-sensor
+  - chester-app-report-jitter
 #- chester-app-tamper
 #- hardware-chester-s1
 #- hardware-chester-s2
@@ -91,6 +131,7 @@ features:
 #- hardware-chester-tc-a
 #- hardware-chester-tc-b
 parameters:
+<<<<<<< HEAD
 - name: interval-sample
   type: int
   min: 1
@@ -205,17 +246,17 @@ parameters:
   help: 'Get/Set hygro low temperature alarm hysteresis'
   depends_on: defined(FEATURE_HARDWARE_CHESTER_S2)
 commands:
-- name: sample
-  callback: app_work_sample()
-  help: 'Sample immediately.'
-- name: send
-  callback: app_work_send()
-  help: 'Send data immediately.'
-- name: aggreg
-  callback: app_work_aggreg()
-  help: 'Aggregate data immediately'
+  - name: sample
+    callback: app_work_sample()
+    help: "Sample immediately."
+  - name: send
+    callback: app_work_send()
+    help: "Send data immediately."
+  - name: aggreg
+    callback: app_work_aggreg()
+    help: "Aggregate data immediately"
 extras:
-- CONFIG_ADC_TLA2021_INIT_PRIORITY=60
-- CONFIG_ADC_NRFX_SAADC=n
-- CONFIG_ADC_SHELL=n
-- CONFIG_NEWLIB_LIBC_NANO=n
+  - CONFIG_ADC_TLA2021_INIT_PRIORITY=60
+  - CONFIG_ADC_NRFX_SAADC=n
+  - CONFIG_ADC_SHELL=n
+  - CONFIG_NEWLIB_LIBC_NANO=n

applications/clime/src/app_data.h

@@ -268,6 +268,8 @@ struct app_data_soil_sensor_sensor {
 	int sample_count;
 	float samples_temperature[APP_DATA_MAX_SAMPLES];
 	float samples_moisture[APP_DATA_MAX_SAMPLES];
+	float last_temperature;
+	float last_moisture;
 
 	int measurement_count;
 	struct app_data_soil_sensor_measurement measurements[APP_DATA_MAX_MEASUREMENTS];

applications/clime/src/app_send.c

@@ -8,6 +8,7 @@
 #include "app_config.h"
 #include "app_data.h"
 #include "app_send.h"
+#include "feature.h"
 
 /* CHESTER includes */
 #include <chester/ctr_buf.h>
@@ -85,6 +86,11 @@ static int compose_lrw(struct ctr_buf *buf)
 		header |= BIT(8);
 	}
 
+	if (IS_ENABLED(FEATURE_SUBSYSTEM_SOIL_SENSOR)) {
+		header |= BIT(7);
+		header |= BIT(9);
+	}
+
 	ret |= ctr_buf_append_u8(buf, header);
 
 	if (header & BIT(7)) {
@@ -290,6 +296,46 @@ static int compose_lrw(struct ctr_buf *buf)
 
 #endif /* defined(FEATURE_SUBSYSTEM_BLE_TAG) */
 
+#if defined(FEATURE_SUBSYSTEM_SOIL_SENSOR)
+	if (header & BIT(9)) {
+		int count = 0;
+
+		for (int i = 0; i < APP_DATA_SOIL_SENSOR_COUNT; i++) {
+			struct app_data_soil_sensor_sensor *sensor =
+				&g_app_data.soil_sensor.sensor[i];
+
+			if (sensor->serial_number == 0) {
+				continue;
+			}
+
+			count++;
+		}
+
+		ret |= ctr_buf_append_u8(buf, count);
+
+		for (int i = 0; i < APP_DATA_SOIL_SENSOR_COUNT; i++) {
+			struct app_data_soil_sensor_sensor *sensor =
+				&g_app_data.soil_sensor.sensor[i];
+
+			if (sensor->serial_number == 0) {
+				continue;
+			}
+
+			if (isnan(sensor->last_temperature)) {
+				ret |= ctr_buf_append_s16_le(buf, BIT_MASK(15));
+			} else {
+				ret |= ctr_buf_append_s16_le(buf, sensor->last_temperature * 100.f);
+			}
+
+			if (isnan(sensor->last_moisture)) {
+				ret |= ctr_buf_append_u16(buf, BIT_MASK(16));
+			} else {
+				ret |= ctr_buf_append_u16(buf, sensor->last_moisture);
+			}
+		}
+	}
+#endif /* defined(FEATURE_SUBSYSTEM_SOIL_SENSOR) */
+
 	app_data_unlock();
 
 	if (ret) {

applications/clime/src/app_sensor.c

@@ -815,6 +815,8 @@ int app_sensor_soil_sensor_sample(void)
 			struct app_data_soil_sensor_sensor *sensor =
 				&g_app_data.soil_sensor.sensor[i];
 
+			sensor->last_temperature = temperature;
+			sensor->last_moisture = moisture;
 			sensor->samples_temperature[sensor->sample_count] = temperature;
 			sensor->samples_moisture[sensor->sample_count] = moisture;
 			sensor->serial_number = serial_number;

applications/clime/src/feature.h

@@ -20,7 +20,6 @@
 #define FEATURE_SUBSYSTEM_CLOUD                 1
 #define FEATURE_SUBSYSTEM_CONFIG                1
 #define FEATURE_SUBSYSTEM_DEFAULTS              1
-#define FEATURE_SUBSYSTEM_DS18B20               1
 #define FEATURE_SUBSYSTEM_INFO                  1
 #define FEATURE_SUBSYSTEM_LED                   1
 #define FEATURE_SUBSYSTEM_LOG                   1