Merge branch 'jd_rsComm_nrf' into 'main'

RS485 integration to NRF

See merge request sensorical/fw/nbus!5

include/nbus_master_module.h

@@ -8,6 +8,7 @@
 #ifndef MODULES_NBUS_INC_NBUS_MASTER_MODULE_H_
 #define MODULES_NBUS_INC_NBUS_MASTER_MODULE_H_
 
+#include "nbus_cmd.h"
 #include "nbus_config.h"
 #include "nbus_types.h"
 

src/nbus_app.c

@@ -146,10 +146,6 @@ static void process_request()
             nbus_slave_unicastToModuleSet(&nBus);
         }
     }
-
-    nBus.tx_buffer[3] = *(uint8_t *)&nBus.function_code;
-    nBus.tx_buffer[nBus.tx_length - 1] = crc8x_fast(&nBus.tx_buffer[1], nBus.tx_length - 2);
-    nBus.tx_buffer[0] = nBus.tx_length;
 #endif
 
 #if MODULE_MASTER == 1
@@ -162,6 +158,9 @@ static void process_request()
         nbus_master_unicastToModuleSet(&nBus);
     }
 #endif
+    nBus.tx_buffer[3] = *(uint8_t *)&nBus.function_code;
+    nBus.tx_buffer[nBus.tx_length - 1] = crc8x_fast(&nBus.tx_buffer[1], nBus.tx_length - 2);
+    nBus.tx_buffer[0] = nBus.tx_length;
 }
 
 static void nbus_blink_LED(uint8_t delay)
@@ -291,9 +290,8 @@ void nbus_init_memory_driver(nBus_MemoryDriver *memDriver)
 void nbus_stack(void)
 {
 
-    nbus_blink_LED(50);
-
 #if USE_ARDUINO_FRAMWORK == 0
+    nbus_blink_LED(50);
     while (1)
 #endif
     {
@@ -302,10 +300,13 @@ void nbus_stack(void)
 
             process_request();
             nBus.uart_state = UART_RX_WAIT;
-
+#if MODULE_SLAVE == 1
             send_response();
+#endif
 #if MODULE_MASTER == 1
-            receive_slave_response();
+            // test
+            send_response();
+            // receive_slave_response();
 #endif
         }
 

src/nbus_master_module.c

@@ -10,36 +10,32 @@
 
 #if MODULE_MASTER == 1
 
+inline void setErrorResponse(nBus_TypeDef *nbus, uint8_t code)
+{
+    nbus->function_code.error = 1;
+    nbus->tx_buffer[4] = code;
+    nbus->tx_length += 1;
+}
+
 void nbus_master_unicastToModuleSet(nBus_TypeDef *nbus)
 {
 }
 
 void nbus_master_unicastToModuleGet(nBus_TypeDef *nbus)
 {
-    //		case CMD_SYNC:
+    switch (nbus->function_code.function)
     {
-        if (nbus->rx_length < 11)
+    case CMD_ECHO: {
+        for (uint8_t i = 3; i < nbus->rx_length - 1; i++)
         {
-            return;
+            nbus->tx_buffer[i + 1] = nbus->rx_buffer[i] + 1;
         }
-
-        // RTC_TimeTypeDef sTime = {0};
-        // RTC_DateTypeDef sDate = {0};
-
-        // sTime.Hours = nbus->rx_buffer[7];
-        // sTime.Minutes = nbus->rx_buffer[8];
-        // sTime.Seconds = nbus->rx_buffer[9];
-        // sTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
-        // sTime.StoreOperation = RTC_STOREOPERATION_RESET;
-        // HAL_RTC_SetTime(nbus->periph->rtc, &sTime, RTC_FORMAT_BCD);
-
-        // sDate.WeekDay = nbus->rx_buffer[6];
-        // sDate.Date = nbus->rx_buffer[5];
-        // sDate.Month = nbus->rx_buffer[4];
-        // sDate.Year = nbus->rx_buffer[3];
-
-        // HAL_RTC_SetDate(nbus->periph->rtc, &sDate, RTC_FORMAT_BCD);
+        nbus->tx_length += (nbus->rx_length - 4);
+        break;
+    }
+    default: {
+        setErrorResponse(nbus, ILLEGAL_FUNCTION);
+    }
     }
-    //		break;
 }
 #endif