Skip to content

S
SQ_0037
Commit 9a561eb5 authored by 崔立宝's avatar 崔立宝
Browse files
Options

解决合并冲突_1

parent c6fa6489
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 561 additions and 514 deletions
.gitignore
View file @ 9a561eb5
......@@ -44,9 +44,7 @@ history.index
*.pbi
*.zip
*.7z
*.bin
*.out
*.srec
# Kernel Module Compile Results
*.mod*
......
source/Application/APP/Data_Gear/Data_Gear.c
View file @ 9a561eb5
......@@ -10,6 +10,8 @@
uint8_t Gear_Sig_Value;
#pragma ghs section bss=default
extern uint8_t Parking_status;
/******************************************************************************
Function��Data_Gear_KL30_Init
Description���÷������״�KL30ʱ����һ��
......@@ -100,7 +102,7 @@ void Data_Service_Gear_Processing(void)
//return;
}
if (LED_Get_Status(em_LED_Parking) && (Gear_Sig_Value == 0u) &&\
if (/*LED_Get_Status(em_LED_Parking)*/Parking_status && (Gear_Sig_Value == 0u) &&\
(CAN_MSG_Status(ID_VCU_VCUSts1_Msg_Count) == CAN_SIG_RECEIVE)/* &&\
(CAN_MSG_Status(ID_VCU_SV_Msg_Count) == CAN_SIG_RECEIVE)*/)
{
......
source/Application/APP/FlashCheckSum/FlashCheckSum.h
View file @ 9a561eb5
#ifndef __FLASHCHECKSUM_H_
#define __FLASHCHECKSUM_H_
#define REAL_FLASHCHECKSUM 0x9FB383ECul
#define REAL_FLASHCHECKSUM 0x2FA125C6ul
#define SPI_START_ADDR 0x10000000ul
#define SPI_ADDR_RANGE 0x02306080ul
#define SPI_ADDR_RANGE 0x02305EF0ul
unsigned char CheckSpiFlashCRC(void);
......
source/Application/APP/Key/Key_user.c
View file @ 9a561eb5
......@@ -177,7 +177,7 @@ void Key_Turn_Service(void)
Menu_Set_Status = 0u;
return;
}
#if 0
#if 1
if (Menu_Set_Status)
{
if (Menu_Set_QuitTime < 1000u)
......
source/Application/Alarm/Popups.c
View file @ 9a561eb5
......@@ -183,7 +183,7 @@ void Popups_Polling(void)
DTC_Count[3u] = Get_ID_18F141F3_Sig_BMS_BMSTtlFlt(); //故障总数
}
Popups_Polling_Sub(code, POPUP_BMS_BMS1, SND_BMS_BMS1, 101u);
#if 0
//Maintenance
code = Get_ID_18F101D0_Sig_VCU_GrMntnRmnd();
......@@ -213,7 +213,7 @@ void Popups_Polling(void)
Popup_Delete(POPUP_COM_Maintenance);
Sound_Delete(SND_Maintenance);
}
#endif
//OvrSpd
uint32_t speed = 0;
uint32_t Limit_Speed_Set = 89ul;
......
source/Application/Graphic/GUI/GUI.c
View file @ 9a561eb5
This diff is collapsed.
source/Application/Graphic/GUI/images.c
View file @ 9a561eb5
This diff is collapsed.
source/Driver/Graphic/loc_graphics_data.h
View file @ 9a561eb5
......@@ -212,23 +212,23 @@ MultiBufferSprite_t ChargeSpriteBuf;
static const SpritesHandler_t SpriteHandler[Max_Sprite] =
{
{Left_Sprite, {60, 82, 300, 290, 3}, TARGET_VRAM, &LeftSpriteBuf, &LeftIndex, LeftLogicLayerAttr, MAX_Left_SUP_LAYER, &LeftUpdate, &LeftEn, /*NULL*/GUI_Left },
{Middle_Sprite, {306/*390*/, 88, 636/*478*/, 392/*304*/, 1}, TARGET_SDRAM, &MiddleSpriteBuf, &MiddleIndex, MiddleLogicLayerAttr, MAX_Middle_SUP_LAYER, &MiddleUpdate, &MiddleEn, /*NULL*/GUI_Middle },
{Middle_Sprite, {306/*390*/, 88, 636/*478*/, 392, 1}, TARGET_SDRAM, &MiddleSpriteBuf, &MiddleIndex, MiddleLogicLayerAttr, MAX_Middle_SUP_LAYER, &MiddleUpdate, &MiddleEn, /*NULL*/GUI_Middle },
{Right_Sprite, {886, 82, 300, 290, 3}, TARGET_VRAM, &RightSpriteBuf, &RightIndex, RightLogicLayerAttr, MAX_Right_SUP_LAYER, &RightUpdate, &RightEn, GUI_Right },
{Top1_Sprite, {12, 25, 90, 78, 2}, TARGET_VRAM, &Top1SpriteBuf, &Top1Index, Top1LogicLayerAttr, MAX_Top1_SUP_LAYER, &Top1Update, &Top1En, /*NULL*/GUI_Top1 },
{Top2_Sprite, {616, 55, 92, 14, 1}, TARGET_VRAM, &Top2SpriteBuf, &Top2Index, Top2LogicLayerAttr, MAX_Top2_SUP_LAYER, &Top2Update, &Top2En, /*NULL*/GUI_Top2 },
//{AirP1_Sprite, {330, 43, 164, 30, 1}, TARGET_VRAM, &AirP1SpriteBuf, &AirP1Index, AirP1LogicLayerAttr, MAX_AirP1_SUP_LAYER, &AirP1Update, &AirP1En, /*NULL*/GUI_AirP1 },
//{Clock_Sprite, {400, 21, 90, 20, 1}, TARGET_VRAM, &ClockSpriteBuf, &ClockIndex, ClockLogicLayerAttr, MAX_Clock_SUP_LAYER, &ClockUpdate, &ClockEn, NULL/*GUI_Clock*/ },
{Top4_Sprite, {500, 15, 266, 30, 1}, TARGET_VRAM, &Top4SpriteBuf, &Top4Index, Top4LogicLayerAttr, MAX_Top4_SUP_LAYER, &Top4Update, &Top4En, /*NULL*/GUI_Top4 },
{Top5_Sprite, {758, 11, 212, 38, 1}, TARGET_VRAM, &Top5SpriteBuf, &Top5Index, Top5LogicLayerAttr, MAX_Top5_SUP_LAYER, &Top5Update, &Top5En, /*NULL*/GUI_Top5 },
{Top5_Sprite, {770, 19, 200, 30, 1}, TARGET_VRAM, &Top5SpriteBuf, &Top5Index, Top5LogicLayerAttr, MAX_Top5_SUP_LAYER, &Top5Update, &Top5En, /*NULL*/GUI_Top5 },
//{AirP2_Sprite, {764, 43, 164, 30, 1}, TARGET_VRAM, &AirP2SpriteBuf, &AirP2Index, AirP2LogicLayerAttr, MAX_AirP2_SUP_LAYER, &AirP2Update, &AirP2En, /*NULL*/GUI_AirP2 },
{Top6_Sprite, {1173, 25, 90, 78, 2}, TARGET_VRAM, &Top6SpriteBuf, &Top6Index, Top6LogicLayerAttr, MAX_Top6_SUP_LAYER, &Top6Update, &Top6En, /*NULL*/GUI_Top6 },
{Top7_Sprite, {398, 73, 480, 30, 2}, TARGET_VRAM, &Top7SpriteBuf, &Top7Index, Top7LogicLayerAttr, MAX_Top7_SUP_LAYER, &Top7Update, &Top7En, /*NULL*/GUI_Top7 },
{Bottm1_Sprite, {307, 376, 662, 30, 1}, TARGET_VRAM, &Bottm1SpriteBuf, &Bottm1Index, Bottm1LogicLayerAttr, MAX_Bottm1_SUP_LAYER, &Bottm1Update, &Bottm1En, /*NULL*/GUI_Bottm1 },
{Bottm2_Sprite, {21, 412, 394, 30, 1}, TARGET_VRAM, &Bottm2SpriteBuf, &Bottm2Index, Bottm2LogicLayerAttr, MAX_Bottm2_SUP_LAYER, &Bottm2Update, &Bottm2En, /*NULL*/GUI_Bottm2 },
{Bottm2P_Sprite, {22, 440, 250, 34, 1}, TARGET_VRAM, &Bottm2PSpriteBuf, &Bottm2PIndex, Bottm2PLogicLayerAttr, MAX_Bottm2P_SUP_LAYER, &Bottm2PUpdate, &Bottm2PEn, /*NULL*/GUI_Bottm2P},
{Bottm1_Sprite, {307, 372, 662, 30, 1}, TARGET_SDRAM, &Bottm1SpriteBuf, &Bottm1Index, Bottm1LogicLayerAttr, MAX_Bottm1_SUP_LAYER, &Bottm1Update, &Bottm1En, /*NULL*/GUI_Bottm1 },
{Bottm2_Sprite, {21, 412, 290, 30, 1}, TARGET_VRAM, &Bottm2SpriteBuf, &Bottm2Index, Bottm2LogicLayerAttr, MAX_Bottm2_SUP_LAYER, &Bottm2Update, &Bottm2En, /*NULL*/GUI_Bottm2 },
{Bottm2P_Sprite, {21, 444, 260, 30, 1}, TARGET_VRAM, &Bottm2PSpriteBuf, &Bottm2PIndex, Bottm2PLogicLayerAttr, MAX_Bottm2P_SUP_LAYER, &Bottm2PUpdate, &Bottm2PEn, /*NULL*/GUI_Bottm2P},
{Bottm3_Sprite, {292, 434, 96, 30, 1}, TARGET_VRAM, &Bottm3SpriteBuf, &Bottm3Index, Bottm3LogicLayerAttr, MAX_Bottm3_SUP_LAYER, &Bottm3Update, &Bottm3En, /*NULL*/GUI_Bottm3 },
{Bottm4_Sprite, {408, 412, 204, 30, 1}, TARGET_VRAM, &Bottm4SpriteBuf, &Bottm4Index, Bottm4LogicLayerAttr, MAX_Bottm4_SUP_LAYER, &Bottm4Update, &Bottm4En, /*NULL*/GUI_Bottm4 },
{Bottm5_Sprite, {408, 432, 244, 46, 3}, TARGET_VRAM, &Bottm5SpriteBuf, &Bottm5Index, Bottm5LogicLayerAttr, MAX_Bottm5_SUP_LAYER, &Bottm5Update, &Bottm5En, /*NULL*/GUI_Bottm5 },
{Bottm5_Sprite, {408, 444, 230, 30, 1}, TARGET_VRAM, &Bottm5SpriteBuf, &Bottm5Index, Bottm5LogicLayerAttr, MAX_Bottm5_SUP_LAYER, &Bottm5Update, &Bottm5En, /*NULL*/GUI_Bottm5 },
{Bottm6_Sprite, {673, 412, 188, 30, 1}, TARGET_VRAM, &Bottm6SpriteBuf, &Bottm6Index, Bottm6LogicLayerAttr, MAX_Bottm6_SUP_LAYER, &Bottm6Update, &Bottm6En, /*NULL*/GUI_Bottm6 },
{Bottm7_Sprite, {673, 444, 218, 30, 1}, TARGET_VRAM, &Bottm7SpriteBuf, &Bottm7Index, Bottm7LogicLayerAttr, MAX_Bottm7_SUP_LAYER, &Bottm7Update, &Bottm7En, /*NULL*/GUI_Bottm7 },
//{Bottm8_Sprite, {579, 408, 122, 64, 1}, TARGET_SDRAM, &Bottm8SpriteBuf, &Bottm8Index, Bottm8LogicLayerAttr, MAX_Bottm8_SUP_LAYER, &Bottm8Update, &Bottm8En, /*NULL*/GUI_Bottm8 },
......
source/System/main.c
View file @ 9a561eb5
......@@ -106,7 +106,11 @@
//20231113 增加内部软硬件版本号，修改报警声延时20多秒才有问题（开机声音时长设大了）
//V1.3.1
//20240112 同步0038加英文变更程序修改，去掉菜单自动退出（查看信息不方便）
//20240505 菜单自动退出恢复，不合格英文图片替换
//20240515 修改电池最高单位摄氏度显示不全问题
//20240522 修改选中模块版本英文图片，调整对三角号位置；屏蔽保养弹出报警；预计充电时间分钟最大由75改为55
//20240607 修改故障码warn英文字体=中文字体，修改电机温度、电机转速、电控温度英文关联图片（去掉：，电机MTR->motor）
#include "r_typedefs.h"
#include "sys_scheduler.h"
#include "Watchdog.h"
......
utility/工程文件（释放绥化）/释放软件说明.txt 0 → 100644
View file @ 9a561eb5
1、SQ_0037_BootApp_S1.3.1_F1.1.2_240607.srec，完整版，适用于新生产的无程序仪表
2、SQ_0037_UpdateApp_S1.3.1_F1.1.2_240607.bin，APP版，适用于烧过完整版程序仪表，需配合诊断工具使用
3、SQ_0037.bin，APP版，适用于烧过完整版程序仪表，一键升级小白盒用
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment