HVAC_M7
/
HVAC_M7_DebugTesting
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновление

This commit is contained in:
cfif 2026-04-28 15:11:25 +03:00
parent f66c9f6e2f
commit 3be89c2a25
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
MainModesArbiter.c
View File

@ -219,7 +219,7 @@ void LoadDataInFromModel(tMma *env) {
//LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp2 = %d", temp2) //LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "Temp2 = %d", temp2)
} }
*/ */
if (osMutexAcquire(env->ModelTask.access, 5000) == osOK) { // if (osMutexAcquire(env->ModelTask.access, 5000) == osOK) {
/* /*
rtDW.ADC_Key_Data_Model.ST_ReservePower = GpioPinGet( rtDW.ADC_Key_Data_Model.ST_ReservePower = GpioPinGet(
&env->gpios->power.BTS4175SGAXUMA1_ReservePowerOutput.ST_ReservePower); &env->gpios->power.BTS4175SGAXUMA1_ReservePowerOutput.ST_ReservePower);
@ -262,6 +262,27 @@ void LoadDataInFromModel(tMma *env) {
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, PWM_Get.pwmPercentRearReserved); env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, PWM_Get.pwmPercentRearReserved);
*/ */
// set_Dtc_state_error(&env->Diagnostic);
// set_CCU_Errors(&env->canSpamTransmitter, (CCU_Errors_t *) &CCU_Errors_Model);
// osMutexRelease(env->ModelTask.access);
// }
if (osMutexAcquire(env->ModelTask.access, 5000) == osOK) {
env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, 96);
env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, 96);
env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, 10);
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, 20);
PWM_Get.pwmPercentFront = env->pwms->pwmFrontCaptureIO.getPwm(env->pwms->pwmFrontCaptureIO.env);
PWM_Get.pwmPercentRear = env->pwms->pwmRearCaptureIO.getPwm(env->pwms->pwmRearCaptureIO.env);
PWM_Get.pwmPercentFrontReserved = env->pwms->pwmFrontCaptureIO.getPwm(
env->pwms->pwmFrontReservedCaptureIO.env);
PWM_Get.pwmPercentRearReserved = env->pwms->pwmRearCaptureIO.getPwm(
env->pwms->pwmRearReservedCaptureIO.env);
set_Dtc_state_error(&env->Diagnostic); set_Dtc_state_error(&env->Diagnostic);
set_CCU_Errors(&env->canSpamTransmitter, (CCU_Errors_t *) &CCU_Errors_Model); set_CCU_Errors(&env->canSpamTransmitter, (CCU_Errors_t *) &CCU_Errors_Model);
@ -284,7 +305,7 @@ static _Noreturn void Mma_Thread(tMma *env) {
// ALG_STEINHART); // ALG_STEINHART);
can_rx_message_type frame_data; // can_rx_message_type frame_data;
// uint32_t step = 0; // uint32_t step = 0;
@ -295,10 +316,9 @@ static _Noreturn void Mma_Thread(tMma *env) {
env->pwms->pwmFrontIo.run(env->pwms->pwmFrontIo.env); env->pwms->pwmFrontIo.run(env->pwms->pwmFrontIo.env);
SystemDelayMs(100); SystemDelayMs(10);
// LoadDataInFromModel(env);
LoadDataInFromModel(env);
ModelTask_StartThread(&env->ModelTask); ModelTask_StartThread(&env->ModelTask);
@ -354,20 +374,27 @@ static _Noreturn void Mma_Thread(tMma *env) {
// osMutexRelease(env->adcTask0.access); // osMutexRelease(env->adcTask0.access);
// } // }
/*
if (osMutexAcquire(env->ModelTask.access, 5000) == osOK) {
PWM_Get.pwmPercentFront = env->pwms->pwmFrontCaptureIO.getPwm(env->pwms->pwmFrontCaptureIO.env);
PWM_Get.pwmPercentRear = env->pwms->pwmRearCaptureIO.getPwm(env->pwms->pwmRearCaptureIO.env);
PWM_Get.pwmPercentFrontReserved = env->pwms->pwmFrontCaptureIO.getPwm(
env->pwms->pwmFrontReservedCaptureIO.env);
PWM_Get.pwmPercentRearReserved = env->pwms->pwmRearCaptureIO.getPwm(
env->pwms->pwmRearReservedCaptureIO.env);
env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, 95); env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, 95);
env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, 95); env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, 95);
env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, 10); env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, 10);
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, 20); env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, 20);
if (osMutexAcquire(env->ModelTask.access, 5000) == osOK) {
set_Dtc_state_error(&env->Diagnostic); set_Dtc_state_error(&env->Diagnostic);
set_CCU_Errors(&env->canSpamTransmitter, (CCU_Errors_t *) &CCU_Errors_Model); set_CCU_Errors(&env->canSpamTransmitter, (CCU_Errors_t *) &CCU_Errors_Model);
osMutexRelease(env->ModelTask.access); osMutexRelease(env->ModelTask.access);
} }
*/
/* /*
SystemDelayMs(10); SystemDelayMs(10);
@ -411,6 +438,8 @@ static _Noreturn void Mma_Thread(tMma *env) {
*/ */
LoadDataInFromModel(env);
SystemDelayMs(50); SystemDelayMs(50);
GpioPinToggle(&env->gpios->led.LED_G); GpioPinToggle(&env->gpios->led.LED_G);
SystemDelayMs(50); SystemDelayMs(50);