Skip to content

Commit 29b9677

Browse files
committed
samples: nrf9160: lwm2m_client: Align with upstream float changes
Align with upstream changes regarding float handling (see upstream Zephyr commit b6f69a6 for reference). Signed-off-by: Robert Lubos <[email protected]>
1 parent a2c9429 commit 29b9677

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

samples/nrf9160/lwm2m_client/README.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,6 @@ The following LwM2M objects are implemented in this sample:
108108
- Yes
109109

110110

111-
.. note::
112-
113-
The level resource on the Buzzer object does not work properly.
114-
This is due to an error in Zephyr’s float handling, which will be fixed soon.
115-
116111
.. _dtls_support:
117112

118113
DTLS Support

samples/nrf9160/lwm2m_client/src/ipso/ipso_colour_sensor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static struct lwm2m_engine_obj_field fields[] = {
5151
OBJ_FIELD_DATA(APPLICATION_TYPE_RID, RW_OPT, STRING),
5252
#ifdef CONFIG_LWM2M_IPSO_APP_COLOUR_SENSOR_VERSION_1_1
5353
OBJ_FIELD_DATA(TIMESTAMP_RID, R_OPT, TIME),
54-
OBJ_FIELD_DATA(FRACTIONAL_TIMESTAMP_RID, R_OPT, FLOAT32),
54+
OBJ_FIELD_DATA(FRACTIONAL_TIMESTAMP_RID, R_OPT, FLOAT),
5555
OBJ_FIELD_DATA(MEASUREMENT_QUALITY_INDICATOR_RID, R_OPT, U8),
5656
OBJ_FIELD_DATA(MEASUREMENT_QUALITY_LEVEL_RID, R_OPT, U8)
5757
#endif

samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_buzzer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static int buzzer_intensity_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t r
6262
int lwm2m_init_buzzer(void)
6363
{
6464
int ret;
65-
float64_value_t start_intensity = { .val1 = INTENSITY_START_VAL, .val2 = 0 };
65+
float32_value_t start_intensity = { .val1 = INTENSITY_START_VAL, .val2 = 0 };
6666

6767
ret = ui_buzzer_init();
6868
if (ret) {
@@ -86,7 +86,7 @@ int lwm2m_init_buzzer(void)
8686
buzzer_intensity_cb);
8787
lwm2m_engine_set_res_data(LWM2M_PATH(IPSO_OBJECT_BUZZER_ID, 0, APPLICATION_TYPE_RID),
8888
BUZZER_APP_TYPE, sizeof(BUZZER_APP_TYPE), LWM2M_RES_DATA_FLAG_RO);
89-
lwm2m_engine_set_float64(LWM2M_PATH(IPSO_OBJECT_BUZZER_ID, 0, LEVEL_RID), &start_intensity);
89+
lwm2m_engine_set_float32(LWM2M_PATH(IPSO_OBJECT_BUZZER_ID, 0, LEVEL_RID), &start_intensity);
9090

9191
if (IS_ENABLED(CONFIG_LWM2M_IPSO_APP_BUZZER_VERSION_1_1)) {
9292
lwm2m_engine_set_res_data(LWM2M_PATH(IPSO_OBJECT_BUZZER_ID, 0, TIMESTAMP_RID),

0 commit comments

Comments
 (0)