|
|
@@ -9,7 +9,44 @@
|
|
|
#define MODULES_NBUS_INC_APP_BRIDGE_H_
|
|
|
|
|
|
#include "mcu_platform.h"
|
|
|
+<<<<<<< HEAD
|
|
|
#include "nbus_config.h"
|
|
|
+=======
|
|
|
+
|
|
|
+typedef enum
|
|
|
+{
|
|
|
+ // read-only sensors
|
|
|
+ TYPE_UNKNOWN = 0xFF,
|
|
|
+ TYPE_ACCELEROMETER = 0,
|
|
|
+ TYPE_GYROSCOPE,
|
|
|
+ TYPE_MAGNETOMETER,
|
|
|
+ TYPE_EULER_ANGLES_GAUGE,
|
|
|
+ TYPE_THERMOMETER,
|
|
|
+ TYPE_HYGROMETER,
|
|
|
+ TYPE_PRESSURE_GAUGE,
|
|
|
+ TYPE_HEART_RATE_MONITOR,
|
|
|
+ TYPE_LENGTH_GAUGE,
|
|
|
+ // read-write sensors
|
|
|
+ TYPE_LED_CONTROLLER,
|
|
|
+ TYPE_MOTOR_CONTROLLER
|
|
|
+} nBus_sensorType_t;
|
|
|
+
|
|
|
+typedef enum
|
|
|
+{
|
|
|
+ PARAM_NONE = 0xFF,
|
|
|
+ PARAM_TIMEBASE = 0,
|
|
|
+ PARAM_RESOLUTION,
|
|
|
+ PARAM_GAIN,
|
|
|
+ PARAM_OFFSET,
|
|
|
+ PARAM_SAMPLERATE,
|
|
|
+ PARAM_RANGE,
|
|
|
+ PARAM_RANGE0,
|
|
|
+ PARAM_FILTER,
|
|
|
+ PARAM_ENABLE,
|
|
|
+ PARAM_MODE,
|
|
|
+ _NBUS_PARAM_COUNT // number of parameters, must be last!
|
|
|
+} nBus_param_t;
|
|
|
+>>>>>>> ebbae90508199fc827eb820f7a19826cea9035ef
|
|
|
|
|
|
typedef enum
|
|
|
{
|
