The datapool variables definition has been corrected. The controller is now working apparently well. It still needs to be tested with real data and devices.
This commit is contained in:
@ -12,60 +12,22 @@
|
||||
|
||||
namespace datapool {
|
||||
enum opus_variable_id {
|
||||
DUMMY1 = 0x100000,
|
||||
DUMMY2 = 0x100001,
|
||||
DUMMY3 = 0x100002,
|
||||
DUMMY4 = 0x100003,
|
||||
DUMMY5 = 0x100004,
|
||||
DUMMY6 = 0x100005,//TEST VAR
|
||||
LIMIT_VAR = 0x100006,
|
||||
TIME_STAMPER = 0x100007,
|
||||
|
||||
/* The IDs of the variables of the Arduino serial output are here defined.*/
|
||||
|
||||
/*
|
||||
Temperature.start_string = 0x100008,
|
||||
Temperature.Typ = 0x100009,
|
||||
Temperature.SPCChNumber = 0x100010,
|
||||
Temperature.Value_Cnt = 0x100011,
|
||||
Temperature.temperature = 0x100012,
|
||||
Temperature.Timestamp = 0x100013,
|
||||
Temperature.end_string = 0x100014,
|
||||
|
||||
Environmental.start_string = 0x100015,
|
||||
Environmental.Typ = 0x100016,
|
||||
Environmental.SPCChNumber = 0x100017,
|
||||
Environmental.Value_Cnt = 0x100018,
|
||||
Environmental.Value = 0x100019,
|
||||
Environmental.Timestamp = 0x100020,
|
||||
Environmental.end_string = 0x100021,
|
||||
|
||||
Accelerometer.start_string = 0x100022,
|
||||
Accelerometer.Typ = 0x100023,
|
||||
Accelerometer.SPCChNumber = 0x100024,
|
||||
Accelerometer.Value_Cnt = 0x100025,
|
||||
Accelerometer.Value = 0x100026,
|
||||
Accelerometer.Timestamp = 0x100027,
|
||||
Accelerometer.end_string = 0x100028,
|
||||
*/
|
||||
|
||||
Temperature_value = 0x100008,
|
||||
Temperature_Timestamp = 0x100009,
|
||||
Environmental_value = 0x100010,
|
||||
Environmental_Timestamp = 0x100011,
|
||||
Accelerometer_value = 0x100012,
|
||||
Accelerometer_Timestamp = 0x100013,
|
||||
|
||||
TEMP_SENSOR_CH1 = 0x100014,
|
||||
TEMP_SENSOR_CH2 = 0x100015,
|
||||
TargetState_COMPONENT_1 = 0x100016,
|
||||
CurrentState_COMPONENT_1 = 0x100017,
|
||||
HeaterRequest_COMPONENT_1 = 0x100018,
|
||||
TargetState_COMPONENT_2 = 0x100019,
|
||||
CurrentState_COMPONENT_2 = 0x100020,
|
||||
HeaterRequest_COMPONENT_2 = 0x100021
|
||||
//Temp_COMPONENT_1 = 0x100098,
|
||||
//Temp_COMPONENT_2 = 0x100099,
|
||||
// The IDs of the variables of the DH and CONTROLLER are here defined.
|
||||
Temperature_value = 0x100001,
|
||||
Temperature_Timestamp = 0x100002,
|
||||
Environmental_value = 0x10003,
|
||||
Environmental_Timestamp = 0x10004,
|
||||
Accelerometer_value = 0x10005,
|
||||
Accelerometer_Timestamp = 0x10006,
|
||||
TEMP_SENSOR_CH1 = 0x10007,
|
||||
TEMP_SENSOR_CH2 = 0x10008,
|
||||
TargetState_COMPONENT_1 = 0x10009,
|
||||
CurrentState_COMPONENT_1 = 0x100010,
|
||||
HeaterRequest_COMPONENT_1 = 0x100011,
|
||||
TargetState_COMPONENT_2 = 0x100012,
|
||||
CurrentState_COMPONENT_2 = 0x100013,
|
||||
HeaterRequest_COMPONENT_2 = 0x100014
|
||||
|
||||
|
||||
};
|
||||
|
Reference in New Issue
Block a user