huahua/P417_SWTL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HW06初版

Browse Source
This commit is contained in:
sunbeam 2024-08-20 17:28:18 +08:00
parent cdd4f5074f
commit 9c1f7d86dc
14 changed files with 2239 additions and 2081 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/p417_SWTL.X/nbproject/Makefile-genesis.properties
View File

@ -1,10 +1,10 @@
#
#Mon Aug 19 22:45:18 CST 2024
#Tue Aug 20 14:39:42 CST 2024
mcal.com-microchip-mplab-nbide-toolchain-xc32-XC32LanguageToolchain.md5=1eaf555a844840d91945cb14109201c3
conf.ids=mcal
mcal.languagetoolchain.version=4.10
host.id=10k5-yicy-7x
configurations-xml=05dd0273e546475b33ce901a10b16f28
configurations-xml=82d12c4bf5f229226e945ddd8fae0eb3
mcal.Pack.dfplocation=E\:\\Program Files\\Microchip\\MPLABX\\v6.20\\packs\\Microchip\\SAME51_DFP\\3.7.242
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=f612087c95360c842296d189edfe3321
proj.dir=F\:\\FCB_project\\P417\\CODE\\20240727HW06\\P417_SWTL\\firmware\\p417_SWTL.X

2
firmware/p417_SWTL.X/nbproject/Makefile-local-mcal.mk
View File

@ -34,5 +34,5 @@ MP_CPPC_DIR="E:\Program Files\Microchip\xc32\v4.10\bin"
MP_AS_DIR="E:\Program Files\Microchip\xc32\v4.10\bin"
MP_LD_DIR="E:\Program Files\Microchip\xc32\v4.10\bin"
MP_AR_DIR="E:\Program Files\Microchip\xc32\v4.10\bin"
DFP_DIR=E:/Program Files/Microchip/MPLABX/v6.20/packs/Microchip/SAME51_DFP/3.7.242
CMSIS_DIR=E:/Program Files/Microchip/MPLABX/v6.20/packs/arm/CMSIS/5.4.0
DFP_DIR=E:/Program Files/Microchip/MPLABX/v6.20/packs/Microchip/SAME51_DFP/3.7.242

6
firmware/p417_SWTL.X/nbproject/configurations.xml
View File

@ -497,8 +497,8 @@
<platform>3</platform>
</toolsSet>
<packs>
<pack name="SAME51_DFP" vendor="Microchip" version="3.7.242"/>
<pack name="CMSIS" vendor="ARM" version="5.4.0"/>
<pack name="SAME51_DFP" vendor="Microchip" version="3.7.242"/>
</packs>
<ScriptingSettings>
</ScriptingSettings>
@ -558,7 +558,6 @@
<C32>
<property key="additional-warnings" value="false"/>
<property key="addresss-attribute-use" value="false"/>
<property key="appendMe" value=""/>
<property key="enable-app-io" value="false"/>
<property key="enable-omit-frame-pointer" value="false"/>
<property key="enable-symbols" value="true"/>
@ -615,7 +614,6 @@
<property key="additional-options-use-response-files" value="false"/>
<property key="additional-options-write-sla" value="false"/>
<property key="allocate-dinit" value="false"/>
<property key="appendMe" value=""/>
<property key="code-dinit" value="false"/>
<property key="ebase-addr" value=""/>
<property key="enable-check-sections" value="false"/>
@ -655,7 +653,6 @@
<C32CPP>
<property key="additional-warnings" value="false"/>
<property key="addresss-attribute-use" value="false"/>
<property key="appendMe" value=""/>
<property key="check-new" value="false"/>
<property key="eh-specs" value="true"/>
<property key="enable-app-io" value="false"/>
@ -684,7 +681,6 @@
<property key="use-indirect-calls" value="false"/>
</C32CPP>
<C32Global>
<property key="appendMe" value=""/>
<property key="common-include-directories" value=""/>
<property key="gp-relative-option" value=""/>
<property key="legacy-libc" value="false"/>

2
firmware/p417_SWTL.X/nbproject/project.xml
View File

@ -10,7 +10,7 @@
<cpp-extensions/>
<header-extensions>h</header-extensions>
<asminc-extensions/>
<sourceEncoding>ISO-8859-1</sourceEncoding>
<sourceEncoding>UTF-8</sourceEncoding>
<make-dep-projects/>
<sourceRootList>
<sourceRootElem>../src</sourceRootElem>

109
firmware/src/DiagnosticL/Sys_Diag_Detect/SysDiagDetect.c
View File

@ -4,6 +4,8 @@
#include "RTE.h"
#include "forcedetect.h"
#include "forceSnsr.h"
#include "Speaker.h"
uint8 Touch_Sensor_Fault=0,Touch_Sensor_Fault_key1=0,Touch_Sensor_Fault_key2=0,Touch_Sensor_Fault_key3=0,Touch_Sensor_Fault_pad=0;
static uint8 Bat_Rng = 0;
static void Battery_Volt_Diag_Task(void)
@ -76,56 +78,87 @@ static void Force_Sensor_Diag_Task(void)
}
// Touch_Sensor_Sts00;
static uint8 Touch_Sensor_Fault = 0;
static void Touch_Sensor_Diag_Task(void)
{
static uint16_t fault_count = 0, fault_count2 = 0;
//uint16 CurrentDiag_Press_signal;
if (Touch_Sensor_delta00 < 200 && Touch_Sensor_delta01 < 200 && Touch_Sensor_delta02 < 200 && Touch_Sensor_delta13 < 200 && Touch_Sensor_delta14 < 200 && Touch_Sensor_delta15 < 200
&& Touch_Sensor_delta03 < 300 && Touch_Sensor_delta04 < 300 && Touch_Sensor_delta05 < 300 && Touch_Sensor_delta06 < 300 && Touch_Sensor_delta07 < 300
static uint16_t fault_countk1 = 0,fault_countk2 = 0,fault_countk3 = 0, fault_countpad = 0;
//恢复
if (Touch_Sensor_delta00 < 200 && Touch_Sensor_delta13 < 200)
{
Touch_Sensor_Fault_key1 = Touch_NoFault;
fault_countk1 = 0;
}
else
{
fault_countk1++;
if (fault_countk1 > 40)
{
fault_countk1 = 40;
}
Touch_Sensor_Fault_key1 = Touch_Out_Range;
}
//巡航
if (Touch_Sensor_delta01 < 200 && Touch_Sensor_delta14 < 200)
{
Touch_Sensor_Fault_key2 = Touch_NoFault;
fault_countk2 = 0;
}
else
{
fault_countk2++;
if (fault_countk2 > 40)
{
fault_countk2 = 40;
}
Touch_Sensor_Fault_key2 = Touch_Out_Range;
}
//取消
if (Touch_Sensor_delta02 < 200 && Touch_Sensor_delta15 < 200)
{
Touch_Sensor_Fault_key2 = Touch_NoFault;
fault_countk3 = 0;
}
else
{
fault_countk3++;
if (fault_countk3 > 40)
{
fault_countk3 = 40;
}
Touch_Sensor_Fault_key2 = Touch_Out_Range;
}
//PAD
if (Touch_Sensor_delta03 < 300 && Touch_Sensor_delta04 < 300 && Touch_Sensor_delta05 < 300 && Touch_Sensor_delta06 < 300 && Touch_Sensor_delta07 < 300
&& Touch_Sensor_delta08 < 300 && Touch_Sensor_delta09 < 300 && Touch_Sensor_delta10 < 300 && Touch_Sensor_delta11 < 300 && Touch_Sensor_delta12 < 300)
{
Touch_Sensor_Fault_pad = Touch_NoFault;
fault_countpad = 0;
}
else
{
fault_countpad++;
if (fault_countpad > 40)
{
fault_countpad = 40;
}
Touch_Sensor_Fault_pad = Touch_Out_Range;
}
if (Touch_Sensor_Fault_key1 == Touch_NoFault &&
Touch_Sensor_Fault_key2 == Touch_NoFault &&
Touch_Sensor_Fault_key3 == Touch_NoFault &&
Touch_Sensor_Fault_pad == Touch_NoFault )
{
Touch_Sensor_Fault = Touch_NoFault;
InitMessage(SIG_DIAGCFAILRTOUCHPANSWTLTOUCHDFLTSTS, &Touch_Sensor_Fault);
fault_count = 0;
}
else
{
Touch_Sensor_Fault = Touch_Out_Range;
InitMessage(SIG_DIAGCFAILRTOUCHPANSWTLTOUCHDFLTSTS, &Touch_Sensor_Fault);
fault_count++;
if (fault_count > 200)
{
fault_count = 0;
//touch_init();
}
}
/*
CurrentDiag_Press_signal = Get_forcedetect_force_value();
if (CurrentDiag_Press_signal < 50)
{
if (Touch_Sensor_delta00 > 10 || Touch_Sensor_delta01 > 10 || Touch_Sensor_delta02 > 10 || Touch_Sensor_delta13 > 10 || Touch_Sensor_delta14 > 10 || Touch_Sensor_delta15 > 10
|| Touch_Sensor_delta03 > 20 || Touch_Sensor_delta04 > 20 || Touch_Sensor_delta05 > 20 || Touch_Sensor_delta06 > 20 || Touch_Sensor_delta07 > 20
|| Touch_Sensor_delta08 > 20 || Touch_Sensor_delta09 > 20 || Touch_Sensor_delta10 > 20 || Touch_Sensor_delta11 > 20 || Touch_Sensor_delta12 > 20)
{
fault_count2++;
if (fault_count2 > 200)
{
fault_count2 = 0;
//touch_init();
}
}
else
{
fault_count2 = 0;
}
}
else
{
fault_count2 = 0;
}
*/
}
extern uint8_t Allow_Touch_flag;//todo
static uint8 Vibra_Fault = 0;
@ -133,7 +166,7 @@ static void Vibration_Diag_Task(void)
{
// AD_data=voltage * 4096/3.3V normal:0-0.01(15) short: 0.15(185)-0.36(448) 0.6(742)-0.7(870) 0.95(1177)-1.05(1305) 1.27(1575)-1.39(1727) open:1.55(1921) - 1.72(2136)
Vibra_Fault = Vibration_Normal;//todo Allow_Touch_flag
Vibra_Fault = Get_Speaker_Fault();//
InitMessage(SIG_DIAGCFAILRTOUCHPANSWTLVIBRATIONFLTSTS, &Vibra_Fault);
/*
if(LD_AD_Val>=0 && LD_AD_Val<=15) //normal

1
firmware/src/DiagnosticL/Sys_Diag_Detect/SysDiagDetect.h
View File

@ -17,6 +17,7 @@ extern uint8 Force_Sens_Err;
//extern uint8 Fuction_State ;
//extern uint8 Control_SDZ ;
extern uint8 Touch_Sensor_Fault,Touch_Sensor_Fault_key1,Touch_Sensor_Fault_key2,Touch_Sensor_Fault_key3,Touch_Sensor_Fault_pad;
extern void Sys_Diag_Detcet_Task(void);

348
firmware/src/OsekCom/OsekCom.c
View File

@ -135,12 +135,10 @@
#define RST_FLAG_TX_REQ_FRM_SWTLSENSORFR08() (flag_swtl_com_tx_req1 &= ((uint8_t)0xBF))
#define TST_FLAG_TX_REQ_FRM_SWTLSENSORFR08() ((flag_swtl_com_tx_req1 & ((uint8_t)0x40)) == ((uint8_t)0x40))
#define SET_FLAG_TX_REQ_FRM_DIAG_PHYSRESP_SWTL() (flag_swtl_com_tx_req1 |= ((UI_8)0x80))
#define RST_FLAG_TX_REQ_FRM_DIAG_PHYSRESP_SWTL() (flag_swtl_com_tx_req1 &= ((UI_8)0x7F))
#define TST_FLAG_TX_REQ_FRM_DIAG_PHYSRESP_SWTL() ((flag_swtl_com_tx_req1 & ((UI_8)0x80)) == ((UI_8)0x80))
/* Cancel value to cancel a timer */
#define TIMER_CANCEL ((uint16_t)0xFFFF)
@ -253,7 +251,6 @@
#define RST_FLAG_OSEK_COM_PER_TX() (flag_st_mode &= ((uint8_t)0xDF))
#define TST_FLAG_OSEK_COM_PER_TX() ((flag_st_mode & ((uint8_t)0x20)) == ((uint8_t)0x20))
/* ------------------------------- Data Types ------------------------------- */
/* Type to allocate data structure for managed signals */
@ -304,6 +301,10 @@ static uint8_t frm_swtlsensorfr05[MAX_LEN_FRM_SWTLSENSORFR05];
static uint8_t frm_swtlsensorfr06[MAX_LEN_FRM_SWTLSENSORFR06];
static uint8_t frm_swtlsensorfr07[MAX_LEN_FRM_SWTLSENSORFR07];
static uint8_t frm_swtlsensorfr08[MAX_LEN_FRM_SWTLSENSORFR08];
static uint8_t frm_swtlsensorfr09[8];
static uint8_t frm_swtlsensorfr0A[8];
static uint8_t frm_swtlsensorfr0B[8];
static uint8_t frm_swtlsensorfr0C[8];
UI_8 frm_diag_physresp_swtl[MAX_LEN_FRM_DIAG_PHYSRESP_SWTL];
static UI_8 len_frm_diag_physresp_swtl;
/* Tx request flags declaration */
@ -346,8 +347,6 @@ uint8_t flag_rx0;
/* Declaration of timer diff between last tick and current tick */
static uint32_t time_diff;
/* --------------------------- Routine Prototypes --------------------------- */
static void OsekComPeriodicTx(void);
static void OsekComDeadlineMonitRx(void);
@ -375,75 +374,92 @@ void OsekComRxNotifCallbackSWTL(t_com_buf_hdl bhdl)
uint32_t buf_idtp = CanBufQueryIdTp();
uint8_t frm_len = 8;
if (TST_FLAG_OSEK_COM_INIT()) {
if (TST_FLAG_OSEK_COM_INIT())
{
/* Rx Com frames with static ID */
switch (buf_idtp) {
switch (buf_idtp)
{
case ID_TP_FRM_IHUPRIVATEDHUCANFR01:
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_TWLIBRISTS_UB) {
if (frm_len >= MIN_LEN_FRM_SIG_TWLIBRISTS_UB)
{
/* Decoding of signal sig_TwliBriSts_UB */
sig_twlibrists_ub[0] = ((CAN_BUF_QUERY_DATA_BYTE(bhdl, 2)) >> ((uint8_t)7));
}
else {
else
{
/* Do nothing */
}
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_TWLIBRISTS) {
if (frm_len >= MIN_LEN_FRM_SIG_TWLIBRISTS)
{
/* Decoding of signal sig_TwliBriSts */
sig_twlibrists[0] = ((CAN_BUF_QUERY_DATA_BYTE(bhdl, 2) & ((uint8_t)127)) >> ((uint8_t)6));
}
else {
else
{
/* Do nothing */
}
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_SWTOFKEYTONE_UB) {
if (frm_len >= MIN_LEN_FRM_SIG_SWTOFKEYTONE_UB)
{
/* Decoding of signal sig_SwtOfKeyTone_UB */
sig_swtofkeytone_ub[0] = ((CAN_BUF_QUERY_DATA_BYTE(bhdl, 0) & ((uint8_t)63)) >> ((uint8_t)5));
}
else {
else
{
/* Do nothing */
}
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_SWTOFKEYTONE) {
if (frm_len >= MIN_LEN_FRM_SIG_SWTOFKEYTONE)
{
/* Decoding of signal sig_SwtOfKeyTone */
sig_swtofkeytone[0] = ((CAN_BUF_QUERY_DATA_BYTE(bhdl, 0)) >> ((uint8_t)6));
}
else {
else
{
/* Do nothing */
}
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_INTRBRISTS_UB) {
if (frm_len >= MIN_LEN_FRM_SIG_INTRBRISTS_UB)
{
/* Decoding of signal sig_IntrBriSts_UB */
sig_intrbrists_ub[0] = ((CAN_BUF_QUERY_DATA_BYTE(bhdl, 0) & ((uint8_t)31)) >> ((uint8_t)4));
}
else {
else
{
/* Do nothing */
}
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_INTRBRISTS) {
if (frm_len >= MIN_LEN_FRM_SIG_INTRBRISTS)
{
/* Decoding of signal sig_IntrBriSts */
sig_intrbrists[0] = ((CAN_BUF_QUERY_DATA_BYTE(bhdl, 0) & ((uint8_t)15)));
}
else {
else
{
/* Do nothing */
}
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_ACTVNOFSTEERWHLILLMN_UB) {
if (frm_len >= MIN_LEN_FRM_SIG_ACTVNOFSTEERWHLILLMN_UB)
{
/* Decoding of signal sig_ActvnOfSteerWhlIllmn_UB */
sig_actvnofsteerwhlillmn_ub[0] = ((CAN_BUF_QUERY_DATA_BYTE(bhdl, 5) & ((uint8_t)7)) >> ((uint8_t)2));
}
else {
else
{
/* Do nothing */
}
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_ACTVNOFSTEERWHLILLMN) {
if (frm_len >= MIN_LEN_FRM_SIG_ACTVNOFSTEERWHLILLMN)
{
/* Reset of the deadline monitoring timer */
dmt_rx_sig_actvnofsteerwhlillmn = 0;
/* Decoding of signal sig_ActvnOfSteerWhlIllmn */
@ -451,7 +467,8 @@ void OsekComRxNotifCallbackSWTL(t_com_buf_hdl bhdl)
/* Rx notification callback */
IhuPrivateDHUCanFr01_CALLBACK();
}
else {
else
{
/* Do nothing */
}
@ -459,8 +476,8 @@ void OsekComRxNotifCallbackSWTL(t_com_buf_hdl bhdl)
case ID_TP_FRM_DIAG_PHYSREQ_SWTL:
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_DIAGNOSTICREQSWTL) {
if (frm_len >= MIN_LEN_FRM_SIG_DIAGNOSTICREQSWTL)
{
/* Decoding of signal sig_DiagnosticReqSWTL */
sig_diagnosticreqswtl[0] = (CAN_BUF_QUERY_DATA_BYTE(bhdl, 0));
sig_diagnosticreqswtl[1] = (CAN_BUF_QUERY_DATA_BYTE(bhdl, 1));
@ -476,13 +493,15 @@ void OsekComRxNotifCallbackSWTL(t_com_buf_hdl bhdl)
/* Set of the Rx notification flag */
SET_FLAG_RX_SIG_DIAGNOSTICREQSWTL();
}
else {
else
{
/* Do nothing */
}
break;
case ID_TP_FRM_DIAG_FUNCREQ:
/* Test of the minimum Rx frames length required to decode the signal */
if (frm_len >= MIN_LEN_FRM_SIG_DIAGNOSTICFUNCADDRREQ) {
if (frm_len >= MIN_LEN_FRM_SIG_DIAGNOSTICFUNCADDRREQ)
{
/* Decoding of signal sig_DiagnosticFuncAddrReq */
sig_diagnosticfuncaddrreq[0] = (CAN_BUF_QUERY_DATA_BYTE(bhdl, 0));
sig_diagnosticfuncaddrreq[1] = (CAN_BUF_QUERY_DATA_BYTE(bhdl, 1));
@ -497,7 +516,8 @@ void OsekComRxNotifCallbackSWTL(t_com_buf_hdl bhdl)
/* Set of the Rx notification flag */
SET_FLAG_RX_SIG_DIAGNOSTICFUNCADDRREQ();
}
else {
else
{
/* Do nothing */
}
@ -508,11 +528,13 @@ void OsekComRxNotifCallbackSWTL(t_com_buf_hdl bhdl)
break;
}
}
else {
else
{
/* Do nothing */
}
/* Com traffic flag */
if ((com_traffic_swtl == COM_FALSE) && (aux_com_traffic == COM_TRUE)) {
if ((com_traffic_swtl == COM_FALSE) && (aux_com_traffic == COM_TRUE))
{
com_traffic_swtl = COM_TRUE;
}
}
@ -534,7 +556,8 @@ void CanTx(t_can_handler can_handler, bool notif, uint32_t idtp, uint16_t len, t
bool OsekComTxReqCallbackSWTL(void)
{
/* Check of the Tx request flag */
if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR06()) {
if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR06())
{
/* Transmission of the frame SwtlPrivateDHUCanFr06*/
if (Fuction_State != Function_State_C)
{
@ -542,7 +565,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR06();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR01()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR01())
{
/* Transmission of the frame SwtlPrivateDHUCanFr01 */
if (Fuction_State != Function_State_C)
{
@ -550,7 +574,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR01();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR02()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR02())
{
/* Transmission of the frame SwtlPrivateDHUCanFr02 */
if (Fuction_State != Function_State_C)
{
@ -558,7 +583,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR02();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR03()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR03())
{
/* Transmission of the frame SwtlPrivateDHUCanFr03 */
if (Fuction_State != Function_State_C)
{
@ -566,7 +592,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR03();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR04()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR04())
{
/* Transmission of the frame SwtlPrivateDHUCanFr04 */
if (Fuction_State != Function_State_C)
{
@ -574,7 +601,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR04();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR05()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR05())
{
/* Transmission of the frame SwtlPrivateDHUCanFr05 */
if (Fuction_State != Function_State_C)
{
@ -582,7 +610,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLPRIVATEDHUCANFR05();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLPRESSFR01()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLPRESSFR01())
{
/* Transmission of the frame SwtlPressFr01 */
if (Fuction_State != Function_State_C)
{
@ -591,7 +620,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLPRESSFR01();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR01()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR01())
{
/* Transmission of the frame SwtlSensorFr01 */
if (Fuction_State != Function_State_C)
{
@ -600,7 +630,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLSENSORFR01();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR02()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR02())
{
/* Transmission of the frame SwtlSensorFr02 */
if (Fuction_State != Function_State_C)
{
@ -609,7 +640,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLSENSORFR02();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR03()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR03())
{
/* Transmission of the frame SwtlSensorFr03 */
if (Fuction_State != Function_State_C)
{
@ -618,7 +650,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLSENSORFR03();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR04()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR04())
{
/* Transmission of the frame SwtlSensorFr04 */
if (Fuction_State != Function_State_C)
{
@ -627,7 +660,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLSENSORFR04();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR05()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR05())
{
/* Transmission of the frame SwtlSensorFr05 */
if (Fuction_State != Function_State_C)
{
@ -636,7 +670,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLSENSORFR05();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR06()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR06())
{
/* Transmission of the frame SwtlSensorFr06 */
if (Fuction_State != Function_State_C)
{
@ -645,7 +680,8 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLSENSORFR06();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR07()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR07())
{
/* Transmission of the frame SwtlSensorFr07 */
if (Fuction_State != Function_State_C)
{
@ -654,12 +690,19 @@ bool OsekComTxReqCallbackSWTL(void)
}
RST_FLAG_TX_REQ_FRM_SWTLSENSORFR07();
}
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR08()) {
else if (TST_FLAG_TX_REQ_FRM_SWTLSENSORFR08())
{
/* Transmission of the frame SwtlSensorFr08 */
if (Fuction_State != Function_State_C)
{
if (Test_frame_On == 1)
{
CanTx(0, true, ID_TP_FRM_SWTLSENSORFR08, MAX_LEN_FRM_SWTLSENSORFR08, frm_swtlsensorfr08);
CanTx(0, true, 0x409, 8, frm_swtlsensorfr09);
CanTx(0, true, 0x40A, 8, frm_swtlsensorfr0A);
CanTx(0, true, 0x40B, 8, frm_swtlsensorfr0B);
CanTx(0, true, 0x40C, 8, frm_swtlsensorfr0C);
}
}
RST_FLAG_TX_REQ_FRM_SWTLSENSORFR08();
}
@ -669,14 +712,47 @@ bool OsekComTxReqCallbackSWTL(void)
CanTx(0, true, ID_TP_FRM_DIAG_PHYSRESP_SWTL, MAX_LEN_FRM_DIAG_PHYSRESP_SWTL, frm_diag_physresp_swtl);
RST_FLAG_TX_REQ_FRM_DIAG_PHYSRESP_SWTL();
}
else {
else
{
/* Do nothing */
}
/* return checking pending transmissions */
return (((flag_swtl_com_tx_req0 != 0) || (flag_swtl_com_tx_req1 != 0)) ? true : false);
}
void OsekComSetFR09data(uint8_t data[])
{
uint8_t i;
for (i = 0; i < 8; i++)
{
frm_swtlsensorfr09[i] = data[i];
}
}
void OsekComSetFR0Adata(uint8_t data[])
{
uint8_t i;
for (i = 0; i < 8; i++)
{
frm_swtlsensorfr0A[i] = data[i];
}
}
void OsekComSetFR0Bdata(uint8_t data[])
{
uint8_t i;
for (i = 0; i < 8; i++)
{
frm_swtlsensorfr0B[i] = data[i];
}
}
void OsekComSetFR0Cdata(uint8_t data[])
{
uint8_t i;
for (i = 0; i < 8; i++)
{
frm_swtlsensorfr0C[i] = data[i];
}
}
uint32_t CanBufQueryIdTp_Tx(void);
/*---------------------------------------------------------------------------
| Portability: Target platform independent
@ -695,7 +771,8 @@ void OsekComTxNotifCallbackSWTL(t_com_buf_hdl bhdl)
uint32_t buf_idtp = CanBufQueryIdTp();
buf_idtp = ID_TP_FRM_DIAG_PHYSREQ_SWTL;
switch (buf_idtp) {
switch (buf_idtp)
{
// case ID_TP_FRM_SWTLPRIVATEDHUCANFR01:
/* Set of Tx the notification flag */
// SET_FLAG_TX_SIG_STEERWHLTOUCHBDLETOUCHPOSNY();
@ -865,7 +942,8 @@ t_status_type StartCom(t_com_application_mode_type app_mode)
/* Get current timer tick */
/* Buffer initialization */
for(ind=0; ind < (uint16_t)8; ind++){
for (ind = 0; ind < (uint16_t)8; ind++)
{
aux[ind] = (uint8_t)0;
}
/* Register of the COM mode */
@ -875,12 +953,12 @@ t_status_type StartCom(t_com_application_mode_type app_mode)
SET_FLAG_OSEK_COM_INIT();
/* Signals initialization to zero */
for(ind=(uint16_t)0;ind<LAST_OSEK_COM_SIGNAL_SYMBOLIC_NAME;ind++){
for (ind = (uint16_t)0; ind < LAST_OSEK_COM_SIGNAL_SYMBOLIC_NAME; ind++)
{
(void)InitMessage(ind, aux_ref);
}
/* Signals initialization to a specific value */
/* Initialization of the Tx request flags */
flag_swtl_com_tx_req0 = (uint8_t)0;
flag_swtl_com_tx_req1 = (uint8_t)0;
@ -959,7 +1037,8 @@ t_status_type StartPeriodic(void)
{
t_status_type status = E_OK;
if (TST_FLAG_OSEK_COM_INIT()) {
if (TST_FLAG_OSEK_COM_INIT())
{
/* Initialization of periodic or mixed tx timers */
ptt_tx_frm_swtlprivatedhucanfr06 = PT_TX_FRM_SWTLPRIVATEDHUCANFR06 - OT_TX_FRM_SWTLPRIVATEDHUCANFR06;
ptt_tx_frm_swtlprivatedhucanfr05 = PT_TX_FRM_SWTLPRIVATEDHUCANFR05 - OT_TX_FRM_SWTLPRIVATEDHUCANFR05;
@ -980,7 +1059,8 @@ t_status_type StartPeriodic(void)
/* Activation of the periodic Tx management runnable */
SET_FLAG_OSEK_COM_PER_TX();
}
else {
else
{
status = E_COM_SYS_NOINIT;
}
@ -1051,7 +1131,8 @@ t_status_type ReceiveMessage(t_symbolic_name message,
/* Mutual exclusive access begin */
// SuspendAllInterrupts();
switch (message) {
switch (message)
{
case SIG_TWLIBRISTS_UB:
((uint8_t *)data_ref)[0] = sig_twlibrists_ub[0];
break;
@ -1093,7 +1174,8 @@ t_status_type ReceiveDynamicMessage(t_symbolic_name message,
/* Mutual exclusive access begin */
// SuspendAllInterrupts();
switch (message) {
switch (message)
{
case SIG_DIAGNOSTICREQSWTL:
((UI_8 *)data_ref)[0] = sig_diagnosticreqswtl[0];
((UI_8 *)data_ref)[1] = sig_diagnosticreqswtl[1];
@ -1168,16 +1250,19 @@ t_status_type SendMessage(t_symbolic_name message,
t_symbolic_name aux_msg = message & (~NODE_ID_MASK);
/* Case when FicOsek is initialized */
if (TST_FLAG_OSEK_COM_INIT()) {
if (TST_FLAG_OSEK_COM_INIT())
{
/* Case when message is not out of the range */
if ((aux_msg >= FIRST_TX_STA_LEN_SIGNAL_SYMBOLIC_NAME) &&
(aux_msg <= LAST_TX_STA_LEN_SIGNAL_SYMBOLIC_NAME)) {
(aux_msg <= LAST_TX_STA_LEN_SIGNAL_SYMBOLIC_NAME))
{
/* Mutual exclusive access begin */
// SuspendAllInterrupts();
/* Set of message data */
status = InitMessage(message, data_ref);
/* Switch for signals with Tx or TxError flags to reset */
switch (message) {
switch (message)
{
case SIG_DIAGCFAILRTOUCHPANSWTLVIBRATIONFLTSTS:
/* Reset Tx notification flag */
ResetFlagTxSigDiagcFailrTouchPanSWTLVibrationFltSts();
@ -1413,12 +1498,14 @@ t_status_type SendMessage(t_symbolic_name message,
// ResumeAllInterrupts();
}
/* Case when message is out of the range */
else {
else
{
status = E_COM_ID;
}
}
/* Case when FicOsek is not initialized */
else {
else
{
status = E_COM_SYS_NOINIT;
}
return status;
@ -1431,16 +1518,19 @@ t_status_type SendDynamicMessage(t_symbolic_name message,
t_status_type status;
t_symbolic_name aux_msg = message & (~NODE_ID_MASK);
/* Case when FicOsek is initialized */
if (TST_FLAG_OSEK_COM_INIT()) {
if (TST_FLAG_OSEK_COM_INIT())
{
/* Case when message is not out of the range */
if ((aux_msg >= FIRST_TX_DYN_LEN_SIGNAL_SYMBOLIC_NAME) &&
(aux_msg <= LAST_TX_DYN_LEN_SIGNAL_SYMBOLIC_NAME)) {
(aux_msg <= LAST_TX_DYN_LEN_SIGNAL_SYMBOLIC_NAME))
{
/* Mutual exclusive access begin */
// SuspendAllInterrupts();
/* Set of signal data */
status = InitMessage(message, data_ref);
/* Switch for signals */
switch (message) {
switch (message)
{
case SIG_DIAGNOSTICRESPSWTL:
/* Set of signal length */
len_frm_diag_physresp_swtl = MAX_LEN_FRM_DIAG_PHYSRESP_SWTL - MAX_LEN_SIG_DIAGNOSTICRESPSWTL + (*((UI_8 *)length_ref));
@ -1456,7 +1546,8 @@ t_status_type SendDynamicMessage(t_symbolic_name message,
/* Mutual exclusive access end */
// ResumeAllInterrupts();
/* Switch for triggered signal of direct or mixed frames */
switch (message) {
switch (message)
{
case SIG_DIAGNOSTICRESPSWTL:
/* Trigger event to initiate the transmission of the frame */
OsekComTxReqFrmDIAG_PhysResp_SWTL();
@ -1467,12 +1558,14 @@ t_status_type SendDynamicMessage(t_symbolic_name message,
}
}
/* Case when message is out of the range */
else {
else
{
status = E_COM_ID;
}
}
/* Case when FicOsek is not initialized */
else {
else
{
status = E_COM_SYS_NOINIT;
}
return status;
@ -1506,7 +1599,8 @@ t_status_type InitMessage(t_symbolic_name message,
/* Mutual exclusive access begin */
// SuspendAllInterrupts();
switch (message) {
switch (message)
{
case SIG_TWLIBRISTS_UB:
/* Initialization of signal sig_TwliBriSts_UB */
sig_twlibrists_ub[0] = ((uint8_t *)data_ref)[0];
@ -2157,7 +2251,8 @@ void ResetFlagComTrafficSWTL(void)
t_flag_value ReadFlagTxSig(t_symbolic_name message)
{
t_flag_value result;
switch (message) {
switch (message)
{
case SIG_DIAGCFAILRTOUCHPANSWTLVIBRATIONFLTSTS:
result = ReadFlagTxSigDiagcFailrTouchPanSWTLVibrationFltSts();
break;
@ -2664,7 +2759,8 @@ t_flag_value ReadFlagRxSig(t_symbolic_name message)
/---------------------------------------------------------------------------*/
void ResetFlagTxSig(t_symbolic_name message)
{
switch (message) {
switch (message)
{
case SIG_DIAGCFAILRTOUCHPANSWTLVIBRATIONFLTSTS:
ResetFlagTxSigDiagcFailrTouchPanSWTLVibrationFltSts();
break;
@ -3122,7 +3218,6 @@ void ResetFlagTxSigSteerWhlTouchBdLe_UB(void)
flag_tx6 &= ((uint8_t)0x7F);
}
void ResetFlagTxSigDiagnosticRespSWTL(void)
{
flag_tx6 &= ((UI_8)0xBF);
@ -3149,7 +3244,8 @@ t_flag_value ReadFlagRxSigDiagnosticFuncAddrReq(void)
/---------------------------------------------------------------------------*/
void ResetFlagRxSig(t_symbolic_name message)
{
switch (message) {
switch (message)
{
case SIG_DIAGNOSTICREQSWTL:
ResetFlagRxSigDiagnosticReqSWTL();
@ -3163,7 +3259,6 @@ void ResetFlagRxSig(t_symbolic_name message)
}
}
void ResetFlagRxSigDiagnosticReqSWTL(void)
{
flag_rx0 &= ((UI_8)0xFE);
@ -3184,7 +3279,8 @@ void ResetFlagRxSigDiagnosticFuncAddrReq(void)
/---------------------------------------------------------------------------*/
void OsekComTask(void)
{
if (TST_FLAG_OSEK_COM_INIT()) {
if (TST_FLAG_OSEK_COM_INIT())
{
/* Get timer difference since last task execution */
time_diff = FICOSEK_COM_TASK_TICKS;
@ -3207,12 +3303,14 @@ void OsekComTask(void)
static void OsekComPeriodicTx(void)
{
/* Test whether Tx of periodic frames is active */
if (TST_FLAG_OSEK_COM_PER_TX()) {
if (TST_FLAG_OSEK_COM_PER_TX())
{
/* Com frames monitoring */
/* Tx frame SwtlPrivateDHUCanFr06 end of period monitoring */
ptt_tx_frm_swtlprivatedhucanfr06 += time_diff;
if (ptt_tx_frm_swtlprivatedhucanfr06 >= PT_TX_FRM_SWTLPRIVATEDHUCANFR06) {
if (ptt_tx_frm_swtlprivatedhucanfr06 >= PT_TX_FRM_SWTLPRIVATEDHUCANFR06)
{
/* Reset timer */
ptt_tx_frm_swtlprivatedhucanfr06 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3222,13 +3320,15 @@ static void OsekComPeriodicTx(void)
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlPrivateDHUCanFr05 end of period monitoring */
ptt_tx_frm_swtlprivatedhucanfr05 += time_diff;
if (ptt_tx_frm_swtlprivatedhucanfr05 >= PT_TX_FRM_SWTLPRIVATEDHUCANFR05) {
if (ptt_tx_frm_swtlprivatedhucanfr05 >= PT_TX_FRM_SWTLPRIVATEDHUCANFR05)
{
/* Reset timer */
ptt_tx_frm_swtlprivatedhucanfr05 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3238,13 +3338,15 @@ static void OsekComPeriodicTx(void)
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlPrivateDHUCanFr04 end of period monitoring */
ptt_tx_frm_swtlprivatedhucanfr04 += time_diff;
if (ptt_tx_frm_swtlprivatedhucanfr04 >= PT_TX_FRM_SWTLPRIVATEDHUCANFR04) {
if (ptt_tx_frm_swtlprivatedhucanfr04 >= PT_TX_FRM_SWTLPRIVATEDHUCANFR04)
{
/* Reset timer */
ptt_tx_frm_swtlprivatedhucanfr04 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3254,13 +3356,15 @@ static void OsekComPeriodicTx(void)
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlPrivateDHUCanFr03 end of period monitoring */
ptt_tx_frm_swtlprivatedhucanfr03 += time_diff;
if (ptt_tx_frm_swtlprivatedhucanfr03 >= PT_TX_FRM_SWTLPRIVATEDHUCANFR03) {
if (ptt_tx_frm_swtlprivatedhucanfr03 >= PT_TX_FRM_SWTLPRIVATEDHUCANFR03)
{
/* Reset timer */
ptt_tx_frm_swtlprivatedhucanfr03 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3271,7 +3375,8 @@ static void OsekComPeriodicTx(void)
// ResumeAllInterrupts();
}
}
else {
else
{
/* Do nothing */
}
#if 0
@ -3290,13 +3395,10 @@ static void OsekComPeriodicTx(void)
}
#endif
/* Tx frame SwtlPressFr01 end of period monitoring */
ptt_tx_frm_swtlpressfr01 += time_diff;
if (ptt_tx_frm_swtlpressfr01 >= PT_TX_FRM_SWTLPRESSFR01) {
if (ptt_tx_frm_swtlpressfr01 >= PT_TX_FRM_SWTLPRESSFR01)
{
/* Reset timer */
ptt_tx_frm_swtlpressfr01 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3305,15 +3407,16 @@ static void OsekComPeriodicTx(void)
OsekComTxReqCallbackSWTL();
// CanTxRequest();
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlSensorFr01 end of period monitoring */
ptt_tx_frm_swtlsensorfr01 += time_diff;
if (ptt_tx_frm_swtlsensorfr01 >= PT_TX_FRM_SWTLSENSORFR01) {
if (ptt_tx_frm_swtlsensorfr01 >= PT_TX_FRM_SWTLSENSORFR01)
{
/* Reset timer */
ptt_tx_frm_swtlsensorfr01 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3321,15 +3424,16 @@ static void OsekComPeriodicTx(void)
OsekComTxReqCallbackSWTL();
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlSensorFr02 end of period monitoring */
ptt_tx_frm_swtlsensorfr02 += time_diff;
if (ptt_tx_frm_swtlsensorfr02 >= PT_TX_FRM_SWTLSENSORFR02) {
if (ptt_tx_frm_swtlsensorfr02 >= PT_TX_FRM_SWTLSENSORFR02)
{
/* Reset timer */
ptt_tx_frm_swtlsensorfr02 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3337,15 +3441,16 @@ static void OsekComPeriodicTx(void)
OsekComTxReqCallbackSWTL();
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlSensorFr03 end of period monitoring */
ptt_tx_frm_swtlsensorfr03 += time_diff;
if (ptt_tx_frm_swtlsensorfr03 >= PT_TX_FRM_SWTLSENSORFR03) {
if (ptt_tx_frm_swtlsensorfr03 >= PT_TX_FRM_SWTLSENSORFR03)
{
/* Reset timer */
ptt_tx_frm_swtlsensorfr03 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3353,15 +3458,16 @@ static void OsekComPeriodicTx(void)
OsekComTxReqCallbackSWTL();
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlSensorFr04 end of period monitoring */
ptt_tx_frm_swtlsensorfr04 += time_diff;
if (ptt_tx_frm_swtlsensorfr04 >= PT_TX_FRM_SWTLSENSORFR04) {
if (ptt_tx_frm_swtlsensorfr04 >= PT_TX_FRM_SWTLSENSORFR04)
{
/* Reset timer */
ptt_tx_frm_swtlsensorfr04 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3369,15 +3475,16 @@ static void OsekComPeriodicTx(void)
OsekComTxReqCallbackSWTL();
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlSensorFr05 end of period monitoring */
ptt_tx_frm_swtlsensorfr05 += time_diff;
if (ptt_tx_frm_swtlsensorfr05 >= PT_TX_FRM_SWTLSENSORFR05) {
if (ptt_tx_frm_swtlsensorfr05 >= PT_TX_FRM_SWTLSENSORFR05)
{
/* Reset timer */
ptt_tx_frm_swtlsensorfr05 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3385,15 +3492,16 @@ static void OsekComPeriodicTx(void)
OsekComTxReqCallbackSWTL();
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlSensorFr06 end of period monitoring */
ptt_tx_frm_swtlsensorfr06 += time_diff;
if (ptt_tx_frm_swtlsensorfr06 >= PT_TX_FRM_SWTLSENSORFR06) {
if (ptt_tx_frm_swtlsensorfr06 >= PT_TX_FRM_SWTLSENSORFR06)
{
/* Reset timer */
ptt_tx_frm_swtlsensorfr06 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3401,15 +3509,16 @@ static void OsekComPeriodicTx(void)
OsekComTxReqCallbackSWTL();
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
/* Tx frame SwtlSensorFr07 end of period monitoring */
ptt_tx_frm_swtlsensorfr07 += time_diff;
if (ptt_tx_frm_swtlsensorfr07 >= PT_TX_FRM_SWTLSENSORFR07) {
if (ptt_tx_frm_swtlsensorfr07 >= PT_TX_FRM_SWTLSENSORFR07)
{
/* Reset timer */
ptt_tx_frm_swtlsensorfr07 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3417,15 +3526,16 @@ static void OsekComPeriodicTx(void)
OsekComTxReqCallbackSWTL();
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
#if 1
/* Tx frame SwtlSensorFr08 end of period monitoring */
ptt_tx_frm_swtlsensorfr08 += time_diff;
if (ptt_tx_frm_swtlsensorfr08 >= PT_TX_FRM_SWTLSENSORFR08) {
if (ptt_tx_frm_swtlsensorfr08 >= PT_TX_FRM_SWTLSENSORFR08)
{
/* Reset timer */
ptt_tx_frm_swtlsensorfr08 = 0; /* Tx frame */
// SuspendAllInterrupts();
@ -3433,13 +3543,12 @@ static void OsekComPeriodicTx(void)
OsekComTxReqCallbackSWTL();
// ResumeAllInterrupts();
}
else {
else
{
/* Do nothing */
}
#endif
}
/*---------------------------------------------------------------------------
@ -3459,14 +3568,16 @@ static void OsekComDeadlineMonitRx(void)
/* Increasing Timer */
dmt_rx_sig_actvnofsteerwhlillmn += time_diff;
/* Rx deadline case time out signal ActvnOfSteerWhlIllmn */
if (dmt_rx_sig_actvnofsteerwhlillmn >= TO_RX_SIG_ACTVNOFSTEERWHLILLMN) {
if (dmt_rx_sig_actvnofsteerwhlillmn >= TO_RX_SIG_ACTVNOFSTEERWHLILLMN)
{
/* Reset monitoring timer */
dmt_rx_sig_actvnofsteerwhlillmn = 0;
/* RxError notification callback */
IhuPrivateDHUCanFr01_Timeout_CALLBACK();
}
/* Case normal counting */
else {
else
{
/* Do Nothing */
}
}
@ -3507,10 +3618,12 @@ static void OsekComTxReqFrmDIAG_PhysResp_SWTL(void)
{
/* Start of the Tx deadline monitoring timer */
// SuspendAllInterrupts();
if (dmt_tx_frm_diag_physresp_swtl == TIMER_CANCEL) {
if (dmt_tx_frm_diag_physresp_swtl == TIMER_CANCEL)
{
dmt_tx_frm_diag_physresp_swtl = 0;
}
else {
else
{
/* Do nothing */
}
/* Tx frame */
@ -3519,4 +3632,3 @@ static void OsekComTxReqFrmDIAG_PhysResp_SWTL(void)
OsekComTxReqCallbackSWTL();
// ResumeAllInterrupts();
}

11
firmware/src/OsekCom/OsekCom.h
View File

@ -834,5 +834,14 @@ void ResetFlagRxSigDiagnosticFuncAddrReq(void);
void OsekComTask(void);
void OsekComTxReqFrmSwtlPrivateDHUCanFr01(void);
void OsekComTxReqFrmSwtlPrivateDHUCanFr02(void);
#endif
void OsekComSetFR09data(uint8_t data[]);
void OsekComSetFR0Adata(uint8_t data[]);
void OsekComSetFR0Bdata(uint8_t data[]);
void OsekComSetFR0Cdata(uint8_t data[]);
#endif

352
firmware/src/RTE/RTE.c
View File

@ -19,7 +19,6 @@
#include "math.h"
#include "stdlib.h"
#include <stddef.h> // Defines NULL
#include <stdbool.h> // Defines true
#include <stdlib.h> // Defines EXIT_FAILURE
@ -33,6 +32,7 @@
#include "DiagnosticL/UDS/UDS_Services_Common.h"
#include "plib_systick.h"
#include "FunctionState.h"
#include "SysDiagDetect.h"
// For SWTL
// #include "Global.h"
@ -48,10 +48,8 @@
#define uint32_t unsigned int
#endif
#define Cncl_Btn_E2EID ((uint16_t)(0x2136)) // in CAN ID 0x305
uint8_t g_speeker_event = 0x00;
extern uint8 CurrentPosition;
uint8_t touch_reset2times_flag = 0;
@ -73,10 +71,10 @@ uint16_t Touch_Sensor_Sts09;
uint16_t Touch_Sensor_Sts10;
uint16_t Touch_Sensor_Sts11;
uint16_t Touch_Sensor_Sts12;
uint16_t Touch_Sensor_Sts13; //TJP2/ADAS2
uint16_t Touch_Sensor_Sts14; //Res2
uint16_t Touch_Sensor_Sts15; //Cancel2
uint8_t Allow_Touch_flag = 0;
uint16_t Touch_Sensor_Sts13;
uint16_t Touch_Sensor_Sts14;
uint16_t Touch_Sensor_Sts15;
uint8_t Allow_Touch_flag = 0,Allow_Touch_counter=0;
uint16_t Touch_Sensor_Ref00;
uint16_t Touch_Sensor_Ref01;
@ -91,9 +89,26 @@ uint16_t Touch_Sensor_Ref09;
uint16_t Touch_Sensor_Ref10;
uint16_t Touch_Sensor_Ref11;
uint16_t Touch_Sensor_Ref12;
uint16_t Touch_Sensor_Ref13; //TJP2/ADAS2
uint16_t Touch_Sensor_Ref14; //Res2
uint16_t Touch_Sensor_Ref15; //Cancel2
uint16_t Touch_Sensor_Ref13;
uint16_t Touch_Sensor_Ref14;
uint16_t Touch_Sensor_Ref15;
uint16_t Touch_Sensor_CC00;
uint16_t Touch_Sensor_CC01;
uint16_t Touch_Sensor_CC02;
uint16_t Touch_Sensor_CC03;
uint16_t Touch_Sensor_CC04;
uint16_t Touch_Sensor_CC05;
uint16_t Touch_Sensor_CC06;
uint16_t Touch_Sensor_CC07;
uint16_t Touch_Sensor_CC08;
uint16_t Touch_Sensor_CC09;
uint16_t Touch_Sensor_CC10;
uint16_t Touch_Sensor_CC11;
uint16_t Touch_Sensor_CC12;
uint16_t Touch_Sensor_CC13;
uint16_t Touch_Sensor_CC14;
uint16_t Touch_Sensor_CC15;
uint16_t Touch_Sensor_delta00;
uint16_t Touch_Sensor_delta01;
@ -112,7 +127,6 @@ uint16_t Touch_Sensor_delta13; //TJP2/ADAS2
uint16_t Touch_Sensor_delta14; // Res2
uint16_t Touch_Sensor_delta15; // Cancel2
uint8_t RTE_Get_TouchBoard_CRC(void)
{
return 0;
@ -162,9 +176,6 @@ uint8_t RTE_Get_Cancel_CRC(void)
return Crc_Value & 0xffu;
}
// Input Sensor
// uint16_t RTE_Get_Power_AD_SNS(void);
@ -224,7 +235,6 @@ uint8_t RTE_Get_TouchBoard_Left_Sts(void)
Signal = TouchPanel_BtnSignalRead(BTN_LEFT);
}
if (Allow_Touch_flag == 0)
{
Signal = 0;
@ -270,8 +280,6 @@ uint8_t RTE_Get_TouchBoard_Center_Sts(void)
return Signal;
}
uint8_t RTE_Get_TouchBoard_ADAS1_Sts(void) // TJP1
{
@ -286,7 +294,6 @@ uint8_t RTE_Get_TouchBoard_ADAS1_Sts(void)//TJP1
Signal = BUTTON_RELEASE;
}
return Signal;
}
uint8_t RTE_Get_TouchBoard_ADAS2_Sts(void) // TJP2
@ -297,7 +304,6 @@ uint8_t RTE_Get_TouchBoard_ADAS2_Sts(void)//TJP2
return Signal;
}
uint8_t RTE_Get_TouchBoard_Resu1_Sts(void) // Resume1
{
@ -336,8 +342,6 @@ uint8_t RTE_Get_TouchBoard_Cncl1_Sts(void)//Cancel1
Signal = BUTTON_RELEASE;
}
return Signal;
}
uint8_t RTE_Get_TouchBoard_Cncl2_Sts(void) // Cancel2
@ -348,31 +352,11 @@ uint8_t RTE_Get_TouchBoard_Cncl2_Sts(void)//Cancel2
return Signal;
}
// touch borad left/right slide: 0:idle, 1:short slide left 2:short slide right 3:long slide left 4:long slide right
uint8_t RTE_Get_TouchBoard_Left_Right_Slide_Sts(void)
{
uint8_t retval = SIG_SWPLERISTSLE_SWPLERIREQSTS_IDLE;
#if 1
TP_SlideDirection_Enum SlideDir;
SlideDir = TouchPanel_SlideEventRead();
switch(SlideDir)
{
case TP_SlideDirection_ShortLEFT:
retval = SIG_SWPLERISTSLE_SWPLERIREQSTS_SHORTSLIDELEFT;
break;
case TP_SlideDirection_LongLEFT:
retval = SIG_SWPLERISTSLE_SWPLERIREQSTS_LONGSLIDELEFT;
break;
case TP_SlideDirection_ShortRIGHT:
retval = SIG_SWPLERISTSLE_SWPLERIREQSTS_SHORTSLIDERIGHT;
break;
case TP_SlideDirection_LongRIGHT:
retval = SIG_SWPLERISTSLE_SWPLERIREQSTS_LONGSLIDERIGHT;
break;
default: break;
}
#endif
return retval;
}
@ -380,35 +364,12 @@ uint8_t RTE_Get_TouchBoard_Left_Right_Slide_Sts(void)
uint8_t RTE_Get_TouchBoard_Up_Down_Slide_Sts(void)
{
uint8_t retval = SIG_SWPUPDWNSTSLE_SWPUPDWNREQSTS_IDLE;
#if 1
TP_SlideDirection_Enum SlideDir;
SlideDir = TouchPanel_SlideEventRead();
switch(SlideDir)
{
case TP_SlideDirection_ShortUP:
retval = SIG_SWPUPDWNSTSLE_SWPUPDWNREQSTS_SHORTSLIDEUP;
break;
case TP_SlideDirection_LongUP:
retval = SIG_SWPUPDWNSTSLE_SWPUPDWNREQSTS_LONGSLIDEUP;
break;
case TP_SlideDirection_ShortDOWN:
retval = SIG_SWPUPDWNSTSLE_SWPUPDWNREQSTS_SHORTSLIDEDOWN;
break;
case TP_SlideDirection_LongDOWN:
retval = SIG_SWPUPDWNSTSLE_SWPUPDWNREQSTS_LONGSLIDEDOWN;
break;
default: break;
}
#endif
return retval;
}
// uint8_t RTE_Get_INTB_PRSS_SNS(void);
// uint8_t RTE_Get_X1_SNS(void);
// uint8_t RTE_Get_X2_SNS(void);
// uint8_t RTE_Get_X3_SNS(void);
@ -447,7 +408,9 @@ uint8_t RTE_Get_X_SNS(void)
BUTTON_RELEASE != TouchPanel_BtnSignalRead(BTN_ADAS1))
{
x_pos = 0x00;
}else{
}
else
{
GetSurface_Position(&x_pos, NULL_PTR);
}
@ -508,13 +471,15 @@ uint8_t RTE_Get_X_SNS(void)
{
rtn_X = 0;
}
if (Allow_Touch_flag == 0)
{
rtn_X = 0;
}
return rtn_X;
#endif
}
// uint8_t RTE_Get_Y1_SNS(void);
// uint8_t RTE_Get_Y2_SNS(void);
// uint8_t RTE_Get_Y3_SNS(void);
@ -534,7 +499,9 @@ uint8_t RTE_Get_Y_SNS(void)
BUTTON_RELEASE != TouchPanel_BtnSignalRead(BTN_ADAS1))
{
y_pos = 0x00;
}else{
}
else
{
GetSurface_Position(NULL_PTR, &y_pos);
}
@ -592,15 +559,17 @@ uint8_t RTE_Get_Y_SNS(void)
Y_Update_Flg = 1;
rtn_Y = (Y_Buf[Y_Length / 2] + Y_Buf[Y_Length / 2 - 1]) / 2;
}
if (y_pos == 0)
{
rtn_Y = 0;
}
if (Allow_Touch_flag == 0)
{
rtn_Y = 0;
}
return rtn_Y;
#endif
}
uint8_t g_XY_Touch_And_Below_1N = 0;
@ -608,8 +577,7 @@ uint8_t RTE_Get_TouchBoard_XY_Sts(void)//Not active,Touch,Touch and Press,invali
{
// PanelPress_LevelType Press_Level;
Buttons_SignalType XY_Sts = BUTTON_RELEASE;
// 触发的通道数量 //连续触发的通道数量
//if((Two_Finger_Y_count<=4 && Y_count == Two_Finger_Y_count)&&(Two_Finger_X_count<=4 && X_count == Two_Finger_X_count))
if (Allow_Touch_flag == 1)
{
// Allow_Touch_flag=1;
@ -617,31 +585,16 @@ uint8_t RTE_Get_TouchBoard_XY_Sts(void)//Not active,Touch,Touch and Press,invali
if (TouchSurface_is_TouchActive() == TRUE) // PANEL_PRESS_LEVEL0 == Press_Level &&
{
g_XY_Touch_And_Below_1N = 0x01;
}else{
g_XY_Touch_And_Below_1N = 0x00;
}
}
/*
if (Two_Finger_Y_count > 4 && Two_Finger_X_count > 4)
{
Allow_Touch_flag=0;
}
else
{
XY_Sts = TouchSurface_XY_StsRead();
if(TouchSurface_is_TouchActive() == TRUE)//PANEL_PRESS_LEVEL0 == Press_Level &&
{
g_XY_Touch_And_Below_1N = 0x01;
}else{
g_XY_Touch_And_Below_1N = 0x00;
}
}
*/
return XY_Sts;
}
uint8_t RTE_Get_ACT_FAULT_OUT_SNS(void)
{
return 0;
@ -654,7 +607,6 @@ uint8_t RTE_Get_ACT_LD_OUT_SNS(void)
uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false 1 true
{
#if 1
uint8_t ret_val = 0;
// Buttons_SignalType XY_Sts = BUTTON_RELEASE;
@ -666,18 +618,17 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false 1 true
uint8_t i, m;
Two_Finger_X_data[0] = Touch_Sensor_delta03;
Two_Finger_X_data[1] = Touch_Sensor_delta04;
Two_Finger_X_data[2] = Touch_Sensor_delta05;
Two_Finger_X_data[3] = Touch_Sensor_delta06;
Two_Finger_X_data[4] = Touch_Sensor_delta07;
Two_Finger_Y_data[0]=Touch_Sensor_delta03;
Two_Finger_Y_data[1]=Touch_Sensor_delta04;
Two_Finger_Y_data[2]=Touch_Sensor_delta05;
Two_Finger_Y_data[3]=Touch_Sensor_delta06;
Two_Finger_Y_data[4]=Touch_Sensor_delta07;
Two_Finger_X_data[0]=Touch_Sensor_delta08;
Two_Finger_X_data[1]=Touch_Sensor_delta09;
Two_Finger_X_data[2]=Touch_Sensor_delta10;
Two_Finger_X_data[3]=Touch_Sensor_delta11;
Two_Finger_X_data[4]=Touch_Sensor_delta12;
Two_Finger_Y_data[0] = Touch_Sensor_delta08;
Two_Finger_Y_data[1] = Touch_Sensor_delta09;
Two_Finger_Y_data[2] = Touch_Sensor_delta10;
Two_Finger_Y_data[3] = Touch_Sensor_delta11;
Two_Finger_Y_data[4] = Touch_Sensor_delta12;
th_x[0] = qtlib_key_configs_set1[3].channel_threshold;
th_x[1] = qtlib_key_configs_set1[4].channel_threshold;
@ -691,7 +642,6 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false 1 true
th_y[3] = qtlib_key_configs_set1[11].channel_threshold;
th_y[4] = qtlib_key_configs_set1[12].channel_threshold;
Two_Finger_Y_count = 0;
for (i = 0; i < 5; i++)
{
@ -703,7 +653,8 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false 1 true
i = 0;
Y_count = 0;
while(Two_Finger_Y_data[i]<=th_y[i++] && i<5);
while (Two_Finger_Y_data[i] <= th_y[i++] && i < 5)
;
i--;
for (; i < 5; i++)
{
@ -713,8 +664,6 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false 1 true
Y_count++;
}
Two_Finger_X_count = 0;
for (m = 0; m < 5; m++)
{
@ -722,11 +671,11 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false 1 true
{
Two_Finger_X_count++;
}
}
m = 0;
X_count = 0;
while(Two_Finger_X_data[m]<=th_x[m++] && m<5);
while (Two_Finger_X_data[m] <= th_x[m++] && m < 5)
;
m--;
for (; m < 5; m++)
{
@ -736,16 +685,22 @@ uint8_t RTE_Get_TouchBoard_XY_Touch_And_Below_1N(void) // 0 false 1 true
X_count++;
}
// 触发的通道数量 //连续触发的通道数量
if((Two_Finger_Y_count<=4 && Y_count == Two_Finger_Y_count)&&(Two_Finger_X_count<=4 && X_count == Two_Finger_X_count))
if ((Two_Finger_Y_count > 4 && Two_Finger_X_data[0]>th_x[0]) || Y_count != Two_Finger_Y_count || Two_Finger_X_count > 4 || X_count == Two_Finger_X_count)
{
/* code */
//满足防误触
Allow_Touch_counter++;
if (Allow_Touch_counter >= 10)//40ms
{
Allow_Touch_counter = 10;
Allow_Touch_flag = 0;
}
}
else
{
Allow_Touch_flag = 0;
Allow_Touch_counter = 0;
}
//if((Two_Finger_Y_count<=4 && Y_count == Two_Finger_Y_count)&&(Two_Finger_X_count<=4 && X_count == Two_Finger_X_count))
if (Allow_Touch_flag == 1)
{
if (g_XY_Touch_And_Below_1N == TRUE && CurrentPosition >= 4)
@ -781,7 +736,6 @@ uint8_t RTE_Get_CAN_TwliBriSts(void)
return rtn_data;
}
uint8_t RTE_Get_CAN_IntrBriSts(void)
{
// uint8_t temp = 0;
@ -855,7 +809,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
if (Percent == 100000 || Percent == 0) // Day mode
{
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 250 * Percent / 100000; // Res CANCEL PWM
TC0_Compare8bitMatch1Set((uint8_t)temp);
@ -866,7 +820,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
if (Percent == 625)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 480 * Percent / 100000; // Res CANCEL PWM
@ -876,7 +830,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 729)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 540 * Percent / 100000; // Res CANCEL PWM
@ -886,7 +840,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 937)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 540 * Percent / 100000; // Res CANCEL PWM
@ -896,7 +850,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 1146)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 380 * Percent / 100000; // Res CANCEL PWM
@ -906,7 +860,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 1354)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 380 * Percent / 100000; // Res CANCEL PWM
@ -916,7 +870,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 1563)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 390 * Percent / 100000; // Res CANCEL PWM
@ -926,7 +880,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 1875)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 330 * Percent / 100000; // Res CANCEL PWM
@ -936,7 +890,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 2292)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 330 * Percent / 100000; // Res CANCEL PWM
@ -946,7 +900,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 2813)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 310 * Percent / 100000; // Res CANCEL PWM
@ -956,7 +910,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 3333)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 300 * Percent / 100000; // Res CANCEL PWM
@ -966,7 +920,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 4063)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 290 * Percent / 100000; // Res CANCEL PWM
@ -976,7 +930,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 4896)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 290 * Percent / 100000; // Res CANCEL PWM
@ -986,7 +940,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 5938)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 260 * Percent / 100000; // Res CANCEL PWM
@ -996,7 +950,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 7188)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 260 * Percent / 100000; // Res CANCEL PWM
@ -1006,7 +960,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 8646)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 260 * Percent / 100000; // Res CANCEL PWM
@ -1016,7 +970,7 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
else if (Percent == 10417)
{
Percent /= 2;
temp = (7999/100) * Percent/1000; //TJP PWM
temp = 7999 * Percent / 1000 / 100; // TJP PWM
// IoHw_PWM3_Setter(PWM_CHANNEL_CHANNEL0, temp);
(void)TCC0_PWM24bitDutySet(TCC0_CHANNEL0, (uint16_t)temp);
temp = 260 * Percent / 100000; // Res CANCEL PWM
@ -1029,12 +983,8 @@ void RTE_Set_illumination_BL_PWM(uint32_t Percent)
// }
}
// void RTE_Set_Power_AD_Ctrl(uint8_t Value);
// ACT control??
uint8_t trigger_ACT = 0;
void RTE_Set_ACT_Vibration(uint8_t Sts)
@ -1046,13 +996,11 @@ void RTE_Set_ACT_Vibration(uint8_t Sts)
trigger_ACT = 1;
// speeker_Tig_Once(50, SA51024_STRENGTH_LEVEL3);
}
}
else
{
trigger_ACT = 0;
}
}
// void RTE_Set_Gain0(uint8_t Value);
// void RTE_Set_Gain1(uint8_t Value);
@ -1112,7 +1060,6 @@ void RTE_Set_CAN_LeMFctActSgUp(uint8_t Value)
}
uint8_t g_TouchBoard_ADAS1_Sts = BUTTON_RELEASE;
void RTE_Set_CAN_SteerWhlTouchBdADAS(uint8_t Value)
{
@ -1121,13 +1068,11 @@ void RTE_Set_CAN_SteerWhlTouchBdADAS(uint8_t Value)
{
Value = 0;
}
if((Value == BUTTON_TOUCH_AND_PRESS && g_TouchBoard_ADAS1_Sts != BUTTON_TOUCH_AND_PRESS) ||
(Value != BUTTON_TOUCH_AND_PRESS && g_TouchBoard_ADAS1_Sts == BUTTON_TOUCH_AND_PRESS))
if (Value != 0 && Touch_Sensor_Fault_key2 != Touch_NoFault)
{
//speeker_Tig_Once(60, SA51024_STRENGTH_LEVEL3);
g_speeker_event |= 0x01;
Value = 0x03;
}
g_TouchBoard_ADAS1_Sts = Value;
InitMessage(SIG_STEERWHLTOUCHBDADAS, &Value);
}
@ -1169,15 +1114,12 @@ void RTE_Set_CAN_SteerWhlTouchBdCnclChks(uint8_t Value)
void RTE_Set_CAN_SteerWhlTouchBdCnclCntr(uint8_t Value)
{
}
void RTE_Set_CAN_SteerWhlTouchBdCnclQf1(uint8_t Value)
{
InitMessage(SIG_STEERWHLTOUCHBDCNCLQF1, &Value);
Cancel_Qf1 = Value;
}
void RTE_Set_CAN_SteerWhlTouchBdCnclSteerWhlTouchBdSts(uint8_t Value)
@ -1187,7 +1129,10 @@ void RTE_Set_CAN_SteerWhlTouchBdCnclSteerWhlTouchBdSts(uint8_t Value)
{
Value = 0;
}
if (Value != 0 && Touch_Sensor_Fault_key3 != Touch_NoFault)
{
Value = 0x03;
}
InitMessage(SIG_STEERWHLTOUCHBDCNCLSTEERWHLTOUCHBDSTS, &Value);
Cancel_Sts = Value;
}
@ -1197,7 +1142,6 @@ void RTE_Set_CAN_SteerWhlTouchBdCrsResuQf1(uint8_t Value)
InitMessage(SIG_STEERWHLTOUCHBDCRSRESUQF1, &Value);
}
void RTE_Set_CAN_SteerWhlTouchBdCrsResuSteerWhlTouchBdSts(uint8_t Value)
{
@ -1206,14 +1150,16 @@ void RTE_Set_CAN_SteerWhlTouchBdCrsResuSteerWhlTouchBdSts(uint8_t Value)
{
Value = 0;
}
if (Value != 0 && Touch_Sensor_Fault_key1 != Touch_NoFault)
{
Value = 0x03;
}
InitMessage(SIG_STEERWHLTOUCHBDCRSRESUSTEERWHLTOUCHBDSTS, &Value);
}
void RTE_Set_CAN_SteerWhlTouchBdLeChks(uint8_t Value)
{
InitMessage(SIG_STEERWHLTOUCHBDLECHKS, &Value);
}
void RTE_Set_CAN_SteerWhlTouchBdLeCntr(uint8_t Value)
@ -1232,13 +1178,14 @@ void RTE_Set_CAN_SteerWhlTouchBdLeSteerWhlTouchBdSts(uint8_t Value)
{
Value = 0;
}
if (Value != 0 && Touch_Sensor_Fault_pad != Touch_NoFault)
{
Value = 0x03;
}
InitMessage(SIG_STEERWHLTOUCHBDLESTEERWHLTOUCHBDSTS, &Value);
// TouchBoard_Sts=Value;
}
void RTE_Set_CAN_SteerWhlTouchBdLeTouchPosnX(uint8_t Value)
{
uint16_t Press_signal = Get_forcedetect_force_value();
@ -1246,6 +1193,8 @@ void RTE_Set_CAN_SteerWhlTouchBdLeTouchPosnX(uint8_t Value)
{
Value = 0;
}
InitMessage(SIG_STEERWHLTOUCHBDLETOUCHPOSNX, &Value);
// TouchBoard_X=Value;
}
@ -1260,7 +1209,6 @@ void RTE_Set_CAN_SteerWhlTouchBdLeTouchPosnY(uint8_t Value)
// TouchBoard_Y=Value;
}
uint8_t Pre_300_req;
uint8_t Remain_frame;
uint8_t Remain_cnt;
@ -1274,9 +1222,12 @@ void RTE_Set_SEND_CAN_0x300_immediately(uint8_t Value) //called immediately in 1
if (Value == 1)
{
if(Frame_0x300_RC > 14){
if (Frame_0x300_RC > 14)
{
Frame_0x300_RC = 0;
}else{
}
else
{
Frame_0x300_RC++;
}
InitMessage(SIG_STEERWHLTOUCHBDLECNTR, &Frame_0x300_RC);
@ -1297,9 +1248,12 @@ void RTE_Set_SEND_CAN_0x300_immediately(uint8_t Value) //called immediately in 1
InitMessage(SIG_STEERWHLTOUCHBDLESTEERWHLTOUCHBDSTS, &Remain_Y);
if (Remain_cnt < 2)
{
if(Frame_0x300_RC > 14){
if (Frame_0x300_RC > 14)
{
Frame_0x300_RC = 0;
}else{
}
else
{
Frame_0x300_RC++;
}
InitMessage(SIG_STEERWHLTOUCHBDLECNTR, &Frame_0x300_RC);
@ -1321,9 +1275,12 @@ void RTE_Set_SEND_CAN_0x305_25ms(uint8_t Value) // when touch,or touch and press
if (Value == 1)
{
if(Cancel_0x305_RC > 14){
if (Cancel_0x305_RC > 14)
{
Cancel_0x305_RC = 0;
}else{
}
else
{
Cancel_0x305_RC++;
}
InitMessage(SIG_STEERWHLTOUCHBDCNCLCNTR, &Cancel_0x305_RC);
@ -1341,9 +1298,12 @@ void RTE_Set_SEND_CAN_0x305_1000ms(uint8_t Value) // when 3 button area is not
uint8_t temp;
if (Value == 1)
{
if(Cancel_0x305_RC > 14){
if (Cancel_0x305_RC > 14)
{
Cancel_0x305_RC = 0;
}else{
}
else
{
Cancel_0x305_RC++;
}
InitMessage(SIG_STEERWHLTOUCHBDCNCLCNTR, &Cancel_0x305_RC);
@ -1380,7 +1340,7 @@ void RTE_Set_All_Test_Value(void)
{
uint16_t Press_baseline;
uint16_t Press_signal, Press_preload;
uint8_t i,sensor_state;
uint8_t i,frccdata[8]={0};
static uint32_t Press_reset_counter[16], Press_repeat_counter[16], baseline_error_counter, baseline_error_repeat_counter;
Press_baseline = Get_forcedetect_basline_value();
Press_signal = Get_forcedetect_force_value();
@ -1419,8 +1379,6 @@ void RTE_Set_All_Test_Value(void)
{
Press_repeat_counter[i]--;
}
}
for (i = 0; i < 16; i++)
{
@ -1441,7 +1399,6 @@ void RTE_Set_All_Test_Value(void)
}
break;
}
}
if (i == 16)
{
@ -1452,10 +1409,6 @@ void RTE_Set_All_Test_Value(void)
baseline_error_repeat_counter--;
}
// uint8_t Touch_Sensor_Sts13;
Touch_Sensor_Sts00 = get_sensor_node_signal(0U);
@ -1492,6 +1445,63 @@ void RTE_Set_All_Test_Value(void)
Touch_Sensor_Ref14 = get_sensor_node_reference(14U);
Touch_Sensor_Ref15 = get_sensor_node_reference(15U);
Touch_Sensor_CC00 = get_sensor_cc_val(0U);
Touch_Sensor_CC01 = get_sensor_cc_val(1U);
Touch_Sensor_CC02 = get_sensor_cc_val(2U);
Touch_Sensor_CC03 = get_sensor_cc_val(3U);
Touch_Sensor_CC04 = get_sensor_cc_val(4U);
Touch_Sensor_CC05 = get_sensor_cc_val(5U);
Touch_Sensor_CC06 = get_sensor_cc_val(6U);
Touch_Sensor_CC07 = get_sensor_cc_val(7U);
Touch_Sensor_CC08 = get_sensor_cc_val(8U);
Touch_Sensor_CC09 = get_sensor_cc_val(9U);
Touch_Sensor_CC10 = get_sensor_cc_val(10U);
Touch_Sensor_CC11 = get_sensor_cc_val(11U);
Touch_Sensor_CC12 = get_sensor_cc_val(12U);
Touch_Sensor_CC13 = get_sensor_cc_val(13U);
Touch_Sensor_CC14 = get_sensor_cc_val(14U);
Touch_Sensor_CC15 = get_sensor_cc_val(15U);
frccdata[0] = (uint8_t)Touch_Sensor_CC00;
frccdata[1] = Touch_Sensor_CC00>>8;
frccdata[2] = (uint8_t)Touch_Sensor_CC01;
frccdata[3] = Touch_Sensor_CC01>>8;
frccdata[4] = (uint8_t)Touch_Sensor_CC02;
frccdata[5] = Touch_Sensor_CC02>>8;
frccdata[6] = (uint8_t)Touch_Sensor_CC03;
frccdata[7] = Touch_Sensor_CC03>>8;
OsekComSetFR09data(frccdata);
frccdata[0] = (uint8_t)Touch_Sensor_CC04;
frccdata[1] = Touch_Sensor_CC04>>8;
frccdata[2] = (uint8_t)Touch_Sensor_CC05;
frccdata[3] = Touch_Sensor_CC05>>8;
frccdata[4] = (uint8_t)Touch_Sensor_CC06;
frccdata[5] = Touch_Sensor_CC06>>8;
frccdata[6] = (uint8_t)Touch_Sensor_CC07;
frccdata[7] = Touch_Sensor_CC07>>8;
OsekComSetFR0Adata(frccdata);
frccdata[0] = (uint8_t)Touch_Sensor_CC08;
frccdata[1] = Touch_Sensor_CC08>>8;
frccdata[2] = (uint8_t)Touch_Sensor_CC09;
frccdata[3] = Touch_Sensor_CC09>>8;
frccdata[4] = (uint8_t)Touch_Sensor_CC10;
frccdata[5] = Touch_Sensor_CC10>>8;
frccdata[6] = (uint8_t)Touch_Sensor_CC11;
frccdata[7] = Touch_Sensor_CC11>>8;
OsekComSetFR0Bdata(frccdata);
frccdata[0] = (uint8_t)Touch_Sensor_CC12;
frccdata[1] = Touch_Sensor_CC12>>8;
frccdata[2] = (uint8_t)Touch_Sensor_CC13;
frccdata[3] = Touch_Sensor_CC13>>8;
frccdata[4] = (uint8_t)Touch_Sensor_CC14;
frccdata[5] = Touch_Sensor_CC14>>8;
frccdata[6] = (uint8_t)Touch_Sensor_CC15;
frccdata[7] = Touch_Sensor_CC15>>8;
OsekComSetFR0Cdata(frccdata);
Touch_Sensor_delta00 = Touch_Sensor_Sts00 > Touch_Sensor_Ref00 ? Touch_Sensor_Sts00 - Touch_Sensor_Ref00 : 0;
Touch_Sensor_delta01 = Touch_Sensor_Sts01 > Touch_Sensor_Ref01 ? Touch_Sensor_Sts01 - Touch_Sensor_Ref01 : 0;
Touch_Sensor_delta02 = Touch_Sensor_Sts02 > Touch_Sensor_Ref02 ? Touch_Sensor_Sts02 - Touch_Sensor_Ref02 : 0;
@ -1575,10 +1585,6 @@ void RTE_Set_All_Test_Value(void)
g16_DiagTouchPressSenRes[2][0] = Press_baseline;
g16_DiagTouchPressSenRes[2][1] = Press_signal;
g16_DiagTouchPressSenRes[2][2] = Press_preload;
}
#endif

12
firmware/src/Speaker/Speaker.c
View File

@ -12,6 +12,7 @@ STATE_UINT16 speaker_cycle_u16;
speaker_ctrl_Str speaker_ctrl_buf_str;
static uint8_t DAC_Initialize_status = 0;
static uint8_t DAC_Initialize_RetryCnt = 3;
static uint8_t speaker_fault_status = 0;
/************************************
Get Sw Fifo empty condition
************************************/
@ -225,7 +226,14 @@ void speaker_MainTask(void)
if(speaker_cycle_u16 >= SA51024_WAVE_MAX_NUM)
{
speaker_main_state_str = SPEAKER_STOP;
speaker_fault_status = 0;
}
if (PORT_PinRead(FAULT_OUT_PIN) == false)
{
speaker_main_state_str = SPEAKER_STOP;
speaker_fault_status = 1;
}
break;
default:
@ -282,5 +290,9 @@ Speaker_main_e_typ Get_Speaker_Main_State(void)
return speaker_main_state_str;
}
uint8_t Get_Speaker_Fault(void)
{
return speaker_fault_status;
}

2
firmware/src/Speaker/Speaker.h
View File

@ -51,7 +51,7 @@ extern void speaker_Init(void);
extern void speaker_MainTask(void);
extern STATE_UINT8 speeker_Tig_Once(uint16_t cycle_time,FA51024_ctrl_e_typ level);
extern Speaker_main_e_typ Get_Speaker_Main_State(void);
extern uint8_t Get_Speaker_Fault(void);
/***************************extern function end************************************/

2
firmware/src/TouchPanel/TouchPanel.c
View File

@ -1715,7 +1715,7 @@ void TouchPanel_MainFunction(void)
if(Vibra_force_level == 2 && last_Vibra_force_level != 2
&&Allow_Touch_flag)//((Two_Finger_Y_count<=4 && Y_count == Two_Finger_Y_count)&&(Two_Finger_X_count<=4 && X_count == Two_Finger_X_count))
&&Allow_Touch_flag == 1)
{
Over3N_vibra_req = 1;
Below1P5N_vibra_req = 0;

70
firmware/src/config/mcal/touch/touch.h
View File

@ -118,67 +118,67 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
#define NODE_0_PARAMS \
{ \
X_NONE, Y(31), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(31), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_1_PARAMS \
{ \
X_NONE, Y(15), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(15), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_2_PARAMS \
{ \
X_NONE, Y(17), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(17), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_3_PARAMS \
{ \
X_NONE, Y(24), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(24), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_4_PARAMS \
{ \
X_NONE, Y(25), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(25), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_5_PARAMS \
{ \
X_NONE, Y(1), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(1), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_6_PARAMS \
{ \
X_NONE, Y(2), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(2), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_7_PARAMS \
{ \
X_NONE, Y(3), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(3), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_8_PARAMS \
{ \
X_NONE, Y(10), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(10), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_9_PARAMS \
{ \
X_NONE, Y(11), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(11), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_10_PARAMS \
{ \
X_NONE, Y(12), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(12), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_11_PARAMS \
{ \
X_NONE, Y(13), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(13), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_12_PARAMS \
{ \
X_NONE, Y(14), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(14), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_13_PARAMS \
{ \
X_NONE, Y(30), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(30), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_14_PARAMS \
{ \
X_NONE, Y(21), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(21), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
#define NODE_15_PARAMS \
{ \
X_NONE, Y(16), 0,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_4), (uint8_t)FILTER_LEVEL_32 \
X_NONE, Y(16), 8,(uint8_t)PRSC_DIV_SEL_8, NODE_GAIN(GAIN_1, GAIN_8), (uint8_t)FILTER_LEVEL_16 \
}
/**********************************************************/
@ -196,97 +196,97 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
#define KEY_0_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
48u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_1_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
48u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_2_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
54u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_3_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
61u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_4_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
60u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_5_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
57u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_6_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
63u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_7_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
72u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_8_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
49u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_9_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
54u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_10_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
47u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_11_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
55u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_12_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
59u, (uint8_t)HYST_12_5, (uint8_t)AKS_GROUP_1 \
}
#define KEY_13_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
48u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_14_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
48u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
#define KEY_15_PARAMS \
{ \
40u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
60u, (uint8_t)HYST_12_5, (uint8_t)NO_AKS_GROUP \
}
@ -294,14 +294,14 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
* Range: 0 to 255.
* Default value: 4.
*/
#define DEF_TOUCH_DET_INT 4u
#define DEF_TOUCH_DET_INT 3u
/* De-bounce counter for additional measurements to confirm away from touch signal
* to initiate Away from touch re-calibration.
* Range: 0 to 255.
* Default value: 5.
*/
#define DEF_ANTI_TCH_DET_INT 5u
#define DEF_ANTI_TCH_DET_INT 3u
/* Threshold beyond with automatic sensor recalibration is initiated.
* Range: RECAL_100/ RECAL_50 / RECAL_25 / RECAL_12_5 / RECAL_6_25 / MAX_RECAL
@ -342,7 +342,7 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
* Range: 0-255
* Default value: 0
*/
#define DEF_MAX_ON_DURATION 0u
#define DEF_MAX_ON_DURATION 250u
/**********************************************************/

23
firmware/src/main.c
View File

@ -53,7 +53,6 @@ uint8_t Test_frame_On = 0;
uint8_t SDZ_init_flag = 0;
uint8_t SDZ_first_delay = 0;
void OS_TimerCallback(uintptr_t context)
{
SysTick_Elapse++;
@ -86,7 +85,8 @@ uint16_t adc[ADC1_CH_MAX] = {0};
void ADC1_ConversionCallback(ADC_STATUS status, uintptr_t context)
{
if(status == ADC_STATUS_RESRDY) {
if (status == ADC_STATUS_RESRDY)
{
adc_result = ADC1_ConversionResultGet();
// adc[adc_ch_sel - 1] = adc_result & 0xFFF;
adc[adc_ch_sel] = adc_result & 0xFFF;
@ -112,7 +112,6 @@ void ADC1_ConversionCallback (ADC_STATUS status, uintptr_t context)
}
}
/* CAN1 */
bool Can1BusErrFlag = false;
uint8_t Can1MessageRAM[CAN1_MESSAGE_RAM_CONFIG_SIZE] __attribute__((aligned(32)));
@ -181,7 +180,8 @@ void CanTx(t_can_handler can_handler, bool notif, uint32_t idtp, uint16_t len, t
CanTxBuffer = (CAN_TX_BUFFER *)canTxBuffer;
CanTxBuffer->id = WRITE_ID(idtp);
CanTxBuffer->dlc = len;
for (loop_count = 0; loop_count < len; loop_count++){
for (loop_count = 0; loop_count < len; loop_count++)
{
CanTxBuffer->data[loop_count] = can_data[loop_count];
}
if (CAN1_MessageTransmitFifo(1, CanTxBuffer) == true)
@ -251,7 +251,6 @@ int main ( void )
TouchPanel_init();
// sbc_write_reg(SBC_M_S_CTRL,0x18,0);
Tle9263_Init();
// touch_init();//test:11ms
// sbc_wd_trigger();
@ -262,7 +261,6 @@ int main ( void )
ADC1_ConversionStart();
P417_SWTL_App_initialize();
TC0_CompareStart();
TC1_CompareStart();
@ -287,13 +285,8 @@ int main ( void )
{
/* Maintain state machines of all polled MPLAB Harmony modules. */
SYS_Tasks();
ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
ADC1_ConversionStart();
// ADC1_ChannelSelect(ADC_POSINPUT_AIN6, ADC_NEGINPUT_GND);
// ADC1_ConversionStart();
if (!(loop_counter % 2))
{
@ -327,14 +320,12 @@ int main ( void )
// SBC VCC2 always on Setting
sbc_write_reg(SBC_M_S_CTRL, 0x18, 0);
}
if (!(loop_counter % 5))
{
FunctionState_Task();
Sys_Diag_Detcet_Task();
}
/* Check CAN Status */
@ -353,8 +344,6 @@ int main ( void )
return (EXIT_FAILURE);
}
/*******************************************************************************
End of File
*/