Commit 071055e0 authored by 李秉薇's avatar 李秉薇

feat:解决冲突

parents 4be0f967 cb75a710
This diff is collapsed.
This diff is collapsed.
S019000007473959573730313030303032354141202020202000CE
S123C0A00000000000000100000000000000010000000000000000000000000000800000FA
S9030000FC
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
OPEN source 0 0 60 100
OPEN source 0 0 49 100
Source < attributes TOOLTIP on,TOOLTIP_FORMAT signed,TOOLTIP_MODE details,FREEZE off,MARKS off
OPEN assembly 60 0 40 31
Assembly < attributes ADR on,CODE off,ABSADR on,SYMB off,FORMAT Auto,FREEZE off,TOPPC 0x69EC
Assembly < attributes ADR on,CODE off,ABSADR on,SYMB off,FORMAT Auto,FREEZE off,TOPPC 0xF780DB
OPEN procedure 0 39 60 17
Procedure < attributes VALUES on,TYPES off
OPEN register 60 31 40 25
......@@ -10,7 +10,7 @@ OPEN memory 60 56 40 22
Memory < attributes FORMAT hex,COMPLEMENT None,WORD 1,ASC on,ADR on,MODE automatic,UPDATERATE 10,SHOW_ADDRESSSPACE 0,ADDRESS 0x80
OPEN data 0 56 60 22
Data:1 < attributes SCOPE global,COMPLEMENT None,FORMAT Symb,MODE automatic,SORT NotSort,UPDATERATE 10,NAMEWIDTH 16
OPEN data 60 1 60 98
OPEN data 50 1 70 98
Data:2 < attributes SCOPE local,COMPLEMENT None,FORMAT Symb,MODE periodical,SORT NotSort,UPDATERATE 1,NAMEWIDTH 16
OPEN command 60 78 40 22
Command < attributes CACHESIZE 1000
......
......@@ -324,26 +324,6 @@
<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>..\..\&#200;&#188;&#211;&#205;&#178;&#223;&#194;&#212;\release20180404V2.4</VALUE></SETTING>
<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
<SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
</SETTING>
<SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>..\..\&#200;&#188;&#211;&#205;&#178;&#223;&#194;&#212;\release20180423V2.5</VALUE></SETTING>
<SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
<SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
</SETTING>
<SETTING><NAME>Recursive</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>Sources\Device\src\YGV642_SPI_Flashs</VALUE></SETTING>
......@@ -832,7 +812,7 @@
<!-- Settings for "Panel for Assembler for HC12" panel -->
<SETTING><NAME>Panel for Assembler for HC12</NAME>
<SETTING><NAME>Options</NAME><VALUE> -CpuHCS12X -Mb -MapFLASH </VALUE></SETTING>
<SETTING><NAME>Options</NAME><VALUE>-CPUHCS12X -Mb -MapFlash</VALUE></SETTING>
<SETTING><NAME>UseDecoder</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>EchoCommandLine</NAME><VALUE>0</VALUE></SETTING>
</SETTING>
......@@ -1050,13 +1030,6 @@
<FILEKIND>Unknown</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>Project.map</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>main.c</PATH>
......@@ -1953,13 +1926,6 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>readme.txt</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>Sound_Tracks.h</PATH>
......@@ -2113,11 +2079,6 @@
<PATH>main.c</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>Project.map</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>main.h</PATH>
......@@ -2753,11 +2714,6 @@
<PATH>API_BD8379.c</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>readme.txt</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>Sound_Tracks.h</PATH>
......@@ -2858,12 +2814,6 @@
<GROUPLIST>
<GROUP><NAME>FuelProcessor</NAME>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>readme.txt</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
......@@ -3405,12 +3355,6 @@
<PATH>WuZhengProject7.0.map</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>Project.map</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
......
//背光调节
#ifndef _BackLight_H_
#define _BackLight_H_
#include "GPIO.h"
#include "PWM.h"
//#include "TIMER0.h"
......@@ -31,7 +32,6 @@
#define BL_OFF_TIME_DOOR_OPEN_ONLY 150
/******************************************************************************
结构声明
******************************************************************************/
......
#ifndef _Common_H_
#define _Common_H_
#include "CRG.h"
#include "stdint.h"
#include "mc9s12xhy256.h"
......@@ -105,22 +106,22 @@
#define LAYER_LED32 83 //指示灯32
#define LAYER_LED33 84 //指示灯33
//#define LAYER_POPUP_Text //报警图片
//#define LAYER_POPUP_Textwenzi //报警文字
//#define LAYER_POPUP_Text //报警图片
//#define LAYER_POPUP_Textwenzi //报警文字
//------
//档位信息
#define Gear_N 0
#define Gear_One 1
#define Gear_Two 2
#define Gear_Three 3
#define Gear_Four 4
#define Gear_Five 5
#define Gear_Six 6
#define Gear_R 13
#define Gear_D 14
#define Gear_P 15
#define Gear_N 0
#define Gear_One 1
#define Gear_Two 2
#define Gear_Three 3
#define Gear_Four 4
#define Gear_Five 5
#define Gear_Six 6
#define Gear_R 13
#define Gear_D 14
#define Gear_P 15
/****************************************************************
普通参数(各模块通用的常量定义)
......@@ -134,10 +135,11 @@
#define cnRSBufLen 33 //串口接收缓存区长度
#define cnRSDatLen cnRSBufLen-3 //串口接收数据区最大长度
#define cnCZSB_BJDJ_WBD 12 //车,转速表 1度等于12微步
extern const uint8_t CommandNCK[5];
extern uint8_t RSB_P;
extern uint8_t RX_BUF[cnRSBufLen]; //串口接收缓存区
extern uint8_t TX_BUF[cnRSBufLen]; //串口发送缓存区
extern uint8_t RX_BUF[cnRSBufLen]; //串口接收缓存区
extern uint8_t TX_BUF[cnRSBufLen]; //串口发送缓存区
/*******************函数************************************/
extern uint8_t RSSRecivJudge(void);
void JSCCSendDataToYQ(void);
......
......@@ -99,8 +99,7 @@ typedef struct //35 byte
uint8_t bVirtualVal;
uint8_t bCheckSun;
uint8_t N;
}_EE_MeterInfo;
} _EE_MeterInfo;
extern _MeterPos g_voltageMeter;
......
......@@ -7,11 +7,11 @@
#include "TSzhen.h"
#include "LCD_SEG.h"
#include "main.h"
extern uint32_t ESpeedMicrostep;
extern uint32_t VSpeedMicrostep;
extern uint8_t CoolantTempSeg;
//----hyq--20190430
extern uint8_t ContrlorResumeofTEMP; //水温表控制标志位
......@@ -19,16 +19,16 @@ extern uint8_t ContrlorResumeofVspeed; //
extern uint8_t ContrlorResumeofEspeed; //转速表控制标志位
extern uint8_t ContrlorResumeofGAS1 ; //气压1
extern uint16_t ESpeedVal; //转速
//extern uint16_t VspeedVal; //车速
extern uint16_t ESpeedValNUM; //转速
extern uint16_t VspeedValNUM; //车速
extern uint8_t TempSeg; //水温
//extern uint16_t FuelSeg; //燃油
//extern uint16_t ADblueSeg; //天蓝液
extern uint16_t ESpeedVal; //转速
//extern uint16_t VspeedVal; //车速
extern uint16_t ESpeedValNUM; //转速
extern uint16_t VspeedValNUM; //车速
extern uint8_t TempSeg; //水温
//extern uint16_t FuelSeg; //燃油
//extern uint16_t ADblueSeg; //天蓝液
//extern uint16_t OilSeg;
//extern uint16_t GAS1_DISPLAY; //气压1
//extern uint16_t GAS2_DISPLAY; //气压2
//extern uint16_t GAS1_DISPLAY; //气压1
//extern uint16_t GAS2_DISPLAY; //气压2
//----hyq--20190430
/******************************************************************************
......@@ -66,23 +66,24 @@ static const uint16_t GaugesSpeedoMeterSegDecTable[] =
/*=================
显示格 | 车 速
---------+-------*/
/* 0 */ 90,
/* 1 */ 190,
/* 2 */ 290,
/* 3 */ 390,
/* 4 */ 490,
/* 5 */ 590,
/* 6 */ 690,
/* 7 */ 790,
/* 8 */ 890,
/* 9 */ 990,
/* 10 */ 1090,
/* 11 */ 1190,
/* 12 */ 1290,
/* 13 */ 1390,
/* 14 */ 1490,
/* 15 */ 1590,
};
/* 0 */ 90,
/* 1 */ 190,
/* 2 */ 290,
/* 3 */ 390,
/* 4 */ 490,
/* 5 */ 590,
/* 6 */ 690,
/* 7 */ 790,
/* 8 */ 890,
/* 9 */ 990,
/* 10 */ 1090,
/* 11 */ 1190,
/* 12 */ 1290,
/* 13 */ 1390,
/* 14 */ 1490,
/* 15 */ 1590,
};
#define GAUGES_TOTAL_SPEEDOMETER_SEG (sizeof(GaugesSpeedoMeterSegIncTable) / 2)
/******************************************************************************
......@@ -165,7 +166,7 @@ static const uint16_t GaugesGAS1DecTable[] =
---------+-------*/
/* 0 */ 400,
/* 1 */ 672,
/* 2 */ 944,
/* 2 */ 944,
/* 3 */ 1201,
/* 4 */ 1458,
/* 5 */ 1745,
......@@ -218,7 +219,7 @@ static const uint16_t GaugesGAS2DecTable[] =
---------+-------*/
/* 0 */ 400,
/* 1 */ 672,
/* 2 */ 944,
/* 2 */ 944,
/* 3 */ 1201,
/* 4 */ 1458,
/* 5 */ 1745,
......@@ -235,6 +236,7 @@ static const uint16_t GaugesGAS2DecTable[] =
};
#define GAUGES_GAS2_SEG (sizeof(GaugesGAS2IncTable) / 2)
typedef struct
{
uint16_t VSpeedBackup;
......
......@@ -6,8 +6,8 @@
#include "Key.h"
#include "Drive_Info.h"
#define HOUR_Ten_Set_Disp 0
#define HOUR_One_Set_Disp 1
#define HOUR_Ten_Set_Disp 0
#define HOUR_One_Set_Disp 1
#define MINUTE_Ten_Set_Disp 2
#define MINUTE_One_Set_Disp 3
......@@ -24,26 +24,24 @@ extern uint8_t MenuDisplay;
extern uint16_t keytime;
extern uint8_t SetMenu ; //设置页 0 时间设置 1 雷达设置 2 退出
extern uint8_t SetMenupage ; //显示页 0 设置页 1 时间设置 2 雷达设置
extern uint8_t SetMenu; //设置页 0 时间设置 1 雷达设置 2 退出
extern uint8_t SetMenupage; //显示页 0 设置页 1 时间设置 2 雷达设置
extern uint8_t SetRadar; //雷达显示 0 开启 1 关闭 白条
extern uint8_t SetDot; //雷达设置 0 开启 1 关闭 圆点
extern uint8_t SetHoofswear; //蹄片磨损报警设置
extern uint8_t Setservice;
extern uint8_t Service_Open;
extern uint8_t BcakLightPOS;
extern uint8_t BAOYANGPOS;
extern uint8_t DriveModePOS;
extern uint8_t DriveMode;
extern uint8_t OverSpeedPOS;
extern uint8_t OverSpeedSet;
extern uint8_t SetMinute_Ten; //分钟设置
extern uint8_t SetMinute_One; //分钟设置
extern uint8_t SetHour_Ten; //小时设置
extern uint8_t SetHour_One; //小时设置
extern uint8_t Maintain_clear;
extern uint8_t BcakLightPOS;
extern uint8_t BAOYANGPOS;
extern uint8_t DriveModePOS;
extern uint8_t DriveMode;
extern uint8_t OverSpeedPOS;
extern uint8_t OverSpeedSet;
extern uint8_t SetMinute_Ten; //分钟设置
extern uint8_t SetMinute_One; //分钟设置
extern uint8_t SetHour_Ten; //小时设置
extern uint8_t SetHour_One; //小时设置
extern uint8_t Maintain_clear;
void Menu_Processing_Service(void);
void Time_Seting(void);
......
......@@ -14,6 +14,7 @@
#include "Communication_Over_CAN.h"
#include "Non_volatile_Memorys.h"
#include "Data_Processor.h"
#define POPUP_UNIT_FL 0x01
#define POPUP_UNIT_FR 0x02
#define POPUP_UNIT_RL 0x04
......@@ -21,7 +22,7 @@
#define POPUP_UNIT_TR 0x10
#define POPUP_UNIT_HO 0x20
extern uint8_t CAN_ERROR ;
extern uint8_t CAN_ERROR;
void Popups_Polling(void);
void Popups_Management_Service(void);
......
#ifndef _TSzhen_H_
#define _TSzhen_H_
#include "UDS_ISO14229_Services.h"
#include "Data_Processor.h"
#include "Common.h"
......@@ -15,9 +16,11 @@
#define cnSWB_KJDTBLen 5
//#define cnWCjd 9 //8度
//#define cnCZBWBjd 12 //车,转速表1度=12微步
//#define cnSYBWBjd 12 //水油表1度=12微步
extern INT16U b_CSB_JD[cnCSB_KJDTBLen]; //车速表刻度--角度数据组
extern INT16U b_ZSB_JD[cnZSB_KJDTBLen]; //转速表刻度--角度数据组
typedef struct
......@@ -29,6 +32,7 @@ typedef struct
INT8U no_used1; //保留
INT8U no_used2; //保留
INT16U YB_DTXS; //油表输入的动态系数
INT16U SB_DTXS; //水表输入的动态系数
INT16U ZS_G100; //转速表的缸数(100倍)
......@@ -42,13 +46,13 @@ typedef struct
} KDVJDSTRUCT;
//----hyq--20190505 ĸ޸
#define cnZSBFrJDTBLen 4+1
#define cnZSBFrJDTBLen 4 + 1
extern KDVJDSTRUCT ZSBFrJDTB[cnZSBFrJDTBLen];
#define cnCSBFrJDTBLen 4+1
#define cnCSBFrJDTBLen 4 + 1
extern KDVJDSTRUCT CSBFrJDTB[cnCSBFrJDTBLen];
#define cnSUIBVJDTBLen 8+1
#define cnSUIBVJDTBLen 8 + 1
extern KDVJDSTRUCT SUIBVJDTB[cnSUIBVJDTBLen];
#define cnYOUBVJDTBLen 8+1
#define cnYOUBVJDTBLen 8 + 1
extern KDVJDSTRUCT YOUBVJDTB[cnYOUBVJDTBLen];
/*
......
#ifndef _TELLTALES_H_
#define _TELLTALES_H_
#include "GUI.h"
#include "CAN_Communication_Matrix.h"
#include "Line_In.h"
......@@ -14,6 +15,7 @@
#include "Sound_Scheduler.h"
#include "Sound_Player.h"
#include "main.h"
typedef struct
{
uint8_t LastLeft;
......@@ -29,12 +31,12 @@ typedef struct
uint8_t Output;
} TelltaleLRSimulateStruct;
extern INT32U BD83790A;
extern INT32U BD83790B;
extern INT32U BD83790C;
extern INT32U OldBD83790A;
extern INT32U OldBD83790B;
extern INT32U OldBD83790C;
extern INT32U BD83790A;
extern INT32U BD83790B;
extern INT32U BD83790C;
extern INT32U OldBD83790A;
extern INT32U OldBD83790B;
extern INT32U OldBD83790C;
extern uint8_t SEATBELT_Count;
extern uint8_t Break_nodown_Count;
......@@ -44,7 +46,7 @@ extern uint8_t Break_down_count;
extern uint8_t RR_HOOVES_Count;
extern uint8_t RF_HOOVES_Count;
extern uint8_t DoorSts_Count;
extern uint8_t OVER_SPEED_Count;
extern uint8_t OVER_SPEED_Count;
extern uint8_t CAB_LOCK_Count ;
extern uint8_t CollantAir_Count;
extern uint8_t Drivability_Count;
......@@ -66,13 +68,14 @@ extern uint8_t LowBrakeLuidLevel_temp;
extern uint8_t LowBrakeLuidLevel_timp;
extern uint8_t SafetyBeltSt_temp;
extern uint8_t MaintainSignal_temp;
extern uint8_t ParkingBrakeSwitch_temp;
extern uint8_t CabLockSt_temp;
extern uint8_t PositionLightSts;
extern uint8_t DriveDoorSts;
extern uint8_t PsngrDoorSts;
extern uint8_t LED_T_BOX_RVM;
extern uint8_t TelltaleLCD_Flag33;
extern uint8_t ParkingBrakeSwitch_temp;
extern uint8_t CabLockSt_temp;
extern uint8_t PositionLightSts;
extern uint8_t DriveDoorSts;
extern uint8_t PsngrDoorSts;
extern uint8_t LED_T_BOX_RVM;
extern uint8_t TelltaleLCD_Flag33;
//Ļָʾ״̬ʶ
typedef union
{
......@@ -111,7 +114,7 @@ typedef union
uint8_t LCD30 : 1; // 30
uint8_t LCD31 : 1; // 31
uint8_t LCD32 : 1; // 32
}Sig;
} Sig;
} TelltaleLCD;
extern TelltaleLCD TelltaleLCDFlag;
......@@ -119,19 +122,15 @@ extern TelltaleLCD TelltaleLCDFlag;
ָʾ˸ͬ
******************************************************************************/
#define LED_FLASH_1Hz FLASH_SYNC_1Hz ? LED_ON : LED_OFF
#define LED_FLASH_2Hz FLASH_SYNC_2Hz ? LED_ON : LED_OFF
#define LED_FLASH_7Hz FLASH_SYNC_7Hz ? LED_ON : LED_OFF
/******************************************************************************
******************************************************************************/
void Telltales_Management(void); //50ms
void Telltales_Left_Right_Management_Service(void) ;
void Telltales_Left_Right_Management_Service(void);
#endif
\ No newline at end of file
......@@ -75,68 +75,66 @@ void BackLight_TFT_Close(void)
********************************************************************************/
void BL_Management_Service(void)
{
// uint8_t Msg;
// uint8_t DutyCycle;
//uint8_t Msg;
//uint8_t DutyCycle;
//DutyCycle = BL_KEY_Step;
//if(SYS_OPR_STAT_IGN_ON)
//{}
if(SYS_IGN_OFF_DISP_MODE)
// {}
if (SYS_IGN_OFF_DISP_MODE)
{
BlOFFCtrl.Timer = 0;
if(BlTurnOffDelay)
if (BlTurnOffDelay)
BlTurnOffDelay--;
else
{
if((DriveDoorSts==1)||(PsngrDoorSts==1)||(PositionLightSts==1)||(HazardLightSts==1)||((PepslcuAlarm>0)&&(PepslcuAlarm<13))||(PepslcuAlarm == 14)||((RHTurnSignalSts == 1) &&(LHTurnSignalSts == 1))) //20200501 fhl
if ((DriveDoorSts == 1) || (PsngrDoorSts == 1) || (PositionLightSts == 1) || (HazardLightSts == 1) || ((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14) || ((RHTurnSignalSts == 1) && (LHTurnSignalSts == 1))) //20200501 fhl
{
if(PositionLightSts==1)
{
BackLight_TFT_Set((BcakLightPOS+1)*15);
if((DriveDoorSts==1)||(PsngrDoorSts==1)||(HazardLightSts==1)||((RHTurnSignalSts == 1) &&(LHTurnSignalSts == 1)))
{
// BackLight_Plate_Needle_Set((BcakLightPOS+1)*15);
PWM_Channel_Set_Duty_Cycle(5, ((BcakLightPOS+1)*15));
}
else
{
//BackLight_Plate_Needle_Close(); //20200306
PWM_Channel_Set_Duty_Cycle(5, 0);
}
}
else
{
if((DriveDoorSts==1)||(PsngrDoorSts==1)||(HazardLightSts==1)||((RHTurnSignalSts == 1) &&(LHTurnSignalSts == 1)))
{
// BackLight_Plate_Needle_Set((BcakLightPOS+1)*25);
PWM_Channel_Set_Duty_Cycle(5, ((BcakLightPOS+1)*25));
}
if((DriveDoorSts==1)||(PsngrDoorSts==1))/*||((PepslcuAlarm>0)&&(PepslcuAlarm<13))||(PepslcuAlarm==14)) */
{
BackLight_TFT_Set((BcakLightPOS+1)*25);
}
else if(((PepslcuAlarm>0)&&(PepslcuAlarm<13))||(PepslcuAlarm==14))
{
BackLight_TFT_Set((BcakLightPOS+1)*25);
PWM_Channel_Set_Duty_Cycle(5, 0); //2020 01 06 WH 修改off下报警大C问题
}
else
BackLight_TFT_Close(); //屏
}
if (PositionLightSts == 1)
{
BackLight_TFT_Set((BcakLightPOS + 1) * 15);
if ((DriveDoorSts == 1) || (PsngrDoorSts == 1) || (HazardLightSts == 1) || ((RHTurnSignalSts == 1) && (LHTurnSignalSts == 1)))
{
// BackLight_Plate_Needle_Set((BcakLightPOS+1)*15);
PWM_Channel_Set_Duty_Cycle(5, ((BcakLightPOS + 1) * 15));
}
else
{
//BackLight_Plate_Needle_Close(); //20200306
PWM_Channel_Set_Duty_Cycle(5, 0);
}
}
else
{
if ((DriveDoorSts == 1) || (PsngrDoorSts == 1) || (HazardLightSts == 1) || ((RHTurnSignalSts == 1) && (LHTurnSignalSts == 1)))
{
//BackLight_Plate_Needle_Set((BcakLightPOS + 1) * 25);
PWM_Channel_Set_Duty_Cycle(5, ((BcakLightPOS + 1) * 25));
}
if ((DriveDoorSts == 1) || (PsngrDoorSts == 1))/* || ((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14)) */
{
BackLight_TFT_Set((BcakLightPOS + 1) * 25);
}
else if (((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14))
{
BackLight_TFT_Set((BcakLightPOS + 1) * 25);
PWM_Channel_Set_Duty_Cycle(5, 0); //2020 01 06 WH 修改off下报警大C问题
}
else
BackLight_TFT_Close(); //屏
}
}
else
{
BackLight_TFT_Close(); //屏
PWM_Channel_Set_Duty_Cycle(5, 0);
BackLight_TFT_Close(); //屏
PWM_Channel_Set_Duty_Cycle(5, 0);
}
BackLight_Plate_Needle_Close(); //20200306
}
} else {
}
}
else
{
BlOFFCtrl.Timer = 0;
if(BlTurnOnDelay)
BlTurnOnDelay--;
......@@ -144,45 +142,34 @@ void BL_Management_Service(void)
{
if (PositionLightSts == 1)
{
BackLight_TFT_Set((BcakLightPOS+1)*15);
BackLight_Plate_Needle_Set((BcakLightPOS+1)*15);
PWM_Channel_Set_Duty_Cycle(5, ((BcakLightPOS+1)*15));
BackLight_TFT_Set((BcakLightPOS + 1) * 15);
BackLight_Plate_Needle_Set((BcakLightPOS + 1) * 15);
PWM_Channel_Set_Duty_Cycle(5, ((BcakLightPOS + 1) * 15));
}
else
{
BackLight_TFT_Set((BcakLightPOS+1)*25);
BackLight_Plate_Needle_Set((BcakLightPOS+1)*25);
PWM_Channel_Set_Duty_Cycle(5, ((BcakLightPOS+1)*25));
BackLight_TFT_Set((BcakLightPOS + 1) * 25);
BackLight_Plate_Needle_Set((BcakLightPOS + 1) * 25);
PWM_Channel_Set_Duty_Cycle(5, ((BcakLightPOS + 1) * 25));
}
}
}
}
}
void PWM_INIT(void)
{
PWM_Channel_Init(7, PWM_CLOCK_SB, PWM_POL_POS, PWM_LEFT_ALIGN, PWM7_PM3);//屏背光初始化
PWM_Channel_Init(7, PWM_CLOCK_SB, PWM_POL_POS, PWM_LEFT_ALIGN, PWM7_PM3); //屏背光初始化
PWM_Channel_Set_Freq(7, 20000);
PWM_Channel_Set_Duty_Cycle(7, 0); //初始化为背光关闭,由后续应用程序开启
PWM_Channel_Set_Duty_Cycle(7, 0); //初始化为背光关闭,由后续应用程序开启
PWM_Channel_Start(7);
PWM_Channel_Init(2, PWM_CLOCK_SB, PWM_POL_POS, PWM_LEFT_ALIGN, PWM2_PP2);//指示灯背光
PWM_Channel_Init(2, PWM_CLOCK_SB, PWM_POL_POS, PWM_LEFT_ALIGN, PWM2_PP2); //指示灯背光
PWM_Channel_Set_Freq(2, 20000);
PWM_Channel_Set_Duty_Cycle(2, 0); //初始化为背光关闭,由后续应用程序开启
PWM_Channel_Set_Duty_Cycle(2, 0); //初始化为背光关闭,由后续应用程序开启
PWM_Channel_Start(2);
PWM_Channel_Init(5, PWM_CLOCK_SA, PWM_POL_POS, PWM_LEFT_ALIGN, PWM5_PP5);//大C背光
PWM_Channel_Init(5, PWM_CLOCK_SA, PWM_POL_POS, PWM_LEFT_ALIGN, PWM5_PP5); //大C背光
PWM_Channel_Set_Freq(5, 100);
PWM_Channel_Set_Duty_Cycle(5, 0); //初始化为背光关闭,由后续应用程序开启
PWM_Channel_Set_Duty_Cycle(5, 0); //初始化为背光关闭,由后续应用程序开启
PWM_Channel_Start(5);
}
......@@ -52,9 +52,9 @@ const uint8_t *CommandRAMIF[16] =
***************************************************/
void SendByteToUART(uint8_t myByte)
{
wdt_reset(); //复位看门狗定时器
while(SCI0SR1_TDRE == 0); //等待发送缓存区空
SCI0DRL = myByte;
wdt_reset(); //复位看门狗定时器
while (SCI0SR1_TDRE == 0); //等待发送缓存区空
SCI0DRL = myByte;
}
/**************************************************
向串口发送1个字节数据(用于调试)
......@@ -72,9 +72,9 @@ void SendWordToUART(uint16_t myWord)
void SendRomStrToUART(uint8_t *myROMADR, uint8_t mDataLen)
{
uint8_t i;
for(i = 0; i < mDataLen; i++)
for (i = 0; i < mDataLen; i++)
{
SendByteToUART(myROMADR[i]); //向串口发送1个字节数据
SendByteToUART(myROMADR[i]); //向串口发送1个字节数据
}
}
/**************************************************
......@@ -89,9 +89,9 @@ void SendACKToSBEI(void)
***************************************************/
void InitUARTRecvP(void)
{
cli(); //禁止全局中断
cli(); //禁止全局中断
RSB_P = 0;
sei(); //开全局中断
sei(); //开全局中断
}
/**************************************************
串口接收程序(在19200波特率下.用于设置参数)
......@@ -99,21 +99,22 @@ void InitUARTRecvP(void)
***************************************************/
INT8U UARTRecvieP(void)
{
if((RSB_P >= 1) && (RX_BUF[0] != cnUASTHandH))
if ((RSB_P >= 1) && (RX_BUF[0] != cnUASTHandH))
goto UARTRciP1;
if((RSB_P >= 2) && (RX_BUF[1] != cnUASTHandL))
if ((RSB_P >= 2) && (RX_BUF[1] != cnUASTHandL))
goto UARTRciP1;
if((RSB_P >= 3) && (RX_BUF[2] > cnRSDatLen))
if ((RSB_P >= 3) && (RX_BUF[2] > cnRSDatLen))
goto UARTRciP1;
if(RSB_P >= (RX_BUF[2] + 3))
if (RSB_P >= (RX_BUF[2] + 3))
return 1;
else
return 0;
UARTRciP1:
InitUARTRecvP(); //初始化串口接收程序
UARTRciP1:
InitUARTRecvP(); //初始化串口接收程序
return 0;
}
/*****************************************************************************
......@@ -127,15 +128,15 @@ INT8U RSSRecivJudge(void)
INT8U i;
INT8U mCC = 0;
if(!UARTRecvieP()) //串口有收到一帧数据
if (!UARTRecvieP()) //串口有收到一帧数据
return 2; //no
for(i = 0; i < RX_BUF[2]; i++)
for (i = 0; i < RX_BUF[2]; i++)
mCC = mCC + RX_BUF[2 + i];
if(mCC == RX_BUF[RX_BUF[2] + 2])
if (mCC == RX_BUF[RX_BUF[2] + 2])
{
for(i = 0; i < cnRSBufLen; i++) //COPY串口接收缓存区数据到串口发送缓存区
for (i = 0; i < cnRSBufLen; i++) //COPY串口接收缓存区数据到串口发送缓存区
TX_BUF[i] = RX_BUF[i];
InitUARTRecvP(); //初始化并打开串口接收程序
......@@ -163,9 +164,11 @@ void ReadDataCOMPRG(void)
{
INT8U i;
INT8U *pRAMAdr;
TX_BUF[2] = TX_BUF[2] + TX_BUF[5];
pRAMAdr = JSRAMADRGJLXN(); //根据发送缓存区的数据类型,序号,数据字节数计算RAM首地址
for(i = 0; i < TX_BUF[5]; i++)
for (i = 0; i < TX_BUF[5]; i++)
TX_BUF[6 + i] = *(pRAMAdr + i);
JSCCSendDataToYQ(); //计算发送缓存区数据CC并发送数据到仪器
}
......@@ -177,12 +180,12 @@ void JSCCSendDataToYQ(void)
INT8U i;
INT8U mCC = 0;
for(i = 0; i < TX_BUF[2]; i++)
for (i = 0; i < TX_BUF[2]; i++)
mCC = mCC + TX_BUF[2 + i];
TX_BUF[TX_BUF[2] + 2] = mCC;
for(i = 0; i < (TX_BUF[2] + 3); i++)
for (i = 0; i < (TX_BUF[2] + 3); i++)
SendByteToUART(TX_BUF[i]);
}
/***************************************************
......@@ -196,20 +199,20 @@ void WriteDataCOMPRG(void)
INT8U *pRAMAdr;
INT8U mTPE;
pRAMAdr = JSRAMADRGJLXN(); //根据发送缓存区的数据类型,序号,数据字节数计算RAM首地址
pRAMAdr = JSRAMADRGJLXN(); //根据发送缓存区的数据类型,序号,数据字节数计算RAM首地址
for(i = 0; i < TX_BUF[5]; i++)
for (i = 0; i < TX_BUF[5]; i++)
*(pRAMAdr + i) = TX_BUF[6 + i];
mTPE = TX_BUF[3] & 0x0F;
if(mTPE == 2) //
if (mTPE == 2) //
STEPPER_MOTOR_0_DST_STEP = *((INT16U *)(pRAMAdr + 2));
if(mTPE == 3) //
if (mTPE == 3) //
STEPPER_MOTOR_3_DST_STEP = *((INT16U *)(pRAMAdr + 2));
if(mTPE == 6) //
if (mTPE == 6) //
STEPPER_MOTOR_1_DST_STEP = *((INT16U *)(pRAMAdr + 2));
if(mTPE == 7) //
if (mTPE == 7) //
STEPPER_MOTOR_2_DST_STEP = *((INT16U *)(pRAMAdr + 2));
}
This diff is collapsed.
......@@ -7,10 +7,10 @@ uint8_t CoolantTempSeg;
uint8_t CoolantFuelSeg;
uint8_t GaugesTimer;
//extern uint8_t ContrlorResumeofFUEL; //油表控制标志位
//extern uint8_t ContrlorResumeofTEMP; //水温表控制标志位
//extern uint8_t ContrlorResumeofVspeed; //车速表控制标志位
//extern uint8_t ContrlorResumeofEspeed; //转速表控制标志位
//extern uint8_t ContrlorResumeofFUEL; //油表控制标志位
//extern uint8_t ContrlorResumeofTEMP; //水温表控制标志位
//extern uint8_t ContrlorResumeofVspeed; //车速表控制标志位
//extern uint8_t ContrlorResumeofEspeed; //转速表控制标志位
//extern uint16_t ESpeedVal; //转速
//extern uint16_t VspeedVal; //车速
......@@ -18,16 +18,17 @@ uint8_t GaugesTimer;
//extern uint16_t VspeedValNUM; //车速
//extern uint16_t TempSeg; //水温
//extern uint16_t FuelSeg; //燃油
//extern uint16_t WaterTempValNUM; //水温
//extern uint16_t FuelValNUM; //燃油
//extern uint16_t WaterTempVal; //水温
//extern uint16_t FuelVal; //车速
//extern uint8_t FuelDisp ;
//extern uint16_t WaterTempValNUM; //水温
//extern uint16_t FuelValNUM; //燃油
//extern uint16_t WaterTempVal; //水温
//extern uint16_t FuelVal; //车速
//extern uint8_t FuelDisp ;
/*********************车转水油显示***************************/
void Gauges_Management_Service(void)
{
uint8_t UpdateFlag;
if (SYS_IGN_OFF_DISP_MODE)
{
Gauges_ESpeed_Display_OFF();
......@@ -35,22 +36,23 @@ void Gauges_Management_Service(void)
Gauges_AirOne_Display_OFF();
Gauges_AirTwo_Display_OFF();
}
if( SYS_IGN_ON_DISP_MODE )
if ( SYS_IGN_ON_DISP_MODE )
{
if (GaugesTimer)
{
UpdateFlag = 0;
GaugesTimer--;
UpdateFlag = 0;
GaugesTimer--;
}
else
{
UpdateFlag = 1;
GaugesTimer = 5;
UpdateFlag = 1;
GaugesTimer = 5;
}
if(UpdateFlag)
if (UpdateFlag)
{
//天蓝液 右下
if(ContrlorResumeofVspeed == 0)
if (ContrlorResumeofVspeed == 0)
{
CSB_JDMHLBUF_LS = GJ_KDV_JSSYBMBJD(&CSBFrJDTB[0], DataCoolantADblueSegDisp, cnCSBFrJDTBLen);
STEPPER_MOTOR_0_DST_STEP = CSB_JDMHLBUF_LS;
......@@ -62,11 +64,11 @@ void Gauges_Management_Service(void)
}
//机油 左下
if(ContrlorResumeofEspeed == 0)
if (ContrlorResumeofEspeed == 0)
{
zs_JDMHLBUF_LS = GJ_KDV_JSSYBMBJD(&ZSBFrJDTB[0], DataCoolantOilSegDisp, cnZSBFrJDTBLen);
STEPPER_MOTOR_3_DST_STEP = zs_JDMHLBUF_LS;
}
}
else
{
zs_JDMHLBUF_LS = GJ_KDV_JSSYBMBJD(&ZSBFrJDTB[0], OilSeg, cnZSBFrJDTBLen);
......@@ -74,56 +76,55 @@ void Gauges_Management_Service(void)
}
//燃油 左上
if(ContrlorResumeofFUEL == 0)
if (ContrlorResumeofFUEL == 0)
{
YOUB_FBJD_MHL = GJ_KDV_JSSYBMBJD( &YOUBVJDTB[0], Fuel_Seg , cnYOUBVJDTBLen );
YOUB_FBJD_MHL = GJ_KDV_JSSYBMBJD(&YOUBVJDTB[0], Fuel_Seg, cnYOUBVJDTBLen);
STEPPER_MOTOR_2_DST_STEP = YOUB_FBJD_MHL;
}
else
{
YOUB_FBJD_MHL = GJ_KDV_JSSYBMBJD( &YOUBVJDTB[0], Fuel_Seg , cnYOUBVJDTBLen );
YOUB_FBJD_MHL = GJ_KDV_JSSYBMBJD(&YOUBVJDTB[0], Fuel_Seg, cnYOUBVJDTBLen);
STEPPER_MOTOR_2_DST_STEP = YOUB_FBJD_MHL;
}
//水温 右上
if( ContrlorResumeofTEMP == 0 )
if (ContrlorResumeofTEMP == 0)
{
SUIB_FBJD_MHL = GJ_KDV_JSSYBMBJD( &SUIBVJDTB[0], DataCoolantTempSegDisp , cnSUIBVJDTBLen );
SUIB_FBJD_MHL = GJ_KDV_JSSYBMBJD(&SUIBVJDTB[0], DataCoolantTempSegDisp, cnSUIBVJDTBLen);
STEPPER_MOTOR_1_DST_STEP = SUIB_FBJD_MHL;
}
else
{
SUIB_FBJD_MHL = GJ_KDV_JSSYBMBJD( &SUIBVJDTB[0], TempSeg , cnSUIBVJDTBLen );
SUIB_FBJD_MHL = GJ_KDV_JSSYBMBJD(&SUIBVJDTB[0], TempSeg, cnSUIBVJDTBLen);
STEPPER_MOTOR_1_DST_STEP = SUIB_FBJD_MHL;
}
}
}
}
}
/***************************************************************
转速显示归零 左下
****************************************************************/
void Gauges_ESpeed_Display_OFF(void)
{
STEPPER_MOTOR_3_DST_STEP = 0;
STEPPER_MOTOR_3_DST_STEP = 0;
}
/***************************************************************
车速显示归零 右下
****************************************************************/
void Gauges_VSpeed_Display_OFF(void)
{
STEPPER_MOTOR_0_DST_STEP = 0;
STEPPER_MOTOR_0_DST_STEP = 0;
}
/***************************************************************
水表显示归零 左上
****************************************************************/
void Gauges_AirOne_Display_OFF(void)
{
STEPPER_MOTOR_2_DST_STEP = 0;
STEPPER_MOTOR_2_DST_STEP = 0;
}
/***************************************************************
油表显示归零 右上
****************************************************************/
void Gauges_AirTwo_Display_OFF(void)
{
STEPPER_MOTOR_1_DST_STEP = 0;
STEPPER_MOTOR_1_DST_STEP = 0;
}
This diff is collapsed.
This diff is collapsed.
......@@ -23,7 +23,7 @@ void Startup_Animation_Play_Service(void)
if (StartupAnimationPlay.Timer == 0)
{
StartupAnimationPlay.FrameCnt++;
GUI_Animation_Frame_Display(StartupAnimationPlay.FrameCnt); //开机动画
GUI_Animation_Frame_Display(StartupAnimationPlay.FrameCnt); //开机动画
//GUI_Animation_Frame_Display(0); //开机动画
}
StartupAnimationPlay.Timer++;
......@@ -31,10 +31,11 @@ void Startup_Animation_Play_Service(void)
StartupAnimationPlay.Timer = 0;
}
}
/* else
{
TFT_LCD_Clear_Layer(LAYER_BEIJING); //清开机LOGO
TFT_LCD_Clear_Layer(LAYER_BEIJING1);
}
*/
/*
else
{
TFT_LCD_Clear_Layer(LAYER_BEIJING); //清开机LOGO
TFT_LCD_Clear_Layer(LAYER_BEIJING1);
}
*/
}
This diff is collapsed.
This diff is collapsed.
......@@ -13,8 +13,6 @@
#include "PWM.h"
#include "Sound_Tracks.h"
/******************************************************************************
硬件配置
******************************************************************************/
......@@ -23,15 +21,10 @@
#define BUZZER_CTRL LINE_BUZZER
#endif
#define BUZZER_MODE_IDLE 0
#define BUZZER_MODE_SINGLE 1
#define BUZZER_MODE_LOOP 2
typedef struct
{
uint8_t Mode;
......@@ -39,15 +32,7 @@ typedef struct
uint8_t Note;
uint16_t Timer;
uint16_t Fade;
}BuzzerPlayCtrlStruct;
} BuzzerPlayCtrlStruct;
/******************************************************************************
函数声明
......
......@@ -34,9 +34,9 @@ EEPROMд
#define EEPROM_WP_ENABLE 0
#if EEPROM_WP_ENABLE
#ifndef EEPROM_WP
#define EEPROM_WP
#endif
#ifndef EEPROM_WP
#define EEPROM_WP
#endif
#endif
/******************************************************************************
......@@ -50,68 +50,68 @@ EEPROM
#define EEPROM_DEVICE_ADDR_WR 0xA0
#define EEPROM_DEVICE_ADDR_RD 0xA1
#if defined EEPROM_24C01 /*** 24C01 ***/
#define EEPROM_DATA_ADDR_1_BYTE
#define EEPROM_MAX_DATA_ADDR 0x007F
#define EEPROM_TOTAL_PAGE_NUM 16
#define EEPROM_PAGE_SIZE 8
#if defined EEPROM_24C01 /*** 24C01 ***/
#define EEPROM_DATA_ADDR_1_BYTE
#define EEPROM_MAX_DATA_ADDR 0x007F
#define EEPROM_TOTAL_PAGE_NUM 16
#define EEPROM_PAGE_SIZE 8
#elif defined EEPROM_24C02 /*** 24C02 ***/
#define EEPROM_DATA_ADDR_1_BYTE
#define EEPROM_MAX_DATA_ADDR 0x00FF
#define EEPROM_TOTAL_PAGE_NUM 32
#define EEPROM_PAGE_SIZE 8
#define EEPROM_DATA_ADDR_1_BYTE
#define EEPROM_MAX_DATA_ADDR 0x00FF
#define EEPROM_TOTAL_PAGE_NUM 32
#define EEPROM_PAGE_SIZE 8
#elif defined EEPROM_24C04 /*** 24C04 ***/
#define EEPROM_DATA_ADDR_2_BYTE_MIXED
#define EEPROM_MAX_DATA_ADDR 0x01FF
#define EEPROM_TOTAL_PAGE_NUM 32
#define EEPROM_PAGE_SIZE 16
#define EEPROM_DATA_ADDR_2_BYTE_MIXED
#define EEPROM_MAX_DATA_ADDR 0x01FF
#define EEPROM_TOTAL_PAGE_NUM 32
#define EEPROM_PAGE_SIZE 16
#elif defined EEPROM_24C08 /*** 24C08 ***/
#define EEPROM_DATA_ADDR_2_BYTE_MIXED
#define EEPROM_MAX_DATA_ADDR 0x03FF
#define EEPROM_TOTAL_PAGE_NUM 64
#define EEPROM_PAGE_SIZE 16
#define EEPROM_DATA_ADDR_2_BYTE_MIXED
#define EEPROM_MAX_DATA_ADDR 0x03FF
#define EEPROM_TOTAL_PAGE_NUM 64
#define EEPROM_PAGE_SIZE 16
#elif defined EEPROM_24C16 /*** 24C16 ***/
#define EEPROM_DATA_ADDR_2_BYTE_MIXED
#define EEPROM_MAX_DATA_ADDR 0x07FF
#define EEPROM_TOTAL_PAGE_NUM 128
#define EEPROM_PAGE_SIZE 16
#define EEPROM_DATA_ADDR_2_BYTE_MIXED
#define EEPROM_MAX_DATA_ADDR 0x07FF
#define EEPROM_TOTAL_PAGE_NUM 128
#define EEPROM_PAGE_SIZE 16
#elif defined EEPROM_24C32 /*** 24C32 ***/
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0x0FFF
#define EEPROM_TOTAL_PAGE_NUM 128
#define EEPROM_PAGE_SIZE 32
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0x0FFF
#define EEPROM_TOTAL_PAGE_NUM 128
#define EEPROM_PAGE_SIZE 32
#elif defined EEPROM_24C64 /*** 24C64 ***/
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0x1FFF
#define EEPROM_TOTAL_PAGE_NUM 256
#define EEPROM_PAGE_SIZE 32
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0x1FFF
#define EEPROM_TOTAL_PAGE_NUM 256
#define EEPROM_PAGE_SIZE 32
#elif defined EEPROM_24C128 /*** 24C128 ***/
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0x3FFF
#define EEPROM_TOTAL_PAGE_NUM 256
#define EEPROM_PAGE_SIZE 64
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0x3FFF
#define EEPROM_TOTAL_PAGE_NUM 256
#define EEPROM_PAGE_SIZE 64
#elif defined EEPROM_24C256 /*** 24C256 ***/
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0x7FFF
#define EEPROM_TOTAL_PAGE_NUM 512
#define EEPROM_PAGE_SIZE 64
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0x7FFF
#define EEPROM_TOTAL_PAGE_NUM 512
#define EEPROM_PAGE_SIZE 64
#elif defined EEPROM_24C512 /*** 24C512 ***/
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0xFFFF
#define EEPROM_TOTAL_PAGE_NUM 512
#define EEPROM_PAGE_SIZE 128
#define EEPROM_DATA_ADDR_2_BYTE
#define EEPROM_MAX_DATA_ADDR 0xFFFF
#define EEPROM_TOTAL_PAGE_NUM 512
#define EEPROM_PAGE_SIZE 128
#else /*** EEPROM未定义 ***/
#error EEPROM device is undefined
#error EEPROM device is undefined
#endif
......
......@@ -160,48 +160,40 @@ typedef enum
***************************************************************************************************************************/
#if (EEPPROM_DATA_BUFFER_SIZE < EEPROM_PAGE_SIZE)
typedef struct
{
uint8_t Type;
uint8_t Data[EEPROM_PAGE_SIZE];
uint16_t DataLen;
uint8_t Row;
uint8_t Col;
uint8_t Offset;
uint8_t Retry;
uint8_t WrLen;
uint16_t WrCnt;
uint8_t Busy;
EEPROMAccessStatusEnum Result;
} EEPROMDataWrCtrlStruct;
typedef struct
{
uint8_t Type;
uint8_t Data[EEPROM_PAGE_SIZE];
uint16_t DataLen;
uint8_t Row;
uint8_t Col;
uint8_t Offset;
uint8_t Retry;
uint8_t WrLen;
uint16_t WrCnt;
uint8_t Busy;
EEPROMAccessStatusEnum Result;
} EEPROMDataWrCtrlStruct;
#else
typedef struct
{
uint8_t Type;
uint8_t Data[EEPPROM_DATA_BUFFER_SIZE];
uint16_t DataLen;
uint8_t Row;
uint8_t Col;
uint8_t Offset;
uint8_t Retry;
uint8_t WrLen;
uint16_t WrCnt;
uint8_t Busy;
EEPROMAccessStatusEnum Result;
} EEPROMDataWrCtrlStruct;
typedef struct
{
uint8_t Type;
uint8_t Data[EEPPROM_DATA_BUFFER_SIZE];
uint16_t DataLen;
uint8_t Row;
uint8_t Col;
uint8_t Offset;
uint8_t Retry;
uint8_t WrLen;
uint16_t WrCnt;
uint8_t Busy;
EEPROMAccessStatusEnum Result;
} EEPROMDataWrCtrlStruct;
#endif
/***************************************************************************************************************************
函数声明
***************************************************************************************************************************/
......@@ -230,7 +222,4 @@ void EEPROM_Normal_Data_Write_Service(void);
void EEPROM_Copy_Data(uint8_t *pDstData, uint8_t *pSrcData, uint8_t Len);
uint8_t EEPROM_Compare_Data(uint8_t *pDstData, uint8_t *pSrcData, uint8_t Len);
#endif
\ No newline at end of file
......@@ -84,75 +84,75 @@ typedef struct
/***Key***/
extern volatile uint8_t KeyLeftinStatus;
#define KEY_LEFT_IN KeyLeftinStatus
#define KEY_LEFT_IN KeyLeftinStatus
#if ((defined KEY_LEFT_IN) || (defined KEY_LEFT_INn))
extern volatile uint8_t KeyLeftStatus;
extern volatile uint8_t KeyLeftStatus;
#define KEY_LEFT_SIGNAL KeyLeftStatus
#define KEY_LEFT_DEFAULT 0
#define KEY_DEB_RISE 80 //上升沿消抖时间(ms)
#define KEY_DEB_FALL 80 //下降沿消抖时间(ms)
#define KEY_LEFT_SIGNAL KeyLeftStatus
#define KEY_LEFT_DEFAULT 0
#define KEY_DEB_RISE 80 //上升沿消抖时间(ms)
#define KEY_DEB_FALL 80 //下降沿消抖时间(ms)
#endif
extern volatile uint8_t KeyRightinStatus;
#define KEY_RIGHT_IN KeyRightinStatus
#define KEY_RIGHT_IN KeyRightinStatus
#if ((defined KEY_RIGHT_IN) || (defined KEY_RIGHT_INn))
extern volatile uint8_t KeyRightStatus;
extern volatile uint8_t KeyRightStatus;
#define KEY_RIGHT_SIGNAL KeyRightStatus
#define KEY_RIGHT_DEFAULT 0
#define KEY_RIGHT_SIGNAL KeyRightStatus
#define KEY_RIGHT_DEFAULT 0
#endif
extern volatile uint8_t KeyEnterinStatus;
#define KEY_ENTER_IN KeyEnterinStatus
#define KEY_ENTER_IN KeyEnterinStatus
#if ((defined KEY_ENTER_IN) || (defined KEY_ENTER_INn))
extern volatile uint8_t KeyEnterStatus;
extern volatile uint8_t KeyEnterStatus;
#define KEY_ENTER_SIGNAL KeyEnterStatus
#define KEY_ENTER_DEFAULT 0
#define KEY_ENTER_SIGNAL KeyEnterStatus
#define KEY_ENTER_DEFAULT 0
#endif
/***LED_SEATBELT_R ***/ //主安全带
#if ((defined LINE_IN_SEATBELT) || (defined LINE_IN_SEATBELTn))
extern volatile uint8_t LineInSEATBELTStatus;
extern volatile uint8_t LineInSEATBELTStatus;
#define LINE_IN_SEATBELT_SIGNAL LineInSEATBELTStatus
#define LINE_IN_SEATBELT_DEFAULT 0
#define LINE_IN_SEATBELT_SIGNAL LineInSEATBELTStatus
#define LINE_IN_SEATBELT_DEFAULT 0
#endif
/***LED_POSITION_G ***/
#if ((defined LINE_IN_POSITION) || (defined LINE_IN_POSITIONn))
extern volatile uint8_t LineInPOSITIONStatus;
extern volatile uint8_t LineInPOSITIONStatus;
#define LINE_IN_POSITION_SIGNAL LineInPOSITIONStatus
#define LINE_IN_POSITION_DEFAULT 0
#define LINE_IN_POSITION_SIGNAL LineInPOSITIONStatus
#define LINE_IN_POSITION_DEFAULT 0
#endif
////////////////////////////////////////////////////////////////////////
/***LED_MIL_Y ***/
#if ((defined LINE_IN_MIL) || (defined LINE_IN_MILn))
extern volatile uint8_t LineInMILStatus;
extern volatile uint8_t LineInMILStatus;
#define LINE_IN_MIL_SIGNAL LineInMILStatus
#define LINE_IN_MIL_DEFAULT 0
#define LINE_IN_MIL_SIGNAL LineInMILStatus
#define LINE_IN_MIL_DEFAULT 0
#endif
/***PTO ***/
/***PTO ***/
#if ((defined LINE_IN_PTO) || (defined LINE_IN_PTOn))
extern volatile uint8_t LineInPTOStatus;
#define LINE_IN_PTO_SIGNAL LineInPTOStatus
#define LINE_IN_PTO_DEFAULT 0
#define LINE_IN_PTO_SIGNAL LineInPTOStatus
#define LINE_IN_PTO_DEFAULT 0
#endif
/*** LINE_IN_BREAK_FLUID_SIGNAL ***/
......@@ -160,8 +160,8 @@ extern volatile uint8_t LineInMILStatus;
extern volatile uint8_t LineInBREAKFLUIDStatus;
#define LINE_IN_BREAK_FLUID_SIGNAL LineInBREAKFLUIDStatus
#define LINE_IN_BREAK_FLUID_DEFAULT 0
#define LINE_IN_BREAK_FLUID_SIGNAL LineInBREAKFLUIDStatus
#define LINE_IN_BREAK_FLUID_DEFAULT 0
#endif
/*** LINE_IN_BREAK_SIGNAL ***/
......@@ -169,8 +169,8 @@ extern volatile uint8_t LineInMILStatus;
extern volatile uint8_t LineInBREAKStatus;
#define LINE_IN_BREAK_SIGNAL LineInBREAKStatus
#define LINE_IN_BREAK_DEFAULT 0
#define LINE_IN_BREAK_SIGNAL LineInBREAKStatus
#define LINE_IN_BREAK_DEFAULT 0
#endif
/*** LINE_IN_RF_HOOVES_SIGNAL ***/
......@@ -178,8 +178,8 @@ extern volatile uint8_t LineInMILStatus;
extern volatile uint8_t LineInRFHOOVESStatus;
#define LINE_IN_RF_HOOVES_SIGNAL LineInRFHOOVESStatus
#define LINE_IN_RF_HOOVES_DEFAULT 0
#define LINE_IN_RF_HOOVES_SIGNAL LineInRFHOOVESStatus
#define LINE_IN_RF_HOOVES_DEFAULT 0
#endif
/*** LINE_IN_RR_HOOVES_SIGNAL ***/
......@@ -187,8 +187,8 @@ extern volatile uint8_t LineInMILStatus;
extern volatile uint8_t LineInRRHOOVESStatus;
#define LINE_IN_RR_HOOVES_SIGNAL LineInRRHOOVESStatus
#define LINE_IN_RR_HOOVES_DEFAULT 0
#define LINE_IN_RR_HOOVES_SIGNAL LineInRRHOOVESStatus
#define LINE_IN_RR_HOOVES_DEFAULT 0
#endif
/*** LINE_IN_CAB_LOCK_SIGNAL ***/
......@@ -196,8 +196,8 @@ extern volatile uint8_t LineInMILStatus;
extern volatile uint8_t LineInCABLOCKStatus;
#define LINE_IN_CAB_LOCK_SIGNAL LineInCABLOCKStatus
#define LINE_IN_CAB_LOCK_DEFAULT 0
#define LINE_IN_CAB_LOCK_SIGNAL LineInCABLOCKStatus
#define LINE_IN_CAB_LOCK_DEFAULT 0
#endif
/*** LINE_IN_FILT_BLOCK_SIGNAL ***/
......@@ -205,8 +205,8 @@ extern volatile uint8_t LineInMILStatus;
extern volatile uint8_t LineInFILTBLOCKStatus;
#define LINE_IN_FILT_BLOCK_SIGNAL LineInFILTBLOCKStatus
#define LINE_IN_FILT_BLOCK_DEFAULT 0
#define LINE_IN_FILT_BLOCK_SIGNAL LineInFILTBLOCKStatus
#define LINE_IN_FILT_BLOCK_DEFAULT 0
#endif
/*** LINE_IN_CHARGE_SIGNAL ***/
......@@ -214,8 +214,8 @@ extern volatile uint8_t LineInMILStatus;
extern volatile uint8_t LineInCHARGEStatus;
#define LINE_IN_CHARGE_SIGNAL LineInCHARGEStatus
#define LINE_IN_CHARGE_DEFAULT 0
#define LINE_IN_CHARGE_SIGNAL LineInCHARGEStatus
#define LINE_IN_CHARGE_DEFAULT 0
#endif
/*** LINE_IN_GEAR_SIGNAL ***/
......@@ -223,8 +223,8 @@ extern volatile uint8_t LineInMILStatus;
extern volatile uint8_t LineInGEARStatus;
#define LINE_IN_GEAR_SIGNAL LineInGEARStatus
#define LINE_IN_GEAR_DEFAULT 0
#define LINE_IN_GEAR_SIGNAL LineInGEARStatus
#define LINE_IN_GEAR_DEFAULT 0
#endif
/******************************************************************************
函数声明
......
......@@ -34,8 +34,8 @@
******************************************************************************/
//#define RADAR_R3_SOF_SELF_TEST 0xAA
//#define RADAR_R3_EOF_SELF_TEST 0xAF
#define RADAR_R3_EOF1_MESSAGE 0xFE
#define RADAR_R3_EOF2_MESSAGE 0xFF
#define RADAR_R3_EOF1_MESSAGE 0xFE
#define RADAR_R3_EOF2_MESSAGE 0xFF
/******************************************************************************
接收Buffer结构
......@@ -58,7 +58,8 @@ typedef union
uint8_t : 8; //10 校验和
uint8_t : 8; //11
uint8_t : 8; //12
}Frame;
} Frame;
struct
{
uint8_t SOF : 8;
......@@ -70,11 +71,11 @@ typedef union
uint8_t RRM_L : 8;
uint8_t RR_H : 8;
uint8_t RR_L : 8;
uint8_t SND : 8; //10 校验和
uint8_t SND : 8; //10 校验和
uint8_t EOF1 : 8;
uint8_t EOF2 : 8;
}Msg;
}RadarR3DataBufferUnion;
} Msg;
} RadarR3DataBufferUnion;
/******************************************************************************
接收控制结构
......
#ifndef _SOUND_TRACKS_H_
#define _SOUND_TRACKS_H_
......@@ -264,15 +263,9 @@ static const SndTrackStruct SndTracks[] =
},
};
/******************************************************************************
音轨总数
******************************************************************************/
#define SND_TRACK_TOTAL_NUM (sizeof(SndTracks) / sizeof(SndTrackStruct))
#endif
\ No newline at end of file
#ifndef _VID29_H_
#define _VID29_H_
......@@ -30,7 +29,7 @@
#define STEPPER_MOTOR_BRAKE_ACC 50 //电机制动加速度
#define STEPPER_MOTOR_FULL_RST_ACC 30 //电机大角度归零加速度
#define STEPPER_MOTOR_FINE_RST_ACC 10 //电机小角度归零加速度
#define STEPPER_MOTOR_SHDN_RST_ACC 5 //电机断电归零加速度
#define STEPPER_MOTOR_SHDN_RST_ACC 5 //电机断电归零加速度
#define STEPPER_MOTOR_DAMPING_FACTOR 2 //电机阻尼系数,阻尼系数越大,电机减速越慢
......
This diff is collapsed.
/********************************************************************************/
/* CONFIDENTIAL */
/* Copyright (C) 2011 Yamaha Corporation. All rights reserved. */
/* Module : $Workfile: LCD_AUOC035QAN01.h $ */
/* Module : $Workfile: LCD_AUOC035QAN01.h $ */
/* Description : Clock, DisplayScan Prameter Include header */
/* Version : $Rev: 89 $ */
/* Last UpDate Time: $Date:: 2012-05-31 17:57:20#$ */
......@@ -36,12 +36,12 @@ typedef struct {
/*----------------------------------------------------------------------*/
/* DotClock , System Clock <Common> */
/* PLLCTL[2:0] = 'LLL' */
/* XIN = 10MHz DTCKIN x ----------->* Dot Clock 32MHZ */
/* XIN = 10MHz DTCKIN x ----------->* Dot Clock 32MHZ */
/* DTCKIN = --- | ----- */
/* Dot Clock = XIN *->| PLL |->* System Clock */
/* System Clock = 100MHz ----- */
/* ?DTCKS_N Pin = 'H' */
/* ?TCON Pin = 'L' */
/* System Clock = 100MHz ----- */
/* ?DTCKS_N Pin = 'H' */
/* ?TCON Pin = 'L' */
/*----------------------------------------------------------------------*/
const T_YVC1_DATA tYvc1Data = {
/*----------------------------------*/
......
/********************************************************************************/
/* CONFIDENTIAL */
/* Copyright (C) 2011 Yamaha Corporation. All rights reserved. */
/* Module : $Workfile: YGV642_SPI_Flash_IS25LP256D.h $ */
/* Description : Pattern memory IS25LP256D driver include header */
/* Module : $Workfile: YGV642_SPI_Flash_IS25LP256D.h $ */
/* Description : Pattern memory IS25LP256D driver include header */
/* Version : $Rev: 145 $ */
/* Last UpDate Time: $Date:: 2012-08-24 13:55:38#$ */
/* FOOT NOTE : adjust 2tab */
......
......@@ -9,7 +9,8 @@
******************************************************************************/
void LCD_Init(void)
{ /*
{
/*
uint8_t i;
uint8_t WDTEn;
uint8_t VDir;
......@@ -65,16 +66,12 @@ void LCD_Init(void)
Sim_SPI_Master_Word_Write(0xA500 | LCD_REG_VDIR);
LCD_nCS = 1;
LCD_Wait_ms(1);
LCD_nCS = 0;
Sim_SPI_Master_Word_Write(0xA600 | LCD_REG_HDIR);
LCD_nCS = 1;
LCD_Wait_ms(1);
LCD_nCS = 0;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -130,7 +130,7 @@ void PM_GD25Q127C_Init(void)
}
/*------------------------------------------------------------------------------*/
/* Function name : PM_GD25Q127C_Set_Pattern_Memory_Addr */
/* Function name : PM_GD25Q127C_Set_Pattern_Memory_Addr */
/* Contents : Set Pattern Memory Address register */
/* Argument : uint32_t Addr (W) Pattern Memory Address */
/* Return value : void */
......@@ -162,7 +162,7 @@ void PM_GD25Q127C_Write_Cmd(uint8_t CmdNo)
* +---+-------------------------------------------+------+------+------+------+------+------+------+------+
* | 2 | Pattern Memory Read Access Port / Status |PMRREQ|PWBUSY|INIEND|CSNEG | "0" | "0" | "0" | "0" |
* +---+-------------------------------------------+------+------+------+------+------+------+------+------+
* | 3 | Pattern Memory Data Port | MD[7:0] |
* | 3 | Pattern Memory Data Port | MD[7:0] |
* +---+-------------------------------------------+------+------+------+------+------+------+------+------+
*/
......
......@@ -184,7 +184,7 @@ void PM_S25FL256S_Write_Cmd(uint8_t CmdNo)
* +---+-------------------------------------------+------+------+------+------+------+------+------+------+
* | 2 | Pattern Memory Read Access Port / Status |PMRREQ|PWBUSY|INIEND|CSNEG | "0" | "0" | "0" | "0" |
* +---+-------------------------------------------+------+------+------+------+------+------+------+------+
* | 3 | Pattern Memory Data Port | MD[7:0] |
* | 3 | Pattern Memory Data Port | MD[7:0] |
* +---+-------------------------------------------+------+------+------+------+------+------+------+------+
*/
......
......@@ -116,7 +116,7 @@ void PM_W25Q128FV_Init(void)
}
/*------------------------------------------------------------------------------*/
/* Function name : PM_W25Q128FV_Set_Pattern_Memory_Addr */
/* Function name : PM_W25Q128FV_Set_Pattern_Memory_Addr */
/* Contents : Set Pattern Memory Address register */
/* Argument : uint32_t Addr (W) Pattern Memory Address */
/* Return value : void */
......@@ -148,7 +148,7 @@ void PM_W25Q128FV_Write_Cmd(uint8_t CmdNo, uint8_t NumCmd, uint8_t Send)
* +---+-------------------------------------------+------+------+------+------+------+------+------+------+
* | 2 | Pattern Memory Read Access Port / Status |PMRREQ|PWBUSY|INIEND|CSNEG | "0" | "0" | "0" | "0" |
* +---+-------------------------------------------+------+------+------+------+------+------+------+------+
* | 3 | Pattern Memory Data Port | MD[7:0] |
* | 3 | Pattern Memory Data Port | MD[7:0] |
* +---+-------------------------------------------+------+------+------+------+------+------+------+------+
*/
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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