Добавлена проверка отправки по CAN
This commit is contained in:
parent
723648ee9f
commit
74953a6f47
|
|
@ -37,7 +37,8 @@ void CanSpamDebugTransmitter_Init(tCanSpamDebugTransmitter *env,
|
||||||
|
|
||||||
|
|
||||||
env->thread.stack = tCanSpamDebugTransmitter_stack;
|
env->thread.stack = tCanSpamDebugTransmitter_stack;
|
||||||
InitThreadAtr(&env->thread.attr,"CanSpamDebugTrans",&env->thread.controlBlock,sizeof(env->thread.controlBlock),env->thread.stack,tCanSpamDebugTransmitter_stack_size,osPriorityNormal);
|
InitThreadAtr(&env->thread.attr, "CanSpamDebugTrans", &env->thread.controlBlock, sizeof(env->thread.controlBlock),
|
||||||
|
env->thread.stack, tCanSpamDebugTransmitter_stack_size, osPriorityNormal);
|
||||||
env->thread.id = 0;
|
env->thread.id = 0;
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -445,8 +446,9 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
||||||
++env->dbg_PID_MultMsg_Idx;
|
++env->dbg_PID_MultMsg_Idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
env->can_id = Pack_dbg_Stat_PID_candb_dbg2(&ccu_candb_dbg_tx.dbg_stat_PID, env->dbg_PID_MultMsg_Idx, env->canFrame.data,
|
env->can_id = Pack_dbg_Stat_PID_candb_dbg2(&ccu_candb_dbg_tx.dbg_stat_PID, env->dbg_PID_MultMsg_Idx,
|
||||||
&env->canFrame.dlc, &env->ide);
|
env->canFrame.data,
|
||||||
|
&env->canFrame.dlc, &env->ide);
|
||||||
|
|
||||||
return event_dbg_Stat_PID_CYC;
|
return event_dbg_Stat_PID_CYC;
|
||||||
}
|
}
|
||||||
|
|
@ -474,6 +476,7 @@ void set_CanDebugSpamTransmitter(tCanSpamDebugTransmitter *env, ccu_candb_dbg_tx
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern volatile bool isSendingCAN;
|
||||||
|
|
||||||
static _Noreturn void CanSpamDebugTransmitter_Thread(tCanSpamDebugTransmitter *env) {
|
static _Noreturn void CanSpamDebugTransmitter_Thread(tCanSpamDebugTransmitter *env) {
|
||||||
for (;;) {
|
for (;;) {
|
||||||
|
|
@ -488,6 +491,11 @@ static _Noreturn void CanSpamDebugTransmitter_Thread(tCanSpamDebugTransmitter *e
|
||||||
env->timeMs += 50;
|
env->timeMs += 50;
|
||||||
|
|
||||||
while (isEventTransmitter(env) != event_dbg_none) {
|
while (isEventTransmitter(env) != event_dbg_none) {
|
||||||
|
|
||||||
|
if (!isSendingCAN) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
sendEventToCan(env);
|
sendEventToCan(env);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -299,6 +299,8 @@ void set_CCU_Mute(tCanSpamTransmitter *env, bool mute) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern volatile bool isSendingCAN;
|
||||||
|
|
||||||
static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) {
|
static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) {
|
||||||
for (;;) {
|
for (;;) {
|
||||||
|
|
||||||
|
|
@ -313,6 +315,11 @@ static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) {
|
||||||
env->timeMs += 100;
|
env->timeMs += 100;
|
||||||
|
|
||||||
while (isEventTransmitter(env) != event_CCU_none) {
|
while (isEventTransmitter(env) != event_CCU_none) {
|
||||||
|
|
||||||
|
if (!isSendingCAN) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
sendEventToCan(env);
|
sendEventToCan(env);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -660,7 +660,8 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
|
||||||
getCmdBusADC2Data(env->adc1Task,
|
getCmdBusADC2Data(env->adc1Task,
|
||||||
(CmdBusADC2Data *) &rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB);
|
(CmdBusADC2Data *) &rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB);
|
||||||
|
|
||||||
uint16_t PBATT_CHECK_16 = (uint16_t) (rtDW.ADC_Data_Model.PBATT_CHECK * 33.4375f / 4095.0f);
|
uint16_t PBATT_CHECK_16 = (uint16_t) ((rtDW.ADC_Data_Model.PBATT_CHECK * 33.4375f / 4095.0f) * 10.0);
|
||||||
|
|
||||||
//конец--------------------------------------------------ВХОД МОДЕЛИ ADC------------------------------------------------
|
//конец--------------------------------------------------ВХОД МОДЕЛИ ADC------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -151,6 +151,7 @@ void Diagnostic_Init(tDiagnostic *env, tCanSpamReceiver *canSpamReceiver, tLogge
|
||||||
env->logger = logger;
|
env->logger = logger;
|
||||||
env->canSpamReceiver = canSpamReceiver;
|
env->canSpamReceiver = canSpamReceiver;
|
||||||
env->access = osMutexNew(NULL);
|
env->access = osMutexNew(NULL);
|
||||||
|
env->tDiagStart = TDiagStart;
|
||||||
|
|
||||||
|
|
||||||
// for (uint8_t i = 0; i < COUNT_DTC_CODE_ERROR; ++i) {
|
// for (uint8_t i = 0; i < COUNT_DTC_CODE_ERROR; ++i) {
|
||||||
|
|
@ -357,10 +358,18 @@ setErrorDTC_CAN_VIN(uint8_t *dtc_state_error_model, ccu_candb_error_missing_rx_t
|
||||||
extern volatile bool isCan0BusOff;
|
extern volatile bool isCan0BusOff;
|
||||||
extern volatile uint32_t timeCan0BusOff;
|
extern volatile uint32_t timeCan0BusOff;
|
||||||
|
|
||||||
|
volatile bool isSendingCAN = 0;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
setErrorDTC_CAN(tDiagnostic *env, bool isT15, uint16_t P_BATT, uint8_t *dtc_state_error_model, ccu_candb_error_missing_rx_t *CAN_ERROR_MISSING, char *VIN,
|
setErrorDTC_CAN(tDiagnostic *env, bool isT15, uint16_t P_BATT, uint8_t *dtc_state_error_model, ccu_candb_error_missing_rx_t *CAN_ERROR_MISSING, char *VIN,
|
||||||
CCU_Errors_t *CCU_Errors) {
|
CCU_Errors_t *CCU_Errors) {
|
||||||
|
|
||||||
|
if ((P_BATT >= V_SEND_LOW) && (P_BATT <= V_SEND_HIGH)) {
|
||||||
|
isSendingCAN = true;
|
||||||
|
} else {
|
||||||
|
isSendingCAN = false;
|
||||||
|
}
|
||||||
|
|
||||||
// uint32_t timeCanSpamReceiver = getCanTimeReceived(env->canSpamReceiver, isCan0BusOff, isT15) + 3000;
|
// uint32_t timeCanSpamReceiver = getCanTimeReceived(env->canSpamReceiver, isCan0BusOff, isT15) + 3000;
|
||||||
uint32_t time = SystemGetMs();
|
uint32_t time = SystemGetMs();
|
||||||
|
|
||||||
|
|
@ -368,7 +377,7 @@ setErrorDTC_CAN(tDiagnostic *env, bool isT15, uint16_t P_BATT, uint8_t *dtc_stat
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((P_BATT < 9) || (P_BATT > 16)) {
|
if ((P_BATT < V_DIAG_LOW) || (P_BATT > V_DIAG_HIGH)) {
|
||||||
env->tDiagStart = SystemGetMs() + TDiagStart;
|
env->tDiagStart = SystemGetMs() + TDiagStart;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,12 @@
|
||||||
|
|
||||||
#define LOG_DTC 0
|
#define LOG_DTC 0
|
||||||
|
|
||||||
|
#define V_DIAG_LOW 95
|
||||||
|
#define V_DIAG_HIGH 155
|
||||||
|
|
||||||
|
#define V_SEND_LOW 90
|
||||||
|
#define V_SEND_HIGH 150
|
||||||
|
|
||||||
#define DTC_TEST_FAILED 1
|
#define DTC_TEST_FAILED 1
|
||||||
#define DTC_TEST_CONFIRMED 8
|
#define DTC_TEST_CONFIRMED 8
|
||||||
#define DTC_TEST_FAILED_CONFIRMED (DTC_TEST_FAILED | DTC_TEST_CONFIRMED)
|
#define DTC_TEST_FAILED_CONFIRMED (DTC_TEST_FAILED | DTC_TEST_CONFIRMED)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue