Juraj Ďuďák пре 1 година
родитељ
комит
833bd06d46
3 измењених фајлова са 19 додато и 15 уклоњено
  1. 5 0
      include/mcu_platform.h
  2. 2 2
      include/nbus_slave.h
  3. 12 13
      src/nbus_slave_module_unicast.c

+ 5 - 0
include/mcu_platform.h

@@ -12,6 +12,7 @@
     defined(STM32F101xE) || defined(STM32F101xG) || defined(STM32F102x6) || defined(STM32F102xB) ||                    \
     defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG)
 #include "stm32f1xx.h"
+#define STM32
 #define STM32F1
 #endif
 
@@ -20,6 +21,7 @@
     defined(STM32F070x6) || defined(STM32F070xB) || defined(STM32F071xB) || defined(STM32F072xB) ||                    \
     defined(STM32F078xx) || defined(STM32F091xC) || defined(STM32F098xx) || defined(STM32F030xC)
 #include "stm32f0xx.h"
+#define STM32
 #define STM32F0
 #endif // defined
 
@@ -28,6 +30,7 @@
     defined(STM32L062xx) || defined(STM32L063xx) || defined(STM32L071xx) || defined(STM32L072xx) ||                    \
     defined(STM32L073xx) || defined(STM32L081xx) || defined(STM32L082xx) || defined(STM32L083xx)
 #include "stm32l0xx.h"
+#define STM32
 #define STM32L0
 #endif // defined
 
@@ -36,9 +39,11 @@
     defined(STM32F328xx) || defined(STM32F302xE) || defined(STM32F303xE) || defined(STM32F398xx) ||                    \
     defined(STM32F373xC) || defined(STM32F378xx)
 #include "stm32f3xx.h"
+#define STM32
 #define STM32F3
 #endif // defined
 #if defined(STM32L432xx)
+#define STM32
 #include "stm32l4xx.h"
 #include "stm32l4xx_hal.h"
 #endif

+ 2 - 2
include/nbus_slave.h

@@ -11,8 +11,8 @@
 #include "nbus_types.h"
 
 #ifdef ESP32
-    #include <inttypes.h>
-    #include <stddef.h>
+#include <inttypes.h>
+#include <stddef.h>
 #endif
 
 void setErrorResponse(nBus_TypeDef *nbus, uint8_t code);

+ 12 - 13
src/nbus_slave_module_unicast.c

@@ -90,19 +90,18 @@ void nbus_slave_unicastToModuleGet(nBus_TypeDef *nbus)
             nbus->tx_buffer[6] = MODULE_TYPE[2];
             nbus->tx_length += 3;
             break;
-        case INFO_MODULE_UUID:
-            {
-                // Reference manual: Unique device ID registers
-                #if defined(STM32)
-                    uint32_t(*unique_id_3) = (uint32_t *)(0x1FF80064); // BASE address + 0x14 0ffset
-                #elif defined(ESP32)
-                    uint32_t unique_id_3[3] = {1, 2, 3};
-                #endif 
-
-                *(nbus->tx_buffer) = (uint32_t)unique_id_3;
-                nbus->tx_length += 4;
-            }
-            break;
+        case INFO_MODULE_UUID: {
+// Reference manual: Unique device ID registers
+#if defined(STM32)
+            uint32_t(*unique_id_3) = (uint32_t *)(0x1FF80064); // BASE address + 0x14 0ffset
+#elif defined(ESP32)
+            uint32_t unique_id_3[3] = {1, 2, 3};
+#endif
+
+            *(nbus->tx_buffer) = (uint32_t)unique_id_3;
+            nbus->tx_length += 4;
+        }
+        break;
         case INFO_MODULE_FW:
             nbus->tx_buffer[4] = VERSION_FW[0];
             nbus->tx_buffer[5] = '.';