diff --git a/MODULES/HVAC_M7_CAN_UDS/CanUds.c b/MODULES/HVAC_M7_CAN_UDS/CanUds.c index f4c0a68..74ffdc4 100644 --- a/MODULES/HVAC_M7_CAN_UDS/CanUds.c +++ b/MODULES/HVAC_M7_CAN_UDS/CanUds.c @@ -79,20 +79,20 @@ void CanUdsInput_Set_Model(tCanUds *env) { uint32_t countQueue_space = osMessageQueueGetSpace(env->queue_input_get_Status_Sensor); if (countQueue_space) { + status = osMessageQueuePut(env->queue_input_get_Status_Sensor, &rtY.Status_Sensort_model_IO, 0, 0); - memcpy(&env->Status_Sensort_model_IO_local, &rtY.Status_Sensort_model_IO, sizeof(Status_Sensor_Bus)); +// memcpy(&env->Status_Sensort_model_IO_local, &rtY.Status_Sensort_model_IO, sizeof(Status_Sensor_Bus)); - uint16_t IGN_ANS_16 = (uint16_t) ((rtDW.ADC_Data_Model.IGN_ANS * 27.75f / 4095.0f) * 10.0f); - uint16_t PBATT_CHECK_16 = (uint16_t) ((rtDW.ADC_Data_Model.PBATT_CHECK * 33.4375f / 4095.0f) * 10.0f); +// uint16_t IGN_ANS_16 = (uint16_t) ((rtDW.ADC_Data_Model.IGN_ANS * 27.75f / 4095.0f) * 10.0f); +// uint16_t PBATT_CHECK_16 = (uint16_t) ((rtDW.ADC_Data_Model.PBATT_CHECK * 33.4375f / 4095.0f) * 10.0f); - uint8_t IGN_ANS = (IGN_ANS_16 > 255) ? 255 : (uint8_t) IGN_ANS_16; - uint8_t PBATT_CHECK = (PBATT_CHECK_16 > 255) ? 255 : (uint8_t) PBATT_CHECK_16; +// uint8_t IGN_ANS = (IGN_ANS_16 > 255) ? 255 : (uint8_t) IGN_ANS_16; +// uint8_t PBATT_CHECK = (PBATT_CHECK_16 > 255) ? 255 : (uint8_t) PBATT_CHECK_16; - env->Status_Sensort_model_IO_local.Ignition = IGN_ANS; - env->Status_Sensort_model_IO_local.Battery = PBATT_CHECK; +// env->Status_Sensort_model_IO_local.Ignition = IGN_ANS; +// env->Status_Sensort_model_IO_local.Battery = PBATT_CHECK; - - status = osMessageQueuePut(env->queue_input_get_Status_Sensor, &env->Status_Sensort_model_IO_local, 0, 0); +// status = osMessageQueuePut(env->queue_input_get_Status_Sensor, &env->Status_Sensort_model_IO_local, 0, 0); } countQueue_space = osMessageQueueGetSpace(env->queue_input_get_Status_Actuator_DoorsActuator); diff --git a/MODULES/HVAC_M7_CAN_UDS/CanUds.h b/MODULES/HVAC_M7_CAN_UDS/CanUds.h index 5b78576..c089a12 100644 --- a/MODULES/HVAC_M7_CAN_UDS/CanUds.h +++ b/MODULES/HVAC_M7_CAN_UDS/CanUds.h @@ -294,7 +294,7 @@ typedef struct { osMessageQueueId_t queue_output_set_Status_Ionizer_Aroma; osMessageQueueId_t queue_output_set_Status_Duct_Select; - Status_Sensor_Bus Status_Sensort_model_IO_local; +// Status_Sensor_Bus Status_Sensort_model_IO_local; struct { diff --git a/MODULES/Pwm_Flagchip_FC7240/Src/PwmFlagchip.c b/MODULES/Pwm_Flagchip_FC7240/Src/PwmFlagchip.c index 0d445e6..3e770e4 100644 --- a/MODULES/Pwm_Flagchip_FC7240/Src/PwmFlagchip.c +++ b/MODULES/Pwm_Flagchip_FC7240/Src/PwmFlagchip.c @@ -111,8 +111,8 @@ static void setActivePercent(tPwmFlagchip *env, uint8_t percent) { } // Минимальное значение - 1% (не ниже) - if (percent < 1) { - percent = 1; // Минимальный рабочий процент + if (percent <= 15) { + percent = 16; // Минимальный рабочий процент } TPU_StartChannel();