Добавлен TheeWayValve

This commit is contained in:
cfif 2026-11-13 13:59:51 +03:00
parent de84d1bcfd
commit 16443db49a
2 changed files with 66 additions and 5 deletions

View File

@ -31,7 +31,8 @@ const uint8_t LIN4_SENSON_ADR_Stat[LIN4_SENSOR_COUNT] = {AirQS_Stat,
eTXV_fHVAC_Stat, eTXV_fHVAC_Stat,
eTXV_rHVAC_Stat, eTXV_rHVAC_Stat,
eTXV_batChiller_Stat, eTXV_batChiller_Stat,
eTXV_eeChiller_Stat}; eTXV_eeChiller_Stat,
TheeWayValveStat};
const uint8_t LIN4_SENSON_LEN_Stat[LIN4_SENSOR_COUNT] = {sizeof(tAirQS_Stat), const uint8_t LIN4_SENSON_LEN_Stat[LIN4_SENSOR_COUNT] = {sizeof(tAirQS_Stat),
sizeof(tAroma_Stat), sizeof(tAroma_Stat),
@ -39,7 +40,8 @@ const uint8_t LIN4_SENSON_LEN_Stat[LIN4_SENSOR_COUNT] = {sizeof(tAirQS_Stat),
sizeof(teTXV_fHVAC_Stat), sizeof(teTXV_fHVAC_Stat),
sizeof(teTXV_rHVAC_Stat), sizeof(teTXV_rHVAC_Stat),
sizeof(teTXV_batChiller_Stat), sizeof(teTXV_batChiller_Stat),
sizeof(teTXV_eeChiller_Stat)}; sizeof(teTXV_eeChiller_Stat),
sizeof(tThreeWayValve_Stat)};
static lin_event_id_t SEND_SENSOR_COM_x(tSerialPortLinIO *linIo, tLinData *linData, uint8_t COM_ADR) { static lin_event_id_t SEND_SENSOR_COM_x(tSerialPortLinIO *linIo, tLinData *linData, uint8_t COM_ADR) {
@ -151,6 +153,10 @@ static lin_event_id_t Lin4_Scheduler(tLin4TaskSensor *env) {
memcpy(&env->Stat[0], &StatLIN4[0], 8 * LIN4_SENSOR_COUNT); memcpy(&env->Stat[0], &StatLIN4[0], 8 * LIN4_SENSOR_COUNT);
if (ADR_COM == CCU_TheeWayValve_Req) {
asm("nop");
} else
if (ADR_COM == CCU_Req){ if (ADR_COM == CCU_Req){
asm("nop"); asm("nop");
/* /*
@ -282,6 +288,30 @@ static lin_event_id_t Lin4_Scheduler(tLin4TaskSensor *env) {
break; break;
} }
case eeTheeWayValve_Stat: {
tThreeWayValve_Stat *p_tThreeWayValve_Stat = (tThreeWayValve_Stat *) &env->Stat[i];
LoggerFormatInfo(LOGGER, LOG_SIGN4,
"State_CurrentMode = %d State_Move = %d State_SelfCheck = %d Require_SelfCheck = %d Err_Blockage = %d Err_UnderVoltage = %d Err_OverVoltage = %d Err_ChangeMode_OverTime = %d Err_OverHallNumber = %d Hall_Pulse = %d State_Move = %d Voltage = %d Current = %d NAMI_SWVer = %d NAMI_HWVer = %d",
p_tThreeWayValve_Stat->State_CurrentMode,
p_tThreeWayValve_Stat->State_Move,
p_tThreeWayValve_Stat->State_SelfCheck,
p_tThreeWayValve_Stat->Require_SelfCheck,
p_tThreeWayValve_Stat->Err_Blockage,
p_tThreeWayValve_Stat->Err_UnderVoltage,
p_tThreeWayValve_Stat->Err_OverVoltage,
p_tThreeWayValve_Stat->Err_OverTemperature,
p_tThreeWayValve_Stat->Err_ChangeMode_OverTime,
p_tThreeWayValve_Stat->Err_OverHallNumber,
p_tThreeWayValve_Stat->Hall_Pulse,
p_tThreeWayValve_Stat->Voltage,
p_tThreeWayValve_Stat->Current,
p_tThreeWayValve_Stat->NAMI_SWVer,
p_tThreeWayValve_Stat->NAMI_HWVer)
break;
}
} }

View File

@ -14,7 +14,7 @@
#define LOG_LIN4_SENSOR 1 #define LOG_LIN4_SENSOR 1
#define LOG_LIN5_SENSOR 0 #define LOG_LIN5_SENSOR 0
#define LIN4_SENSOR_COUNT 7 #define LIN4_SENSOR_COUNT 8
typedef enum { typedef enum {
eeAirQS_Stat = 0, eeAirQS_Stat = 0,
@ -23,17 +23,20 @@ typedef enum {
eeTXV_fHVAC_Stat = 3, eeTXV_fHVAC_Stat = 3,
eeTXV_rHVAC_Stat = 4, eeTXV_rHVAC_Stat = 4,
eeTXV_batChiller_Stat = 5, eeTXV_batChiller_Stat = 5,
eeTXV_eeChiller_Stat = 6 eeTXV_eeChiller_Stat = 6,
eeTheeWayValve_Stat = 7
} eSensorStat4; } eSensorStat4;
#define AirQS_Stat 0x14 #define AirQS_Stat 0x14
#define Aroma_Stat 0x5 #define Aroma_Stat 0x5
#define CCU_Req 0x1 #define CCU_Req 0x1
#define CCU_TheeWayValve_Req 0xB
#define Ionizer_Stat 0x1C #define Ionizer_Stat 0x1C
#define eTXV_fHVAC_Stat 0x1E #define eTXV_fHVAC_Stat 0x1E
#define eTXV_rHVAC_Stat 0x20 #define eTXV_rHVAC_Stat 0x20
#define eTXV_batChiller_Stat 0x22 #define eTXV_batChiller_Stat 0x22
#define eTXV_eeChiller_Stat 0x24 #define eTXV_eeChiller_Stat 0x24
#define TheeWayValveStat 0x0E
#define LIN5_SENSOR_COUNT 8 #define LIN5_SENSOR_COUNT 8
@ -47,6 +50,34 @@ typedef enum {
#define DRS_FCL_Stat 0x2B #define DRS_FCL_Stat 0x2B
#define DRS_FCR_Stat 0x30 #define DRS_FCR_Stat 0x30
typedef struct __attribute__ ((packed)) {
uint16_t Reserve1: 12; // 0
uint8_t ECU_Ctrl_Motor_Test: 2; // 12
uint8_t ECU_Ctrl_Check: 1; // 14
uint8_t ECU_Ctrl_Production_Test: 1; // 15
uint8_t Reserve2: 8; // 16
uint8_t ECU_Ctrl_TargetMode: 8; // 24
} tThreeWayValve_Req;
typedef struct __attribute__ ((packed)) {
uint8_t State_CurrentMode: 8; // 0
uint8_t State_Move: 1; // 8
uint8_t Reserve1: 1; // 9
uint8_t State_SelfCheck: 1; // 10
uint8_t Require_SelfCheck: 1; // 11
uint8_t Err_Blockage: 1; // 12
uint8_t Err_UnderVoltage: 1; // 13
uint8_t Err_OverVoltage: 1; // 14
uint8_t Err_OverTemperature: 1; // 15
uint8_t Err_ChangeMode_OverTime: 1; // 16
uint8_t Err_OverHallNumber: 1; // 17
uint8_t Reserve2: 6; // 18
uint16_t Hall_Pulse: 16; // 24
uint8_t Voltage: 8; // 40
uint8_t Current: 8; // 48
uint8_t NAMI_SWVer: 4; // 56
uint8_t NAMI_HWVer: 4; // 60
} tThreeWayValve_Stat;
typedef struct __attribute__ ((packed)) { typedef struct __attribute__ ((packed)) {
uint8_t AirQS_LinRespErr_Stat: 1; // 0 uint8_t AirQS_LinRespErr_Stat: 1; // 0