Fix reply to device ID get command (#49)

ruuvi · Jun 23, 2021 · d0ab218 · d0ab218
1 parent 39b2489
commit d0ab218
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/app_uart.c b/src/app_uart.c
@@ -191,6 +191,7 @@ void app_uart_parser (void * p_data, uint16_t data_len)
 {
     rd_status_t err_code = RD_SUCCESS;
     ri_comm_message_t msg = {0};
+    msg.data_length = sizeof (msg.data);
     re_ca_uart_payload_t uart_payload = {0};
     uint8_t dequeue_data[APP_UART_RING_DEQ_BUFFER_MAX_LEN] = {0};
     rl_status_t status = RL_SUCCESS;
@@ -257,12 +258,11 @@ void app_uart_parser (void * p_data, uint16_t data_len)
         {
             uint64_t mac;
             uint64_t id;
-            ri_radio_address_get (&mac);
-            ri_comm_id_get (&id);
+            err_code |= ri_radio_address_get (&mac);
+            err_code |= ri_comm_id_get (&id);
             uart_payload.cmd = RE_CA_UART_DEVICE_ID;
             uart_payload.params.device_id.id = id;
             uart_payload.params.device_id.addr = mac;
-            msg.data_length = sizeof (msg);
         }
         else
         {
@@ -283,10 +283,9 @@ void app_uart_parser (void * p_data, uint16_t data_len)
 
             uart_payload.params.ack.cmd = uart_payload.cmd;
             uart_payload.cmd = RE_CA_UART_ACK;
-            msg.data_length = sizeof (msg);
         }
 
-        err_code = re_ca_uart_encode (msg.data, &msg.data_length, &uart_payload);
+        err_code |= re_ca_uart_encode (msg.data, &msg.data_length, &uart_payload);
         msg.repeat_count = 1;
 
         if (RE_SUCCESS == err_code)

diff --git a/src/ruuvi.drivers.c b/src/ruuvi.drivers.c
diff --git a/src/ruuvi.gateway_nrf.emProject b/src/ruuvi.gateway_nrf.emProject
@@ -238,7 +238,6 @@
       <file file_name="../nRF5_SDK_15.3.0_59ac345/components/libraries/pwr_mgmt/nrf_pwr_mgmt.c" />
       <file file_name="../nRF5_SDK_15.3.0_59ac345/components/libraries/experimental_section_vars/nrf_section_iter.c" />
       <file file_name="../nRF5_SDK_15.3.0_59ac345/components/libraries/uart/retarget.c" />
-      <file file_name="../nRF5_SDK_15.3.0_59ac345/components/libraries/fds/fds.c" />
       <file file_name="../nRF5_SDK_15.3.0_59ac345/components/libraries/strerror/nrf_strerror.c" />
       <file file_name="../nRF5_SDK_15.3.0_59ac345/components/libraries/ringbuf/nrf_ringbuf.c" />
       <file file_name="../nRF5_SDK_15.3.0_59ac345/components/libraries/bootloader/dfu/nrf_dfu_svci.c" />
+7 −7		.github/workflows/gh-pages-check.yml
+2 −2		.github/workflows/gh-pages-push.yml
+5 −2		.github/workflows/sonar-scan.yml
+6 −0		CHANGELOG.md
+105 −24		src/integration_tests/ruuvi_driver_sensor_test.c
+12 −12		src/integration_tests/ruuvi_driver_sensor_test.h
+3 −3		src/integration_tests/ruuvi_driver_test.h
+8 −1		src/integration_tests/ruuvi_interface_flash_test.c
+6 −7		src/integration_tests/ruuvi_interface_gpio_interrupt_test.h
+6 −6		src/integration_tests/ruuvi_interface_gpio_pwm_test.h
+7 −7		src/integration_tests/ruuvi_interface_gpio_test.h
+2 −2		src/integration_tests/ruuvi_interface_power_test.h
+5 −5		src/interfaces/acceleration/ruuvi_interface_lis2dh12.h
+1 −1		src/interfaces/communication/ruuvi_interface_communication.h
+5 −5		src/interfaces/communication/ruuvi_interface_communication_ble_advertising.h
+1 −1		src/interfaces/communication/ruuvi_interface_communication_ble_gatt.h
+1 −1		src/interfaces/communication/ruuvi_interface_communication_uart.h
+1 −1		src/interfaces/environmental/ruuvi_interface_adc_ntc.h
+1 −1		src/interfaces/environmental/ruuvi_interface_adc_photo.h
+1 −1		src/interfaces/environmental/ruuvi_interface_bme280.h
+2 −3		src/interfaces/environmental/ruuvi_interface_dps310.h
+1 −1		src/interfaces/environmental/ruuvi_interface_environmental_mcu.h
+20 −22		src/interfaces/environmental/ruuvi_interface_shtcx.c
+2 −2		src/interfaces/environmental/ruuvi_interface_shtcx.h
+519 −343		src/interfaces/environmental/ruuvi_interface_tmp117.c
+29 −29		src/interfaces/environmental/ruuvi_interface_tmp117.h
+1 −1		src/interfaces/flash/ruuvi_interface_flash.h
+7 −7		src/interfaces/gpio/ruuvi_interface_gpio.h
+8 −8		src/interfaces/gpio/ruuvi_interface_gpio_interrupt.h
+1 −1		src/interfaces/i2c/ruuvi_interface_i2c_bme280.h
+12 −12		src/interfaces/i2c/ruuvi_interface_i2c_tmp117.c
+11 −11		src/interfaces/i2c/ruuvi_interface_i2c_tmp117.h
+3 −4		src/interfaces/log/ruuvi_interface_log.c
+3 −3		src/interfaces/log/ruuvi_interface_log.h
+1 −1		src/interfaces/spi/ruuvi_interface_spi_bme280.h
+6 −6		src/interfaces/spi/ruuvi_interface_spi_dps310.h
+1 −1		src/interfaces/timer/ruuvi_interface_timer.h
+1 −1		src/nrf5_sdk15_platform/communication/ruuvi_nrf5_sdk15_communication_ble_advertising.c
+24 −8		src/nrf5_sdk15_platform/communication/ruuvi_nrf5_sdk15_communication_radio.c
+7 −7		src/nrf5_sdk15_platform/i2c/ruuvi_nrf5_sdk15_i2c.c
+13 −2		src/nrf5_sdk15_platform/nrf5_sdk15_config.h
+1 −1		src/nrf5_sdk15_platform/ruuvi.nrf_sdk15_3_overrides.c
+5 −1		src/ruuvi_driver_enabled_modules.h
+4 −0		src/ruuvi_driver_sensor.h
+3 −3		src/tasks/ruuvi_task_adc.c
+4 −4		src/tasks/ruuvi_task_adc.h
+1 −1		src/tasks/ruuvi_task_button.c
+1 −1		src/tasks/ruuvi_task_button.h
+1 −1		src/tasks/ruuvi_task_communication.h
+1 −1		src/tasks/ruuvi_task_flash.c
+1 −1		src/tasks/ruuvi_task_gatt.h
+1 −1		src/tasks/ruuvi_task_gpio.h
+1 −1		src/tasks/ruuvi_task_led.c
+1 −1		src/tasks/ruuvi_task_led.h
+1 −1		src/tasks/ruuvi_task_nfc.c
+1 −1		src/tasks/ruuvi_task_nfc.h
+814 −0		test/interfaces/environmental/test_ruuvi_interface_tmp117.c