Добавлен TheeWayValve

This commit is contained in:
cfif 2026-11-13 13:59:51 +03:00
parent ac4d6104e1
commit bd149a237b
2 changed files with 67 additions and 1 deletions

View File

@ -319,6 +319,7 @@ setPressure(tTaskSerial *env, char *name,
uint32_t r1 = (uint32_t) calculate_r1_for_pressure_atm((float) pressure / 10, 51000.0f, 4.96f, 5.0f); uint32_t r1 = (uint32_t) calculate_r1_for_pressure_atm((float) pressure / 10, 51000.0f, 4.96f, 5.0f);
uint8_t step100; uint8_t step100;
uint8_t step10; uint8_t step10;
find_steps_for_resistance(r1, &step100, &step10); find_steps_for_resistance(r1, &step100, &step10);
@ -740,6 +741,69 @@ void SerialCommand_Scheduler(tTaskSerial *env) {
env->c_teTXV_eeChiller_Stat->eTXV_eeChiller_Temp_Val = atoi(env->At.rxBuffer.data + sizeof("eTXV_eeChiller_Temp_Val") - 1) + 40; env->c_teTXV_eeChiller_Stat->eTXV_eeChiller_Temp_Val = atoi(env->At.rxBuffer.data + sizeof("eTXV_eeChiller_Temp_Val") - 1) + 40;
} }
//----------------------------------------------eeTheeWayValve_Stat-----------------------------------------------------
//----------------------------------------------eeTheeWayValve_Stat-----------------------------------------------------
//----------------------------------------------eeTheeWayValve_Stat-----------------------------------------------------
if (AtCmdRxBeginWithStatic(&env->At, "State_CurrentMode")) {
env->c_tThreeWayValve_Stat->State_CurrentMode = atoi(env->At.rxBuffer.data + sizeof("State_CurrentMode") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "State_Move")) {
env->c_tThreeWayValve_Stat->State_Move = atoi(env->At.rxBuffer.data + sizeof("State_Move") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "State_SelfCheck")) {
env->c_tThreeWayValve_Stat->State_SelfCheck = atoi(env->At.rxBuffer.data + sizeof("State_SelfCheck") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Require_SelfCheck")) {
env->c_tThreeWayValve_Stat->Require_SelfCheck = atoi(env->At.rxBuffer.data + sizeof("Require_SelfCheck") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Err_Blockage")) {
env->c_tThreeWayValve_Stat->Err_Blockage = atoi(env->At.rxBuffer.data + sizeof("Err_Blockage") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Err_UnderVoltage")) {
env->c_tThreeWayValve_Stat->Err_UnderVoltage = atoi(env->At.rxBuffer.data + sizeof("Err_UnderVoltage") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Err_OverVoltage")) {
env->c_tThreeWayValve_Stat->Err_OverVoltage = atoi(env->At.rxBuffer.data + sizeof("Err_OverVoltage") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Err_OverTemperature")) {
env->c_tThreeWayValve_Stat->Err_OverTemperature = atoi(env->At.rxBuffer.data + sizeof("Err_OverTemperature") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Err_ChangeMode_OverTime")) {
env->c_tThreeWayValve_Stat->Err_ChangeMode_OverTime = atoi(env->At.rxBuffer.data + sizeof("Err_ChangeMode_OverTime") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Err_OverHallNumber")) {
env->c_tThreeWayValve_Stat->Err_OverHallNumber = atoi(env->At.rxBuffer.data + sizeof("Err_OverHallNumber") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Hall_Pulse")) {
env->c_tThreeWayValve_Stat->Hall_Pulse = atoi(env->At.rxBuffer.data + sizeof("Hall_Pulse") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Voltage")) {
env->c_tThreeWayValve_Stat->Voltage = atoi(env->At.rxBuffer.data + sizeof("Voltage") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "Current")) {
env->c_tThreeWayValve_Stat->Current = atoi(env->At.rxBuffer.data + sizeof("Current") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "NAMI_SWVer")) {
env->c_tThreeWayValve_Stat->NAMI_SWVer = atoi(env->At.rxBuffer.data + sizeof("NAMI_SWVer") - 1);
}
if (AtCmdRxBeginWithStatic(&env->At, "NAMI_HWVer")) {
env->c_tThreeWayValve_Stat->NAMI_HWVer = atoi(env->At.rxBuffer.data + sizeof("NAMI_HWVer") - 1);
}
//---------------------------------------------------LIN5------------------------------------------------------- //---------------------------------------------------LIN5-------------------------------------------------------
//---------------------------------------------------LIN5------------------------------------------------------- //---------------------------------------------------LIN5-------------------------------------------------------
//---------------------------------------------------LIN5------------------------------------------------------- //---------------------------------------------------LIN5-------------------------------------------------------
@ -824,6 +888,7 @@ void TaskSerialUSB1_Init(tTaskSerial *env,
env->c_teTXV_rHVAC_Stat = (teTXV_rHVAC_Stat *)&StatLIN4[4]; env->c_teTXV_rHVAC_Stat = (teTXV_rHVAC_Stat *)&StatLIN4[4];
env->c_teTXV_batChiller_Stat = (teTXV_batChiller_Stat *)&StatLIN4[5]; env->c_teTXV_batChiller_Stat = (teTXV_batChiller_Stat *)&StatLIN4[5];
env->c_teTXV_eeChiller_Stat = (teTXV_eeChiller_Stat *)&StatLIN4[6]; env->c_teTXV_eeChiller_Stat = (teTXV_eeChiller_Stat *)&StatLIN4[6];
env->c_tThreeWayValve_Stat = (tThreeWayValve_Stat *)&StatLIN4[7];
for (uint8_t i=0; i<LIN5_SENSOR_COUNT; ++i) { for (uint8_t i=0; i<LIN5_SENSOR_COUNT; ++i) {
env->c_DRS_Stat[i] = &StatLIN5[i]; env->c_DRS_Stat[i] = &StatLIN5[i];
@ -836,7 +901,7 @@ void TaskSerialUSB1_Init(tTaskSerial *env,
static _Noreturn void Serial_USB1_Thread(tTaskSerial *env) { static _Noreturn void Serial_USB1_Thread(tTaskSerial *env) {
int16_t temperature = 250; int16_t temperature = 850;
int16_t pressure = 200; int16_t pressure = 200;
setResistanceInit(env, "Duct_FL_Upper", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, setResistanceInit(env, "Duct_FL_Upper", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000,

View File

@ -88,6 +88,7 @@ typedef struct {
teTXV_rHVAC_Stat *c_teTXV_rHVAC_Stat; teTXV_rHVAC_Stat *c_teTXV_rHVAC_Stat;
teTXV_batChiller_Stat *c_teTXV_batChiller_Stat; teTXV_batChiller_Stat *c_teTXV_batChiller_Stat;
teTXV_eeChiller_Stat *c_teTXV_eeChiller_Stat; teTXV_eeChiller_Stat *c_teTXV_eeChiller_Stat;
tThreeWayValve_Stat *c_tThreeWayValve_Stat;
tDRS_Stat *c_DRS_Stat[LIN5_SENSOR_COUNT]; tDRS_Stat *c_DRS_Stat[LIN5_SENSOR_COUNT];