Добавлен параметр Armed в калибровки VIN

This commit is contained in:
cfif 2026-10-28 10:16:50 +03:00
parent 446ae100fe
commit eb9193ab0b
5 changed files with 689 additions and 651 deletions

View File

@ -7,6 +7,11 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O1 ")
#set_source_files_properties(
# ${CMAKE_SOURCE_DIR}/MODULES/HVAC_M7_MODEL/HVAC_model.c
# PROPERTIES
# COMPILE_OPTIONS "-Os"
#)

View File

@ -10,7 +10,6 @@
#include "ADC_Temp.h"
#include "MainStack.h"
const char LOG_TASK_ARB[] = "Arb";
#define LOGGER &env->slog.logger
@ -69,8 +68,6 @@ void GetCanErrors(tMma *env, uint8_t canIndex) {
}
static _Noreturn void Mma_Thread(tMma *env) {
// Запуск устройства
@ -92,7 +89,7 @@ static _Noreturn void Mma_Thread(tMma *env) {
*/
InitWakeupModel(&env->ModelTask);
getVehicleTypeArmoredFromVin(&env->ModelTask, env->storage.dataParam->device.identification.Vehicle_Identification);
ModelTask_StartThread(&env->ModelTask);
LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Waiting for the model to run...")

File diff suppressed because it is too large Load Diff

View File

@ -12,6 +12,7 @@
#include "lfs.h"
#include "LittleFsInterface.h"
#include "StatusError.h"
#include "VIN_DATA.h"
#define LOG_SIGN "ModelTask"
#define LOGGER env->logger
@ -613,7 +614,36 @@ void InitWakeupModel(tModelTask *env) {
}
#define SLEEP_TIME 3000
uint8_t getVehicleTypeArmoredFromVin(tModelTask *env, const char* vin) {
env->isVinArmored = 0;
// Преобразуем два байта в 16-битное значение
uint16_t typeCode = ((uint16_t)(uint8_t)vin[3] << 8) | (uint8_t)vin[4];
// Определяем Vehicle TYPE по коду
switch (typeCode) {
case VEHICLE_SEDAN_ARMORED:
case VEHICLE_SEDAN_LONG_ARMORED:
case VEHICLE_LIMO_ARMORED_V12:
case VEHICLE_LIMO_ARMORED_V8:
case VEHICLE_LIMO_ARMORED_V8_CIVIL:
case VEHICLE_SUV_ARMORED:
case VEHICLE_MPV_ARMORED_8SEAT:
case VEHICLE_MPV_ARMORED_9SEAT:
case VEHICLE_MPV_ARMORED_4SEAT:
env->isVinArmored = 1;
return 1;
default:
return 0; // Неизвестный тип
}
}
#define SLEEP_TIME 5000
lfs_file_t file;
@ -638,7 +668,6 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
LoggerInfoStatic(LOGGER, LOG_SIGN, "Error open (read) dtc.bin");
}
for (;;) {
if (GPIO_ReadPins((uint8_t) PORT_E, PORT_PIN_16)) {
@ -650,7 +679,7 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
}
if ((env->sleep_time > 0) && (env->sleep_time < SystemGetMs())) {
// SMC_SetSystemMode(SMC_MODE_STANBY_3);
SMC_SetSystemMode(SMC_MODE_STANBY_3);
}
if (osMutexAcquire(env->access, 1000) == osOK) {
@ -735,7 +764,11 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
//ШАГ МОДЕЛИ-------------------------------------------------------------------------------------------------------------------------------------------
//ШАГ МОДЕЛИ-------------------------------------------------------------------------------------------------------------------------------------------
//ШАГ МОДЕЛИ-------------------------------------------------------------------------------------------------------------------------------------------
//#pragma GCC push_options
//#pragma GCC optimize("O3")
HVAC_model_step();
//#pragma GCC pop_options
rtDW.sleep_model = 0;

View File

@ -37,6 +37,7 @@ typedef struct {
ccu_candb_tx_t ccu_candb_tx;
ccu_candb_dbg_tx_t ccu_candb_dbg_tx;
uint8_t isVinArmored;
osMutexId_t access;
@ -123,4 +124,6 @@ void ModelTask_StopThread(tModelTask *env);
void InitWakeupModel(tModelTask *env);
uint8_t getVehicleTypeArmoredFromVin(tModelTask *env, const char* vin);
#endif //HVAC_M7_MODEL_TASK_H