diff --git a/ArbiterCommand.c b/ArbiterCommand.c index fb55405..d7a9564 100644 --- a/ArbiterCommand.c +++ b/ArbiterCommand.c @@ -465,59 +465,67 @@ void SerialCommand_Scheduler(tTaskSerial *env) { if (AtCmdRxBeginWithStatic(&env->At, "Duct_FL_Upper")) { setResistance(env, "Duct_FL_Upper", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_A, SENSOR_ADR_1, SENSOR_ADR_2); + continue; } if (AtCmdRxBeginWithStatic(&env->At, "Duct_FR_Upper")) { setResistance(env, "Duct_FR_Upper", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_A, SENSOR_ADR_3, SENSOR_ADR_4); + continue; } if (AtCmdRxBeginWithStatic(&env->At, "Duct_FL_Lower")) { setResistance(env, "Duct_FL_Lower", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_A, SENSOR_ADR_5, SENSOR_ADR_6); + continue; } if (AtCmdRxBeginWithStatic(&env->At, "Duct_FR_Lower")) { setResistance(env, "Duct_FR_Lower", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_A, SENSOR_ADR_7, SENSOR_ADR_8); + continue; } if (AtCmdRxBeginWithStatic(&env->At, "Duct_FL_Side")) { setResistance(env, "Duct_FL_Side", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_A, SENSOR_ADR_9, SENSOR_ADR_10); + continue; } if (AtCmdRxBeginWithStatic(&env->At, "Duct_FR_Side")) { setResistance(env, "Duct_FR_Side", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_A, SENSOR_ADR_11, SENSOR_ADR_12); + continue; } if (AtCmdRxBeginWithStatic(&env->At, "Eva_F")) { setResistance(env, "Eva_F", duct_lookup_table_20000, size_duct_lookup_table_20000, SENSOR_TYPE_A, SENSOR_ADR_13, SENSOR_ADR_14); + continue; } - if (AtCmdRxBeginWithStatic(&env->At, "Duct_RL_Side")) { setResistance(env, "Duct_RL_Side", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, + SENSOR_ADR_1, SENSOR_ADR_2); + continue; + } + + if (AtCmdRxBeginWithStatic(&env->At, "Duct_RL")) { + setResistance(env, "Duct_RL", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, SENSOR_ADR_5, SENSOR_ADR_6); continue; } if (AtCmdRxBeginWithStatic(&env->At, "Duct_RR_Side")) { setResistance(env, "Duct_RR_Side", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, - SENSOR_ADR_7, SENSOR_ADR_8); + SENSOR_ADR_3, SENSOR_ADR_4); continue; } - if (AtCmdRxBeginWithStatic(&env->At, "Duct_RL")) { - setResistance(env, "Duct_RL", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, - SENSOR_ADR_1, SENSOR_ADR_2); - } - if (AtCmdRxBeginWithStatic(&env->At, "Duct_RR")) { setResistance(env, "Duct_RR", duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, - SENSOR_ADR_3, SENSOR_ADR_4); + SENSOR_ADR_7, SENSOR_ADR_8); + continue; } if (AtCmdRxBeginWithStatic(&env->At, "Eva_R")) { @@ -610,7 +618,7 @@ void TaskSerialUSB1_Init(tTaskSerial *env, static _Noreturn void Serial_USB1_Thread(tTaskSerial *env) { - int16_t temperature = 180; + int16_t temperature = 250; int16_t pressure = 200; setResistanceInit(env, "Duct_FL_Upper", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, @@ -643,18 +651,18 @@ static _Noreturn void Serial_USB1_Thread(tTaskSerial *env) { SENSOR_ADR_14); setResistanceInit(env, "Duct_RL_Side", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, - SENSOR_ADR_5, - SENSOR_ADR_6); - setResistanceInit(env, "Duct_RR_Side", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, - SENSOR_TYPE_B, - SENSOR_ADR_7, - SENSOR_ADR_8); - setResistanceInit(env, "Duct_RL", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, SENSOR_ADR_1, SENSOR_ADR_2); - setResistanceInit(env, "Duct_RR", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, + setResistanceInit(env, "Duct_RR_Side", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, + SENSOR_TYPE_B, SENSOR_ADR_3, SENSOR_ADR_4); + setResistanceInit(env, "Duct_RL", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, + SENSOR_ADR_5, + SENSOR_ADR_6); + setResistanceInit(env, "Duct_RR", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, SENSOR_TYPE_B, + SENSOR_ADR_7, + SENSOR_ADR_8); setResistanceInit(env, "Eva_R", temperature, duct_lookup_table_20000, size_duct_lookup_table_20000, SENSOR_TYPE_B, SENSOR_ADR_9,