Ver Fonte

+ lint fix 5

DLIMIKO há 1 ano atrás
pai
commit
0b08650a96
4 ficheiros alterados com 53 adições e 51 exclusões
  1. 12 12
      include/app_bridge.h
  2. 21 21
      include/app_dummy.h
  3. 13 13
      src/app_dummy.c
  4. 7 5
      src/nbus_slave_sensor_unicast.c

+ 12 - 12
include/app_bridge.h

@@ -1,8 +1,8 @@
 /*
-* app_bridge.h
-*
-*  Created on: Nov 2, 2023
-*      Author: juraj
+ * app_bridge.h
+ *
+ *  Created on: Nov 2, 2023
+ *      Author: juraj
  */
 
 #ifndef MODULES_NBUS_INC_APP_BRIDGE_H_
@@ -37,31 +37,31 @@ typedef enum
 } nBus_param_t;
 
 /**
-* @brief Maximálny počet bajtov formátu Q.
+ * @brief Maximálny počet bajtov formátu Q.
  */
 #define Q_MAX_SIZE 64
 
 /**
-* @brief Definuje formát dát senzora.
+ * @brief Definuje formát dát senzora.
  */
 typedef struct __attribute__((packed))
 {
     /** Bit určujúci či sú dáta znamienkové.
-    * 0 = ungigned, 1 = signed */
+     * 0 = ungigned, 1 = signed */
     uint8_t sign : 1;
 
     /** Bit určujúci či majú dáta premenlivú dĺžku.
-    * Ak majú premenlivú dĺžku, dátový formát je potom:
-    * | sensor id | data len | data |
-    * 0 = fixed, 1 = variable */
+     * Ak majú premenlivú dĺžku, dátový formát je potom:
+     * | sensor id | data len | data |
+     * 0 = fixed, 1 = variable */
     uint8_t variable_length : 1;
 
     /** Počet celočíselných bitov formátu Qm.n
-    * rozsah: 0 - 64 */
+     * rozsah: 0 - 64 */
     uint8_t q_m : 7;
 
     /** Počet desatinných bitov formátu Qm.n
-    * rozsah: 0 - 64 */
+     * rozsah: 0 - 64 */
     uint8_t q_n : 7;
 } nBus_sensorFormat_t;
 

+ 21 - 21
include/app_dummy.h

@@ -1,8 +1,8 @@
 /*
-* app_dummy.h
-*
-*  Created on: Nov 2, 2023
-*      Author: juraj
+ * app_dummy.h
+ *
+ *  Created on: Nov 2, 2023
+ *      Author: juraj
  */
 
 #ifndef INC_APP_DUMMY_H_
@@ -17,23 +17,23 @@ extern "C"
 
 #include "app_bridge.h"
 
-nBusAppInterface_t *getDummyDriver();
-
-void dummy_init(void *hw_interface, void *hw_config);
-void dummy_reset();
-nBus_sensorType_t dummy_getType(uint8_t sensor_index);
-uint8_t dummy_getSensorCount();
-uint8_t dummy_getData(uint8_t sensor_index, uint8_t *data);
-uint8_t dummy_setData(uint8_t *data);
-int32_t dummy_getParam(uint8_t sensor_index, nBus_param_t param);
-uint8_t dummy_hasParam(uint8_t sensor_index, nBus_param_t param);
-nBus_param_t dummy_setParam(uint8_t sensor_index, nBus_param_t param, int32_t value);
-void dummy_start(void);
-void dummy_stop(void);
-void dummy_read(void);
-uint8_t dummy_store(void);
-uint8_t dummy_calibrate(uint8_t subslaveIndex, uint8_t calibrationParamsNum, uint8_t *calibrationParams);
-nBus_sensorFormat_t dummy_getFormat(uint8_t sensor_index);
+    nBusAppInterface_t *getDummyDriver();
+
+    void dummy_init(void *hw_interface, void *hw_config);
+    void dummy_reset();
+    nBus_sensorType_t dummy_getType(uint8_t sensor_index);
+    uint8_t dummy_getSensorCount();
+    uint8_t dummy_getData(uint8_t sensor_index, uint8_t *data);
+    uint8_t dummy_setData(uint8_t *data);
+    int32_t dummy_getParam(uint8_t sensor_index, nBus_param_t param);
+    uint8_t dummy_hasParam(uint8_t sensor_index, nBus_param_t param);
+    nBus_param_t dummy_setParam(uint8_t sensor_index, nBus_param_t param, int32_t value);
+    void dummy_start(void);
+    void dummy_stop(void);
+    void dummy_read(void);
+    uint8_t dummy_store(void);
+    uint8_t dummy_calibrate(uint8_t subslaveIndex, uint8_t calibrationParamsNum, uint8_t *calibrationParams);
+    nBus_sensorFormat_t dummy_getFormat(uint8_t sensor_index);
 
 #ifdef __cplusplus
 }

+ 13 - 13
src/app_dummy.c

@@ -2,9 +2,9 @@
 #include <stdint.h>
 
 nBusAppInterface_t dummy_driver = {
-        dummy_init,    dummy_reset,    dummy_getType,  dummy_getSensorCount, dummy_getData,
-        dummy_setData, dummy_hasParam, dummy_getParam, dummy_setParam,       dummy_start,
-        dummy_stop,    dummy_read,     dummy_store,    dummy_calibrate,      dummy_getFormat,
+    dummy_init,    dummy_reset,    dummy_getType,  dummy_getSensorCount, dummy_getData,
+    dummy_setData, dummy_hasParam, dummy_getParam, dummy_setParam,       dummy_start,
+    dummy_stop,    dummy_read,     dummy_store,    dummy_calibrate,      dummy_getFormat,
 };
 
 nBusAppInterface_t *getDummyDriver()
@@ -28,16 +28,16 @@ nBus_sensorType_t dummy_getType(uint8_t sensor_index)
 
     switch (sensor_index)
     {
-        case 1:
-            return TYPE_ACCELEROMETER;
-        case 2:
-            return TYPE_GYROSCOPE;
-        case 3:
-            return TYPE_MAGNETOMETER;
-        case 4:
-            return TYPE_HEART_RATE;
-        case 5:
-            return TYPE_PRESSURE;
+    case 1:
+        return TYPE_ACCELEROMETER;
+    case 2:
+        return TYPE_GYROSCOPE;
+    case 3:
+        return TYPE_MAGNETOMETER;
+    case 4:
+        return TYPE_HEART_RATE;
+    case 5:
+        return TYPE_PRESSURE;
     }
     return TYPE_UNKNOWN;
 }

+ 7 - 5
src/nbus_slave_sensor_unicast.c

@@ -158,11 +158,12 @@ void nbus_slave_unicastToSensorSet(nBus_TypeDef *nbus)
 
         nbus->tx_buffer[4] = 1;
         nbus->tx_length += 1;
-    }#include "nbus_slave.h"
+    }
+#include "nbus_slave.h"
 
 #if MODULE_SLAVE == 1
 
-            void nbus_slave_unicastToSensorGet(nBus_TypeDef *nbus)
+            void nbus_slave_unicastToSensorGet(nBus_TypeDef * nbus)
         {
             switch (nbus->function_code.function)
             {
@@ -187,7 +188,8 @@ void nbus_slave_unicastToSensorSet(nBus_TypeDef *nbus)
                         break;
                     }
                     nbus->tx_buffer[4] = nbus->rx_buffer[3];
-                    int32_t param_value = nbus->interface->getParam(nbus->sensorInfo.address, (nBus_param_t)nbus->rx_buffer[3]);
+                    int32_t param_value =
+                        nbus->interface->getParam(nbus->sensorInfo.address, (nBus_param_t)nbus->rx_buffer[3]);
                     nbus->tx_buffer[5] = (uint8_t)(param_value & 0xFF);
                     nbus->tx_buffer[6] = (uint8_t)((param_value >> 8) & 0xFF);
                     nbus->tx_buffer[7] = (uint8_t)((param_value >> 16) & 0xFF);
@@ -251,7 +253,7 @@ void nbus_slave_unicastToSensorSet(nBus_TypeDef *nbus)
             }
         }
 
-        void nbus_slave_unicastToSensorSet(nBus_TypeDef *nbus)
+        void nbus_slave_unicastToSensorSet(nBus_TypeDef * nbus)
         {
             int32_t param_value;
             switch (nbus->function_code.function)
@@ -327,7 +329,7 @@ void nbus_slave_unicastToSensorSet(nBus_TypeDef *nbus)
             }
         }
 
-        void sensor_store_param(nBus_TypeDef *nbus, uint8_t sensor_index, uint8_t param_name)
+        void sensor_store_param(nBus_TypeDef * nbus, uint8_t sensor_index, uint8_t param_name)
         {
             uint32_t param_value = nbus->interface->getParam(sensor_index, param_name);
             nbus->memoryInterface->storeParam(sensor_index, param_name, param_value);