resolved conflicts

include/app_bridge.h

@@ -9,19 +9,12 @@
 #define MODULES_NBUS_INC_APP_BRIDGE_H_
 
 #include "mcu_platform.h"
-<<<<<<< HEAD
-#include "nbus_config.h"
-=======
 
 typedef enum
 {
     // read-only sensors
     TYPE_UNKNOWN = 0xFF,
-<<<<<<< Updated upstream
-	TYPE_ACCELEROMETER = 0,
-=======
     TYPE_ACCELEROMETER = 0,
->>>>>>> Stashed changes
 	TYPE_GYROSCOPE,
 	TYPE_MAGNETOMETER,
 	TYPE_EULER_ANGLES_GAUGE,
@@ -50,7 +43,6 @@ typedef enum
     PARAM_MODE,
     _NBUS_PARAM_COUNT // number of parameters, must be last!
 } nBus_param_t;
->>>>>>> ebbae90508199fc827eb820f7a19826cea9035ef
 
 typedef enum
 {
@@ -74,12 +66,12 @@ typedef struct __attribute__((packed, aligned(1)))
      * uložený v logaritmickom tvare (pr. 2 -> 10^2).
      * @note: povolený rozsah [-64 , +63]
      */
-    uint8_t unit_multiplier : 7;
+    int8_t unit_multiplier : 7;
 
     /** Násobok meranej hodnoty uložený v logaritmickom tvare (pr. 1 -> 10^1).
      * @note: povolený rozsah [-128 , +127]
      */
-    uint8_t value_multiplier : 8;
+    int8_t value_multiplier : 8;
 
     /** Počet bajtov meranej hodnoty.
      * @note: povolený rozsah [1 , 8]