resolved conflicts

src/app_dummy.c

@@ -106,3 +106,26 @@ uint8_t dummy_calibrate(uint8_t subslaveIndex, uint8_t calibrationParamsNum, uin
 {
     return 0;
 }
+
+nBus_sensorFormat_t dummy_getSensorFormat(uint8_t sensor_index)
+{
+    switch (sensor_index)
+    {
+    case 1:
+        return (nBus_sensorFormat_t){
+            .sign = 0, .unit_multiplier = -3, .value_multiplier = -6, .byte_length = 4, .samples = 4};
+        break;
+    case 2:
+        return (nBus_sensorFormat_t){
+            .sign = 0, .unit_multiplier = -4, .value_multiplier = -7, .byte_length = 4, .samples = 4};
+        break;
+    case 3:
+        return (nBus_sensorFormat_t){
+            .sign = 1, .unit_multiplier = 3, .value_multiplier = 6, .byte_length = 4, .samples = 4};
+        break;
+    case 4:
+        return (nBus_sensorFormat_t){
+            .sign = 1, .unit_multiplier = 4, .value_multiplier = 7, .byte_length = 4, .samples = 4};
+        break;
+    }
+}