Commit 3f1af545 authored by 陈家乐's avatar 陈家乐

Merge branch 'dev' into 'release'

Dev

See merge request !126
parents 4548cb21 44ed1a31
......@@ -74,7 +74,9 @@ void Gauge_Service(void)
Check_SEG_Display();
for(k = 0; k < LampCh0_MAX; k ++)
{
if (k == LampCh0_24_Keys || k == LampCh0_21_Fuel_W || k == LampCh0_13_Temp_AlarmW || k == LampCh0_26_Tire_PressureW)
if (k == LampCh0_24_Keys || k == LampCh0_21_Fuel_W \
|| k == LampCh0_13_Temp_AlarmW || k == LampCh0_26_Tire_PressureW \
|| k == LampCh0_23_Bluetooth)
{
;
}
......@@ -84,6 +86,13 @@ void Gauge_Service(void)
}
}
LED_Driver_Channel_Set(LampChannel_0, LampCh0_10_Navigator1, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_19_Navigator2, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_17_Length2, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_18_Length1, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_14_ARRIVED_SERVICE_AREA, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
}
else
{
......@@ -111,7 +120,7 @@ void Gauge_Service(void)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_04, LED_ON);
#endif
SEG_SET_Navigation_STS(Get_Navigation_St_Dis(),Get_Navigation_Code_Dis(),Get_Navigation_Mileage_Dis());
//SEG_SET_Navigation_STS(0,0,0);
}
else
......@@ -198,7 +207,7 @@ void Gauge_Service(void)
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03, LED_ON);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_04, LED_ON);
#endif
SEG_SET_Navigation_STS(Get_Navigation_St_Dis(),Get_Navigation_Code_Dis(),Get_Navigation_Mileage_Dis());
//SEG_SET_Navigation_STS(Get_Navigation_St_Dis(),Get_Navigation_Code_Dis(),Get_Navigation_Mileage_Dis());
}
else
......
......@@ -4503,11 +4503,13 @@ void Check_SEG_Display(void)
SEG_SET_TPMS_DISPLAY(1, a * 11, a * 11, 0, 1, 1);
#endif
SEG_SET_Voltage_NUM(1, a * 111);
SEG_SET_Navigation_STS(1, 3, a * 111100);
//SEG_SET_Navigation_STS(0, 0, 0);
for (i = 0; i < SEG_LED_MAX; i++)
{
SEG_SET_LED_STS(i, 1);
if(i != em_SEG_Bluetooth)
SEG_SET_LED_STS(i, 1);
}
SEG_Scan_SET_Fuel_Coolant_Dial((a * 11) + 100);
......@@ -4576,7 +4578,7 @@ void Checkself_SEG_Display(void)
min = (Checkself_SEG_step / 3) * 11;
voltage = (Checkself_SEG_step / 3) * 111;
SEG_SET_Navigation_STS(1, 3, Mileage);
//SEG_SET_Navigation_STS(0, 0, 0);
SEG_SET_FuelDial(1, Fuel);
SEG_SET_CoolantDial(1, Fuel, collant, 1);
SEG_SET_EspeedDial(1, Espeed / 500);
......
......@@ -61,9 +61,9 @@ static void Power_KL30_Init(void)
Data_Read_DiagPara();
Analog_Signal_Conv_Init();
BU98R10_Init();
Uart0_Init(115200);
Protocol_KL30_Wakeup_Init();
BlueTooth_KL30_KL15_Wakeup_Init();
//Uart0_Init(115200);
//Protocol_KL30_Wakeup_Init();
//BlueTooth_KL30_KL15_Wakeup_Init();
Sys_KL30_Init();
Checkself_Init();
Data_Vehicle_Speed_KL30_Init();
......@@ -139,9 +139,9 @@ static void Power_Wakeup_Init(void)
//Light_Sensor_Init_Example();//注意顺序1
LED_Driver_Init_Example();//注意顺序2
LED_Driver_Service_Immediate();
Protocol_KL30_Wakeup_Init();
Uart0_Init(115200);
BlueTooth_KL30_KL15_Wakeup_Init();
//Protocol_KL30_Wakeup_Init();
//Uart0_Init(115200);
//BlueTooth_KL30_KL15_Wakeup_Init();
Fuel_KL30_Init();
Data_Voltage_Init();
// TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400, 64000000);
......@@ -193,7 +193,7 @@ static void Power_IG_ON_Init(void)
Data_Voltage_Init();
MenuData_TCS_Init();
Data_Coolant_Temp_KL15_Init();
BlueTooth_KL30_KL15_Wakeup_Init();
//BlueTooth_KL30_KL15_Wakeup_Init();
Data_TPMS_KL15_WAKE_UP_Init();
CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
DFlash_init();
......
......@@ -360,19 +360,19 @@ static void LED_Coolant_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_Bluetooth_Judgement(void)
{
Tellib_uint16_t LED_STATE = 0u;
if (BlueTooth.BLE_St)
{
LED_STATE = 1u;
}
else
{
LED_STATE = 0u;
}
//if (BlueTooth.BLE_St)
//{
// LED_STATE = 1u;
//}
//else
//{
// LED_STATE = 0u;
//}
return LED_STATE;
}
static void LED_Bluetooth_Execution(Tellib_uint16_t led_status)
{
if ( led_status == 1u )
if ( 0/*led_status == 1u*/ )
{
LED_Driver_Channel_Set(LampChannel_0, LampCh0_23_Bluetooth, LED_ON);
SEG_SET_LED_STS(em_SEG_Bluetooth, 1);
......
......@@ -54,8 +54,8 @@ void Sys_10ms_Tasks(void)
Fuel_R_Cal(10u);
TYW_Check_Count();
Data_TPMS_Processing_Service();
Protocol_Service();
Protocol_Send_Service();
//Protocol_Service();
//Protocol_Send_Service();
//FaultCode_Service(10u);
FaultCode_Servers();
......@@ -98,7 +98,7 @@ void Sys_100ms_Tasks(void)
Services_Mileage_Callback();
Data_Voltage_Processing_Service();
S3_ServerCNTT();
Send_UUID_To_Esp32();
//Send_UUID_To_Esp32();
if (u8LEDDriverCheckCount >= 10U)
{
......@@ -112,8 +112,8 @@ void Sys_100ms_Tasks(void)
u8LEDDriverCheckCount++;
}
Clear_Navigation_St();
Protocol_ESP32_Active_Service();
//Clear_Navigation_St();
//Protocol_ESP32_Active_Service();
if(Common_GetIgnOffTime() >= 1000)
{
CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
......
......@@ -312,13 +312,13 @@
#define CheckSumErr 7 // Checksum Error
#define UnknownPartID 8 // Unknown Part ID
#define SWV 0x128 // 0x100 = 1.00 software version 软件版本号
#define SWV 0x130 // 0x100 = 1.00 software version 软件版本号
#define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
#define INTLV 0x128 // 0x100 = 1.00 internal version 内部版本号
#define PROG_Y 0x24 // 0x24 = 2024年, program year
#define PROG_M 0x11 // 0x03 = 3月, program month
#define PROG_D 0x26 // 0x19 = 19日, program day
#define INTLV 0x130 // 0x100 = 1.00 internal version 内部版本号
#define PROG_Y 0x25 // 0x24 = 2024年, program year
#define PROG_M 0x01 // 0x03 = 3月, program month
#define PROG_D 0x07 // 0x19 = 19日, program day
/******************************************************************************
Bootloader Variable
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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