Commit e9e735c4 authored by huangguoqing's avatar huangguoqing

feat:增加缺失贴图

parent 47dc7a55
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
"com_can.h": "c", "com_can.h": "c",
"task.h": "c", "task.h": "c",
"simulated_8080.h": "c", "simulated_8080.h": "c",
"analog_signals.h": "c" "analog_signals.h": "c",
"tm035hfzgzx.h": "c"
} }
} }
\ No newline at end of file
...@@ -155,6 +155,15 @@ void Can_Set_Buff_480(uint8_t CopyData []) ...@@ -155,6 +155,15 @@ void Can_Set_Buff_480(uint8_t CopyData [])
} }
pCANMsg->Sig.Signal_Gps = Signal_GPS; pCANMsg->Sig.Signal_Gps = Signal_GPS;
pCANMsg->Sig.Signal_4g = Signal_4G; pCANMsg->Sig.Signal_4g = Signal_4G;
if(bluetooth_phone==1)
{
pCANMsg->Sig.Blooth_phone = 1;
}else if(bluetooth_phone==0)
{
pCANMsg->Sig.Blooth_phone = 0;
}
} }
void Can_Set_Buff_280(uint8_t CopyData []) void Can_Set_Buff_280(uint8_t CopyData [])
......
...@@ -132,6 +132,7 @@ extern uint8_t Battery_temp; ...@@ -132,6 +132,7 @@ extern uint8_t Battery_temp;
extern uint8_t NFC_C_card; extern uint8_t NFC_C_card;
extern uint8_t Side_bracket; extern uint8_t Side_bracket;
extern uint8_t Hill_Descent_control; extern uint8_t Hill_Descent_control;
extern uint8_t bluetooth_phone;
extern uint8_t key_flag; extern uint8_t key_flag;
...@@ -147,6 +148,10 @@ extern uint8_t canData4[8]; ...@@ -147,6 +148,10 @@ extern uint8_t canData4[8];
extern uint32_t text5[5]; extern uint32_t text5[5];
extern const unsigned char gImage_Dyy_words_1X6_Y16[];
extern const unsigned char gImage_Dyy_words_2X6_Y46[];
extern const unsigned char gImage_Dyy_words_5X6_Y137[];
#endif #endif
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
#include "Barcode_Scanner.h" #include "Barcode_Scanner.h"
#include "Task.h" #include "Task.h"
#include "string.h" #include "string.h"
#include "TFT_LCD.h"
uint8_t Check_Steps = 0; uint8_t Check_Steps = 0;
uint8_t Check_Control_Mode = 2;// 1 自走模式 2 打点模式 0 默认都发0 uint8_t Check_Control_Mode = 2;// 1 自走模式 2 打点模式 0 默认都发0
...@@ -25,6 +27,7 @@ uint8_t Battery_temp = 0; ...@@ -25,6 +27,7 @@ uint8_t Battery_temp = 0;
uint8_t NFC_C_card = 0; uint8_t NFC_C_card = 0;
uint8_t Side_bracket=0; uint8_t Side_bracket=0;
uint8_t Hill_Descent_control= 0; uint8_t Hill_Descent_control= 0;
uint8_t bluetooth_phone = 0;
uint8_t Diagnosis_banbenhao_flag = 0; uint8_t Diagnosis_banbenhao_flag = 0;
uint8_t Diagnosis_banbenhao_flag_ = 0; uint8_t Diagnosis_banbenhao_flag_ = 0;
...@@ -184,6 +187,9 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent) ...@@ -184,6 +187,9 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
Diagnosis_banbenhao_flag=1;/*CAN诊断起始信号*/ Diagnosis_banbenhao_flag=1;/*CAN诊断起始信号*/
Display_TFT_Clear(); Display_TFT_Clear();
TFT_LCD_Draw_Bmp(5, 50, ( uint8_t * )gImage_Dyy_words_1X6_Y16 ); //软件版本号
TFT_LCD_Draw_Bmp(5, 100, ( uint8_t * )gImage_Dyy_words_2X6_Y46 ); //硬件版本号
TFT_LCD_Draw_Bmp(0,200 , ( uint8_t * )gImage_Dyy_words_5X6_Y137 ); //静态电流
Display_Can_Receive_Data(5,50); Display_Can_Receive_Data(5,50);
...@@ -427,6 +433,7 @@ void User_CheckMode_Service(uint8_t CbkCycle) ...@@ -427,6 +433,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Headlights_Led = 0; Headlights_Led = 0;
NFC_C_card = 0; NFC_C_card = 0;
break; break;
case 1: case 1:
...@@ -488,6 +495,7 @@ void User_CheckMode_Service(uint8_t CbkCycle) ...@@ -488,6 +495,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Right_Led = 0; Right_Led = 0;
Headlights_Led = 0; Headlights_Led = 0;
NFC_C_card=0; NFC_C_card=0;
Charging_connection_led = 0;
break; break;
case 4: case 4:
Vspeed = 38; Vspeed = 38;
...@@ -506,6 +514,7 @@ void User_CheckMode_Service(uint8_t CbkCycle) ...@@ -506,6 +514,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Left_Led = 0; Left_Led = 0;
Right_Led = 0; Right_Led = 0;
Headlights_Led = 0; Headlights_Led = 0;
Charging_connection_led=1;
break; break;
case 5: case 5:
Vspeed = 47; Vspeed = 47;
...@@ -525,6 +534,7 @@ void User_CheckMode_Service(uint8_t CbkCycle) ...@@ -525,6 +534,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Right_Led = 0; Right_Led = 0;
Headlights_Led = 0; Headlights_Led = 0;
Side_bracket=1; Side_bracket=1;
Charging_connection_led = 0;
break; break;
case 6: case 6:
Vspeed = 57; Vspeed = 57;
...@@ -616,6 +626,7 @@ void User_CheckMode_Service(uint8_t CbkCycle) ...@@ -616,6 +626,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Left_Led = 0; Left_Led = 0;
Right_Led = 0; Right_Led = 0;
Headlights_Led = 0; Headlights_Led = 0;
bluetooth_phone = 1;
break; break;
case 11: case 11:
Vspeed = 88; Vspeed = 88;
...@@ -636,6 +647,7 @@ void User_CheckMode_Service(uint8_t CbkCycle) ...@@ -636,6 +647,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Headlights_Led = 1; Headlights_Led = 1;
Side_bracket = 1; Side_bracket = 1;
Hill_Descent_control = 1; Hill_Descent_control = 1;
bluetooth_phone = 0 ;
break; break;
} }
} }
......
...@@ -192,6 +192,12 @@ void RTE_GPIO_Init(void) ...@@ -192,6 +192,12 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp); GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_AP0;//左转
gpio_temp.enGPIOPIN = GPIO_PIN_14;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
......
...@@ -54,6 +54,8 @@ ...@@ -54,6 +54,8 @@
#define Quiescent_current_B_ GPIO_OUT_PORT09_PIN04/*B+~*/ #define Quiescent_current_B_ GPIO_OUT_PORT09_PIN04/*B+~*/
#define Quiescent_current_B GPIO_OUT_PORT09_PIN05 /*B+*/ #define Quiescent_current_B GPIO_OUT_PORT09_PIN05 /*B+*/
#define Charging_connection_led GPIO_OUT_APORT00_PIN14/*充电连接指示灯*/
#define POWER_CTRL_KL30 GPIO_OUT_PORT09_PIN05 #define POWER_CTRL_KL30 GPIO_OUT_PORT09_PIN05
......
...@@ -135,8 +135,8 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -135,8 +135,8 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
Display_PageNum(); Display_PageNum();
User_CheckMode_Service(100u); User_CheckMode_Service(100u);
POWER_CTRL_KL30 = 1; // POWER_CTRL_KL30 = 1;
POWER_CTRL_KL30_B = 1; // POWER_CTRL_KL30_B = 1;
//POWER_CTRL_KL15 = 1; //POWER_CTRL_KL15 = 1;
......
...@@ -74,7 +74,7 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER]; ...@@ -74,7 +74,7 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER];
const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] = const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] =
{ {
10U, 15U, 9U, 15U,
}; };
const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] = const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
......
...@@ -92,7 +92,7 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] = ...@@ -92,7 +92,7 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] =
{0x0001u, 0x0005u}, {0x0001u, 0x0005u},
{0x00FAu, 0x00FFu}, {0x00FAu, 0x00FFu},
{0x8080u, 0x1000u}, {0x8080u, 0x1000u},
{0x400Fu, 0x673Fu}, {0x000Fu, 0x673Fu},
{0xFFFFu, 0xFFFFu}, {0xFFFFu, 0xFFFFu},
}; };
static void GPIO_PIN_Init(GPIO_Config_Mode_en_t enGPIOConfigMode) static void GPIO_PIN_Init(GPIO_Config_Mode_en_t enGPIOConfigMode)
......
...@@ -3119,7 +3119,7 @@ ...@@ -3119,7 +3119,7 @@
"pinName": "Pin_AP0_14", "pinName": "Pin_AP0_14",
"pinAddress": "54", "pinAddress": "54",
"wakeupPin": { "wakeupPin": {
"PinModeName": "GPIO_IN", "PinModeName": "GPIO_OUT",
"PUn": false, "PUn": false,
"PDn": false, "PDn": false,
"PISn": false, "PISn": false,
...@@ -3129,7 +3129,7 @@ ...@@ -3129,7 +3129,7 @@
"PIPCn": false, "PIPCn": false,
"Pn": false, "Pn": false,
"PMCn": false, "PMCn": false,
"PMn": true, "PMn": false,
"PIBCn": true "PIBCn": true
}, },
"sleepPin": { "sleepPin": {
......
#new Option #new Option
#Thu Jun 05 08:24:11 CST 2025 #Mon Jun 09 10:38:31 CST 2025
IsSort=true IsSort=true
MergeFlashIsCompression=false MergeFlashIsCompression=false
ChangeAppFilePath= ChangeAppFilePath=
...@@ -9,7 +9,7 @@ DBFFilePath= ...@@ -9,7 +9,7 @@ DBFFilePath=
MergeCrcTtpe=1 MergeCrcTtpe=1
MergeBootFilePath= MergeBootFilePath=
IsMergeChangeAddress=false IsMergeChangeAddress=false
MergeFlashOutPutFilePath= MergeFlashOutPutFilePath=D\:\\Desktop\\\u65B0\u5EFA\u6587\u4EF6\u5939 (2)
GPIOOutPutPath= GPIOOutPutPath=
MergeCanDBCPath= MergeCanDBCPath=
IsFilling=true IsFilling=true
...@@ -31,7 +31,7 @@ IsMergeCreateBin=false ...@@ -31,7 +31,7 @@ IsMergeCreateBin=false
IsOverWrite=true IsOverWrite=true
DllFilePath= DllFilePath=
MergeAudioOutPutPath= MergeAudioOutPutPath=
MergeCanOutPutPath=D\:\\Desktop\\jiancetai MergeCanOutPutPath=
ChangeOutPutFilePath= ChangeOutPutFilePath=
MergeTelltalesOutPutPath= MergeTelltalesOutPutPath=
TTFExtractTXTpath= TTFExtractTXTpath=
...@@ -39,7 +39,7 @@ JieFaRH850GPIOJSONpath= ...@@ -39,7 +39,7 @@ JieFaRH850GPIOJSONpath=
MergeFlashIsMandatory=false MergeFlashIsMandatory=false
UpdateProcess=\u5409\u5229 UpdateProcess=\u5409\u5229
Driver=Kvaser Driver=Kvaser
MergeFlashImageFormat= MergeFlashImageFormat=ARGB8888
RH850_F1KMGPIOJSONpath= RH850_F1KMGPIOJSONpath=
DriverFilePath= DriverFilePath=
IsMergeCreateHex=false IsMergeCreateHex=false
...@@ -49,11 +49,11 @@ MergeImageFilePath= ...@@ -49,11 +49,11 @@ MergeImageFilePath=
IsMergeCreateUpdateBin=false IsMergeCreateUpdateBin=false
MergeImageSize=128M MergeImageSize=128M
CRCFilePath= CRCFilePath=
MergeFlashCompressionFormat= MergeFlashCompressionFormat=RLE24
IsPlayMusic=false IsPlayMusic=false
IsHexDisplay=true IsHexDisplay=true
MergeLineInXLSPath= MergeLineInXLSPath=
MergeFlashInPutFilePath= MergeFlashInPutFilePath=D\:\\Desktop\\\u65B0\u5EFA\u6587\u4EF6\u5939 (3)
MergeFlashIsInternal=false MergeFlashIsInternal=false
MergeOutPutFilePath= MergeOutPutFilePath=
MergeAppFilePath= MergeAppFilePath=
......
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