From bd149a237bf72bf1e27f7ed40cd65999eac63229 Mon Sep 17 00:00:00 2001 From: cfif Date: Fri, 13 Nov 2026 13:59:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20TheeWayValve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArbiterCommand.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++- ArbiterCommand.h | 1 + 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/ArbiterCommand.c b/ArbiterCommand.c index 0788252..985d3e9 100644 --- a/ArbiterCommand.c +++ b/ArbiterCommand.c @@ -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); + uint8_t step100; uint8_t 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; } + //----------------------------------------------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------------------------------------------------------- @@ -824,6 +888,7 @@ void TaskSerialUSB1_Init(tTaskSerial *env, env->c_teTXV_rHVAC_Stat = (teTXV_rHVAC_Stat *)&StatLIN4[4]; env->c_teTXV_batChiller_Stat = (teTXV_batChiller_Stat *)&StatLIN4[5]; env->c_teTXV_eeChiller_Stat = (teTXV_eeChiller_Stat *)&StatLIN4[6]; + env->c_tThreeWayValve_Stat = (tThreeWayValve_Stat *)&StatLIN4[7]; for (uint8_t i=0; ic_DRS_Stat[i] = &StatLIN5[i]; @@ -836,7 +901,7 @@ void TaskSerialUSB1_Init(tTaskSerial *env, static _Noreturn void Serial_USB1_Thread(tTaskSerial *env) { - int16_t temperature = 250; + int16_t temperature = 850; int16_t pressure = 200; setResistanceInit(env, "Duct_FL_Upper", temperature, duct_lookup_table_3000, size_duct_lookup_table_3000, diff --git a/ArbiterCommand.h b/ArbiterCommand.h index e613110..475ff52 100644 --- a/ArbiterCommand.h +++ b/ArbiterCommand.h @@ -88,6 +88,7 @@ typedef struct { teTXV_rHVAC_Stat *c_teTXV_rHVAC_Stat; teTXV_batChiller_Stat *c_teTXV_batChiller_Stat; teTXV_eeChiller_Stat *c_teTXV_eeChiller_Stat; + tThreeWayValve_Stat *c_tThreeWayValve_Stat; tDRS_Stat *c_DRS_Stat[LIN5_SENSOR_COUNT];