diff --git a/BCZT/.vscode/settings.json b/BCZT/.vscode/settings.json index a28d323..6cf0c59 100644 --- a/BCZT/.vscode/settings.json +++ b/BCZT/.vscode/settings.json @@ -1,5 +1,6 @@ { "files.associations": { - "motorctrl.h": "c" + "motorctrl.h": "c", + "r_cg_wdt.h": "c" } } \ No newline at end of file diff --git a/BCZT/BCZT.mtpj b/BCZT/BCZT.mtpj index 3b4fd9e..9ac0e1f 100644 --- a/BCZT/BCZT.mtpj +++ b/BCZT/BCZT.mtpj @@ -724,7 +724,7 @@ DataFlash False False - -8585016453235574218 + -8585009516258200797 True False Debug @@ -790,7 +790,7 @@ DataFlash False - FFFFF8 + FFFFE8 @@ -1304,10 +1304,191 @@ DataFlash DisplayAll - True - 0 - 1.0 - 0 + 48,27,135,0,0 + 0 + TO07,O,No,, + Free,-,-,, + Free,-,-,, + _RESET,I,-,, + Free,-,-,, + Free,-,-,, + P137,I,-,, + Free,-,-,, + Free,-,-,, + REGC,-,-,, + VSS,-,-,, + VDD,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + P00,O,-,, + P140,O,-,, + P130,O,-,, + P73,O,-,, + P72,O,No,, + P71,O,No,, + P70,O,No,, + P32,O,-,, + TO01,O,-,, + P17,O,No,, + P16,O,No,, + P15,O,No,, + P31,O,-,, + Free,-,-,, + Free,-,-,, + P12,O,No,, + P11,O,No,, + P10,O,No,, + ANI0,I,-,, + ANI1,I,-,, + ANI2,I,-,, + ANI3,I,-,, + P82,I,-,, + P83,I,-,, + P84,I,-,, + P85,I,-,, + Free,-,-,, + Free,-,-,, + P90,I,-,, + P91,I,-,, + Free,-,-,, + TO03,O,-,, + P15,O,No,, + _RESET,I,-,, + REGC,-,-,, + VSS,-,-,, + VDD,-,-,, + TO07,O,No,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + TO03,O,-,, + P00,O,-,, + P17,O,No,, + P16,O,No,, + P15,O,No,, + Free,-,-,, + Free,-,-,, + P12,O,No,, + P11,O,No,, + P10,O,No,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + P73,O,-,, + P72,O,No,, + P71,O,No,, + P70,O,No,, + Free,-,-,, + Free,-,-,, + P137,I,-,, + P130,O,-,, + ANI2,I,-,, + ANI3,I,-,, + P82,I,-,, + P83,I,-,, + P84,I,-,, + P85,I,-,, + Free,-,-,, + Free,-,-,, + P90,I,-,, + P91,I,-,, + Free,-,-,, + TO07,O,No,, + TO01,O,-,, + P17,O,No,, + P16,O,No,, + P15,O,No,, + Free,-,-,, + Free,-,-,, + P12,O,No,, + P11,O,No,, + TO03,O,-,, + ANI0,I,-,, + ANI1,I,-,, + ANI2,I,-,, + ANI3,I,-,, + P82,I,-,, + P83,I,-,, + P84,I,-,, + P85,I,-,, + Free,-,-,, + Free,-,-,, + P90,I,-,, + P91,I,-,, + P32,O,-,, + TO01,O,-,, + P31,O,-,, + ANI0,I,-,, + ANI1,I,-,, + Free,-,-,, + P130,O,-,, + P73,O,-,, + P72,O,No,, + P71,O,No,, + P70,O,No,, + TO01,O,-,, + P31,O,-,, + P12,O,No,, + TO03,O,-,, + P140,O,-,, + Free,-,-,, + Free,-,-,, + TO07,O,No,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + TO01,O,-,, + P17,O,No,, + P16,O,No,, + P15,O,No,, + Free,-,-,, + Free,-,-,, + TO03,O,-,, + Free,-,-,, + P16,O,No,, + P15,O,No,, + Free,-,-,, + P10,O,No,, + TO07,O,No,, + P00,O,-,, + TO01,O,-,, + P17,O,No,, + P16,O,No,, + P15,O,No,, + Free,-,-,, + Free,-,-,, + TO03,O,-,, + TO07,O,No,, + P137,I,-,, + P71,O,No,, + P32,O,-,, + TO01,O,-,, + P17,O,No,, + P31,O,-,, + P12,O,No,, + TO03,O,-,, + P73,O,-,, + P72,O,No,, + P71,O,No,, + P70,O,No,, + P83,I,-,, + P84,I,-,, + P85,I,-,, + Free,-,-,, + Free,-,-,, + P90,I,-,, + P91,I,-,, + Free,-,-,, + P140,O,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, <SOAP-ENV:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:clr="http://schemas.microsoft.com/soap/encoding/clr/1.0" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <SOAP-ENV:Body> <a1:UltraGridDisplayLayout id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/Infragistics.Win.UltraWinGrid/Infragistics4.Win.UltraWinGrid.v12.2"> @@ -2309,6 +2490,7 @@ DataFlash </SOAP-ENV:Body> </SOAP-ENV:Envelope> + 0 <SOAP-ENV:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:clr="http://schemas.microsoft.com/soap/encoding/clr/1.0" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"> <SOAP-ENV:Body> <a1:UltraGridDisplayLayout id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/Infragistics.Win.UltraWinGrid/Infragistics4.Win.UltraWinGrid.v12.2"> @@ -2774,191 +2956,9 @@ DataFlash </SOAP-ENV:Body> </SOAP-ENV:Envelope> - 48,27,135,0,0 - 0 - TO07,O,No,, - Free,-,-,, - Free,-,-,, - _RESET,I,-,, - Free,-,-,, - Free,-,-,, - P137,I,-,, - Free,-,-,, - Free,-,-,, - REGC,-,-,, - VSS,-,-,, - VDD,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - P00,O,-,, - P140,O,-,, - P130,O,-,, - P73,O,-,, - P72,O,No,, - P71,O,No,, - P70,O,No,, - P32,O,-,, - TO01,O,-,, - P17,O,No,, - P16,O,No,, - P15,O,No,, - P31,O,-,, - Free,-,-,, - Free,-,-,, - P12,O,No,, - P11,O,No,, - P10,O,No,, - ANI0,I,-,, - ANI1,I,-,, - ANI2,I,-,, - ANI3,I,-,, - P82,I,-,, - P83,I,-,, - P84,I,-,, - P85,I,-,, - Free,-,-,, - Free,-,-,, - P90,I,-,, - P91,I,-,, - Free,-,-,, - TO03,O,-,, - P15,O,No,, - _RESET,I,-,, - REGC,-,-,, - VSS,-,-,, - VDD,-,-,, - TO07,O,No,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - TO03,O,-,, - P00,O,-,, - P17,O,No,, - P16,O,No,, - P15,O,No,, - Free,-,-,, - Free,-,-,, - P12,O,No,, - P11,O,No,, - P10,O,No,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - P73,O,-,, - P72,O,No,, - P71,O,No,, - P70,O,No,, - Free,-,-,, - Free,-,-,, - P137,I,-,, - P130,O,-,, - ANI2,I,-,, - ANI3,I,-,, - P82,I,-,, - P83,I,-,, - P84,I,-,, - P85,I,-,, - Free,-,-,, - Free,-,-,, - P90,I,-,, - P91,I,-,, - Free,-,-,, - TO07,O,No,, - TO01,O,-,, - P17,O,No,, - P16,O,No,, - P15,O,No,, - Free,-,-,, - Free,-,-,, - P12,O,No,, - P11,O,No,, - TO03,O,-,, - ANI0,I,-,, - ANI1,I,-,, - ANI2,I,-,, - ANI3,I,-,, - P82,I,-,, - P83,I,-,, - P84,I,-,, - P85,I,-,, - Free,-,-,, - Free,-,-,, - P90,I,-,, - P91,I,-,, - P32,O,-,, - TO01,O,-,, - P31,O,-,, - ANI0,I,-,, - ANI1,I,-,, - Free,-,-,, - P130,O,-,, - P73,O,-,, - P72,O,No,, - P71,O,No,, - P70,O,No,, - TO01,O,-,, - P31,O,-,, - P12,O,No,, - TO03,O,-,, - P140,O,-,, - Free,-,-,, - Free,-,-,, - TO07,O,No,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - TO01,O,-,, - P17,O,No,, - P16,O,No,, - P15,O,No,, - Free,-,-,, - Free,-,-,, - TO03,O,-,, - Free,-,-,, - P16,O,No,, - P15,O,No,, - Free,-,-,, - P10,O,No,, - TO07,O,No,, - P00,O,-,, - TO01,O,-,, - P17,O,No,, - P16,O,No,, - P15,O,No,, - Free,-,-,, - Free,-,-,, - TO03,O,-,, - TO07,O,No,, - P137,I,-,, - P71,O,No,, - P32,O,-,, - TO01,O,-,, - P17,O,No,, - P31,O,-,, - P12,O,No,, - TO03,O,-,, - P73,O,-,, - P72,O,No,, - P71,O,No,, - P70,O,No,, - P83,I,-,, - P84,I,-,, - P85,I,-,, - Free,-,-,, - Free,-,-,, - P90,I,-,, - P91,I,-,, - Free,-,-,, - P140,O,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, + 1 + 0 + False False 100 0:78:78,1:77:77,2:400:400,3:61:61,4:40:40,5:50:50,6:160:160,7:210:210,8:210:210,9:210:210,10:100:100 @@ -2966,11 +2966,8 @@ DataFlash 0:98:98,1:77:77,2:77:77,3:400:400,4:61:61,5:40:40,6:50:50,7:160:160,8:210:210,9:210:210,10:210:210,11:100:100 0:98:98,1:100:100,2:43:43,3:150:150 0:98:98,1:78:78,2:77:77,3:400:400,4:61:61,5:40:40,6:50:50,7:160:160,8:210:210,9:210:210,10:210:210 - - - 1 - 0 - False + True + 0 @@ -3132,7 +3129,7 @@ DataFlash </fCLK> <ISPullupForPort Name="ISPullupForPort" Text="P00-P10-P11-P12-P13-P14-P15-P16-P17-P30-P31-P32-P40-P41-P60-P61-P62-P63-P70-P71-P72-P73-P92-P120-P125-P140-" Comment="unused" /> <fHOCO Name="fHOCO" Value="64" Comment="64M" Trigger="fHOCO" /> - <fIH Name="fIH" Value="64" Comment="32M" /> + <fIH Name="fIH" Value="32" Comment="32M" /> <fSUB Name="fSUB" Value="0" Comment="0K" Trigger="fSUB"> <Effect> <TAU0 /> @@ -3157,23 +3154,23 @@ DataFlash </Effect> </fSL> <fPLL Name="fPLL" Value="24" Comment="24M" Trigger="fPLL" /> - <fRTC Name="fRTC" Value="524.590163934426" Comment="15k" Trigger="fRTC"> + <fRTC Name="fRTC" Value="262.295081967213" Comment="15k" Trigger="fRTC"> <Effect> <RTC /> </Effect> </fRTC> - <fTRD Name="fTRD" Value="64" Comment="64M" Trigger="fTRD"> + <fTRD Name="fTRD" Value="32" Comment="64M" Trigger="fTRD"> <Effect> <TMRD0 /> <TMRD1 /> </Effect> </fTRD> - <fMAIN Name="fMAIN" Value="64" Comment="32M" Trigger="fMAIN"> + <fMAIN Name="fMAIN" Value="32" Comment="32M" Trigger="fMAIN"> <Effect> <PCLBUZ0 /> </Effect> </fMAIN> - <fTRDSource Name="fTRDSource" Trigger="fTRD" Text="fIH" /> + <fTRDSource Name="fTRDSource" Trigger="fTRD" Text="fCLK" /> <VDD_MIN Name="VDD_MIN" Value="4" Comment="4.0V" Trigger="VDD"> <Effect> <PCLBUZ0 /> @@ -3350,7 +3347,7 @@ DataFlash <StartAddressOfOnChipDebugOptionBytes Name="GOStart" Text="7E00" /> <SizeOfOnChipDebugOptionBytesArea Name="GOSizeValue" Text="512" /> <UserOptionBytes Name="GB" Text="1" /> - <UserOptionBytesValue Name="GBValue" Text="FFFFF8" /> + <UserOptionBytesValue Name="GBValue" Text="FFFFE8" /> <RAMStartAddress Chip="R5F10A6C,R5F10AAC,R5F10ABC,R5F10AGC,R5F10ALC,R5F10BAC,R5F10BBC,R5F10BGC,R5F10BLC" Name="RAMStartAddress" Fixed="" Text="000FF700" /> <RAMEndAddress Name="RAMEndAddress" Fixed="" Text="000FFEFF" /> <ROMEndAddress Chip="R5F10A6C,R5F10AAC,R5F10ABC,R5F10AGC,R5F10ALC,R5F10BAC,R5F10BBC,R5F10BGC,R5F10BLC" Name="ROMEndAddress" Fixed="" Text="00007FFF" /> @@ -3365,7 +3362,7 @@ DataFlash <TMRD0 /> </Effect> </TRDCLKUSE1> - <fMP Name="fMP" Value="64" /> + <fMP Name="fMP" Value="32" /> <TRDCLKTag Name="TRDCLKTag" Value="-1" /> <TRDCLKUSE0 Name="TRDCLKUSE0" Value="0" /> <TRD0_INTP0 Name="TRD0_INTP0" Value="0" /> @@ -3377,6 +3374,8 @@ DataFlash <ADPCForPort12 Name="ADPCForPort12" Value="255" /> <ADPCForPort13 Name="ADPCForPort13" Value="255" /> <ADPCForPort14 Name="ADPCForPort14" Value="255" /> + <RTC1HZ_Used Name="RTC1HZ_Used" Value="0" /> + <dtc_vectortable Name="dtc_vectortable" Value="0" /> <GroupName Name="GroupName" Text="groupa" /> <CodePath Name="CodePath" Text=".\" /> <ReportType Name="ReportType" Text="Html" /> @@ -3409,8 +3408,6 @@ DataFlash <INTP5Used Name="INTP5Used" Text="false" /> <INTP6Used Name="INTP6Used" Text="false" /> <INTP7Used Name="INTP7Used" Text="false" /> - <RTC1HZ_Used Name="RTC1HZ_Used" Value="0" /> - <dtc_vectortable Name="dtc_vectortable" Value="0" /> <NO_CHAIN_0 Name="NO_CHAIN_0" Text="" /> <CHAIN_HEAD_0 Name="CHAIN_HEAD_0" Text="" /> <NO_CHAIN_1 Name="NO_CHAIN_1" Text="" /> @@ -3484,8 +3481,8 @@ DataFlash <P10 Name="P10/TI13/TO13/TRJO0/_SCK10/SCL10/LTXD1/CTXD0" Chip="R5F10AAA,R5F10AAC,R5F10AAD,R5F10AAE,R5F10ABA,R5F10ABC,R5F10ABD,R5F10ABE,R5F10AGA,R5F10AGC,R5F10AGD,R5F10AGE,R5F10ALC,R5F10ALD,R5F10ALE," AltFunc="P10" Point="I/O" /> <P11 Name="P11/TI12/TO12/TRDIOB0/SI10/SDA10/RXD1/LRXD1/CRXD0" Chip="R5F10AAA,R5F10AAC,R5F10AAD,R5F10AAE,R5F10ABA,R5F10ABC,R5F10ABD,R5F10ABE,R5F10AGA,R5F10AGC,R5F10AGD,R5F10AGE,R5F10ALC,R5F10ALD,R5F10ALE," AltFunc="P11" Point="I/O" /> <P12 Name="P12/TI11/TO11/TRDIOD0/INTP5/SO10/TXD1/SNZOUT3" Chip="R5F10AAA,R5F10AAC,R5F10AAD,R5F10AAE,R5F10ABA,R5F10ABC,R5F10ABD,R5F10ABE,R5F10AGA,R5F10AGC,R5F10AGD,R5F10AGE,R5F10ALC,R5F10ALD,R5F10ALE," AltFunc="P12" Point="I/O" /> - <P13 Name="P13/TI04/TO04/TRDIOA0/TRDCLK0/SI01/SDA01/LTXD0" TTL="true" PITHL="true" Nch="true" AltFunc="" Point="I/O" /> - <P14 Name="P14/TI06/TO06/TRDIOC0/_SCK01/SCL01/LRXD0" TTL="true" PITHL="true" Nch="true" AltFunc="" Point="I/O" /> + <P13 Name="P13/TI04/TO04/TRDIOA0/TRDCLK0/SI01/SDA01/LTXD0" TTL="true" PITHL="true" Nch="true" AltFunc="P13" Point="I/O" /> + <P14 Name="P14/TI06/TO06/TRDIOC0/_SCK01/SCL01/LRXD0" TTL="true" PITHL="true" Nch="true" AltFunc="P14" Point="I/O" /> <P15 Name="P15/TI05/TO05/TRDIOA1/TRDIOA0/TRDCLK0/SO00/TXD0/TOOLTXD/RTC1HZ" Nch="true" AltFunc="P15" Point="I/O" /> <P16 Name="P16/TI02/TO02/TRDIOC1/SI00/SDA00/RXD0/TOOLRXD" TTL="true" PITHL="true" Nch="true" AltFunc="P16" Point="I/O" /> <P17 Name="P17/TI00/TO00/TRDIOB1/_SCK00/SCL00/INTP3" TTL="true" PITHL="true" Nch="true" AltFunc="P17" Point="I/O" /> @@ -4436,9 +4433,10 @@ DataFlash </FUNC> <TAG> <GlobleUserTag> + <cg_crc_area Name="cg_crc_area" Value="00" /> <cg_security9 Name="cg_security9" Value="00" /> <cg_security7 Name="cg_security7" Value="00" /> - <pior_value7 Name="pior_value7" Value="02" /> + <pior_value4 Name="pior_value4" Value="00" /> <pior_value1 Name="pior_value1" Value="00" /> <cg_security5 Name="cg_security5" Value="00" /> <ocdstart Name="ocdstart" Value="07E00" /> @@ -4447,17 +4445,16 @@ DataFlash <pior_value5 Name="pior_value5" Value="00" /> <cg_security1 Name="cg_security1" Value="00" /> <wdt_option Name="wdt_option" Value="F9" /> - <clock_option Name="clock_option" Value="F8" /> - <cg_security2 Name="cg_security2" Value="00" /> + <clock_option Name="clock_option" Value="E8" /> <cg_option Name="cg_option" Value="04" /> <cg_security8 Name="cg_security8" Value="00" /> <cg_security6 Name="cg_security6" Value="00" /> <pior_value0 Name="pior_value0" Value="00" /> <cg_security4 Name="cg_security4" Value="00" /> - <cg_crc_area Name="cg_crc_area" Value="00" /> + <cg_security2 Name="cg_security2" Value="00" /> <cg_iawctl_value Name="cg_iawctl_value" Value="00" /> <lvi_option Name="lvi_option" Value="FF" /> - <pior_value4 Name="pior_value4" Value="00" /> + <pior_value7 Name="pior_value7" Value="02" /> </GlobleUserTag> </TAG> </DIR> @@ -4511,7 +4508,7 @@ DataFlash <setting name="MAIN_CLOCK_SELECT_HIGH_SYSTEM_CLOCK" value="false" /> <setting name="MAIN_CLOCK_SELECT_HIGH_INTERNAL_CLOCK" value="true" /> <setting name="INTERNAL_HIGH_CLOCK_OPERATION" value="true" /> - <setting name="INTERNAL_HIGH_CLOCK_FREQUENCY" value="8" /> + <setting name="INTERNAL_HIGH_CLOCK_FREQUENCY" value="6" /> <setting name="HIGH_SYSTEM_CLOCK_OPERATION" value="false" /> <setting name="HIGH_SYSTEM_CLOCK_SELECT_EXTERNAL_CLOCK" value="false" /> <setting name="HIGH_SYSTEM_CLOCK_SELECT_X1_CLOCK" value="true" /> @@ -4894,18 +4891,18 @@ DataFlash <setting name="PSRSEL" value="false" /> </P12> <P13> - <setting name="MODULE_UNUSED" value="true" /> + <setting name="MODULE_UNUSED" value="false" /> <setting name="INPUT_MODE" value="false" /> - <setting name="OUTPUT_MODE" value="false" /> + <setting name="OUTPUT_MODE" value="true" /> <setting name="PULLUP_ON" value="false" /> <setting name="NCH_ON" value="false" /> - <setting name="OUTPUT_1" value="false" /> + <setting name="OUTPUT_1" value="true" /> <setting name="INPUT_BUFFER" value="0" /> <setting name="PSRSEL" value="false" /> </P13> <P14> - <setting name="MODULE_UNUSED" value="true" /> - <setting name="INPUT_MODE" value="false" /> + <setting name="MODULE_UNUSED" value="false" /> + <setting name="INPUT_MODE" value="true" /> <setting name="OUTPUT_MODE" value="false" /> <setting name="PULLUP_ON" value="false" /> <setting name="NCH_ON" value="false" /> diff --git a/BCZT/BCZT.rcpe b/BCZT/BCZT.rcpe index b92ed30..66cb37c 100644 --- a/BCZT/BCZT.rcpe +++ b/BCZT/BCZT.rcpe @@ -118,7 +118,7 @@ - + @@ -158,7 +158,7 @@ </fCLK> <ISPullupForPort Name="ISPullupForPort" Text="P00-P10-P11-P12-P13-P14-P15-P16-P17-P30-P31-P32-P40-P41-P60-P61-P62-P63-P70-P71-P72-P73-P92-P120-P125-P140-" Comment="unused" /> <fHOCO Name="fHOCO" Value="64" Comment="64M" Trigger="fHOCO" /> - <fIH Name="fIH" Value="64" Comment="32M" /> + <fIH Name="fIH" Value="32" Comment="32M" /> <fSUB Name="fSUB" Value="0" Comment="0K" Trigger="fSUB"> <Effect> <TAU0 /> @@ -183,23 +183,23 @@ </Effect> </fSL> <fPLL Name="fPLL" Value="24" Comment="24M" Trigger="fPLL" /> - <fRTC Name="fRTC" Value="524.590163934426" Comment="15k" Trigger="fRTC"> + <fRTC Name="fRTC" Value="262.295081967213" Comment="15k" Trigger="fRTC"> <Effect> <RTC /> </Effect> </fRTC> - <fTRD Name="fTRD" Value="64" Comment="64M" Trigger="fTRD"> + <fTRD Name="fTRD" Value="32" Comment="64M" Trigger="fTRD"> <Effect> <TMRD0 /> <TMRD1 /> </Effect> </fTRD> - <fMAIN Name="fMAIN" Value="64" Comment="32M" Trigger="fMAIN"> + <fMAIN Name="fMAIN" Value="32" Comment="32M" Trigger="fMAIN"> <Effect> <PCLBUZ0 /> </Effect> </fMAIN> - <fTRDSource Name="fTRDSource" Trigger="fTRD" Text="fIH" /> + <fTRDSource Name="fTRDSource" Trigger="fTRD" Text="fCLK" /> <VDD_MIN Name="VDD_MIN" Value="4" Comment="4.0V" Trigger="VDD"> <Effect> <PCLBUZ0 /> @@ -376,7 +376,7 @@ <StartAddressOfOnChipDebugOptionBytes Name="GOStart" Text="7E00" /> <SizeOfOnChipDebugOptionBytesArea Name="GOSizeValue" Text="512" /> <UserOptionBytes Name="GB" Text="1" /> - <UserOptionBytesValue Name="GBValue" Text="FFFFF8" /> + <UserOptionBytesValue Name="GBValue" Text="FFFFE8" /> <RAMStartAddress Chip="R5F10A6C,R5F10AAC,R5F10ABC,R5F10AGC,R5F10ALC,R5F10BAC,R5F10BBC,R5F10BGC,R5F10BLC" Name="RAMStartAddress" Fixed="" Text="000FF700" /> <RAMEndAddress Name="RAMEndAddress" Fixed="" Text="000FFEFF" /> <ROMEndAddress Chip="R5F10A6C,R5F10AAC,R5F10ABC,R5F10AGC,R5F10ALC,R5F10BAC,R5F10BBC,R5F10BGC,R5F10BLC" Name="ROMEndAddress" Fixed="" Text="00007FFF" /> @@ -391,7 +391,7 @@ <TMRD0 /> </Effect> </TRDCLKUSE1> - <fMP Name="fMP" Value="64" /> + <fMP Name="fMP" Value="32" /> <TRDCLKTag Name="TRDCLKTag" Value="-1" /> <TRDCLKUSE0 Name="TRDCLKUSE0" Value="0" /> <TRD0_INTP0 Name="TRD0_INTP0" Value="0" /> @@ -403,6 +403,8 @@ <ADPCForPort12 Name="ADPCForPort12" Value="255" /> <ADPCForPort13 Name="ADPCForPort13" Value="255" /> <ADPCForPort14 Name="ADPCForPort14" Value="255" /> + <RTC1HZ_Used Name="RTC1HZ_Used" Value="0" /> + <dtc_vectortable Name="dtc_vectortable" Value="0" /> <GroupName Name="GroupName" Text="groupa" /> <CodePath Name="CodePath" Text=".\" /> <ReportType Name="ReportType" Text="Html" /> @@ -435,8 +437,6 @@ <INTP5Used Name="INTP5Used" Text="false" /> <INTP6Used Name="INTP6Used" Text="false" /> <INTP7Used Name="INTP7Used" Text="false" /> - <RTC1HZ_Used Name="RTC1HZ_Used" Value="0" /> - <dtc_vectortable Name="dtc_vectortable" Value="0" /> <NO_CHAIN_0 Name="NO_CHAIN_0" Text="" /> <CHAIN_HEAD_0 Name="CHAIN_HEAD_0" Text="" /> <NO_CHAIN_1 Name="NO_CHAIN_1" Text="" /> @@ -510,8 +510,8 @@ <P10 Name="P10/TI13/TO13/TRJO0/_SCK10/SCL10/LTXD1/CTXD0" Chip="R5F10AAA,R5F10AAC,R5F10AAD,R5F10AAE,R5F10ABA,R5F10ABC,R5F10ABD,R5F10ABE,R5F10AGA,R5F10AGC,R5F10AGD,R5F10AGE,R5F10ALC,R5F10ALD,R5F10ALE," AltFunc="P10" Point="I/O" /> <P11 Name="P11/TI12/TO12/TRDIOB0/SI10/SDA10/RXD1/LRXD1/CRXD0" Chip="R5F10AAA,R5F10AAC,R5F10AAD,R5F10AAE,R5F10ABA,R5F10ABC,R5F10ABD,R5F10ABE,R5F10AGA,R5F10AGC,R5F10AGD,R5F10AGE,R5F10ALC,R5F10ALD,R5F10ALE," AltFunc="P11" Point="I/O" /> <P12 Name="P12/TI11/TO11/TRDIOD0/INTP5/SO10/TXD1/SNZOUT3" Chip="R5F10AAA,R5F10AAC,R5F10AAD,R5F10AAE,R5F10ABA,R5F10ABC,R5F10ABD,R5F10ABE,R5F10AGA,R5F10AGC,R5F10AGD,R5F10AGE,R5F10ALC,R5F10ALD,R5F10ALE," AltFunc="P12" Point="I/O" /> - <P13 Name="P13/TI04/TO04/TRDIOA0/TRDCLK0/SI01/SDA01/LTXD0" TTL="true" PITHL="true" Nch="true" AltFunc="" Point="I/O" /> - <P14 Name="P14/TI06/TO06/TRDIOC0/_SCK01/SCL01/LRXD0" TTL="true" PITHL="true" Nch="true" AltFunc="" Point="I/O" /> + <P13 Name="P13/TI04/TO04/TRDIOA0/TRDCLK0/SI01/SDA01/LTXD0" TTL="true" PITHL="true" Nch="true" AltFunc="P13" Point="I/O" /> + <P14 Name="P14/TI06/TO06/TRDIOC0/_SCK01/SCL01/LRXD0" TTL="true" PITHL="true" Nch="true" AltFunc="P14" Point="I/O" /> <P15 Name="P15/TI05/TO05/TRDIOA1/TRDIOA0/TRDCLK0/SO00/TXD0/TOOLTXD/RTC1HZ" Nch="true" AltFunc="P15" Point="I/O" /> <P16 Name="P16/TI02/TO02/TRDIOC1/SI00/SDA00/RXD0/TOOLRXD" TTL="true" PITHL="true" Nch="true" AltFunc="P16" Point="I/O" /> <P17 Name="P17/TI00/TO00/TRDIOB1/_SCK00/SCL00/INTP3" TTL="true" PITHL="true" Nch="true" AltFunc="P17" Point="I/O" /> @@ -1462,9 +1462,10 @@ </FUNC> <TAG> <GlobleUserTag> + <cg_crc_area Name="cg_crc_area" Value="00" /> <cg_security9 Name="cg_security9" Value="00" /> <cg_security7 Name="cg_security7" Value="00" /> - <pior_value7 Name="pior_value7" Value="02" /> + <pior_value4 Name="pior_value4" Value="00" /> <pior_value1 Name="pior_value1" Value="00" /> <cg_security5 Name="cg_security5" Value="00" /> <ocdstart Name="ocdstart" Value="07E00" /> @@ -1473,17 +1474,16 @@ <pior_value5 Name="pior_value5" Value="00" /> <cg_security1 Name="cg_security1" Value="00" /> <wdt_option Name="wdt_option" Value="F9" /> - <clock_option Name="clock_option" Value="F8" /> - <cg_security2 Name="cg_security2" Value="00" /> + <clock_option Name="clock_option" Value="E8" /> <cg_option Name="cg_option" Value="04" /> <cg_security8 Name="cg_security8" Value="00" /> <cg_security6 Name="cg_security6" Value="00" /> <pior_value0 Name="pior_value0" Value="00" /> <cg_security4 Name="cg_security4" Value="00" /> - <cg_crc_area Name="cg_crc_area" Value="00" /> + <cg_security2 Name="cg_security2" Value="00" /> <cg_iawctl_value Name="cg_iawctl_value" Value="00" /> <lvi_option Name="lvi_option" Value="FF" /> - <pior_value4 Name="pior_value4" Value="00" /> + <pior_value7 Name="pior_value7" Value="02" /> </GlobleUserTag> </TAG> </DIR> @@ -1537,7 +1537,7 @@ <setting name="MAIN_CLOCK_SELECT_HIGH_SYSTEM_CLOCK" value="false" /> <setting name="MAIN_CLOCK_SELECT_HIGH_INTERNAL_CLOCK" value="true" /> <setting name="INTERNAL_HIGH_CLOCK_OPERATION" value="true" /> - <setting name="INTERNAL_HIGH_CLOCK_FREQUENCY" value="8" /> + <setting name="INTERNAL_HIGH_CLOCK_FREQUENCY" value="6" /> <setting name="HIGH_SYSTEM_CLOCK_OPERATION" value="false" /> <setting name="HIGH_SYSTEM_CLOCK_SELECT_EXTERNAL_CLOCK" value="false" /> <setting name="HIGH_SYSTEM_CLOCK_SELECT_X1_CLOCK" value="true" /> @@ -1920,18 +1920,18 @@ <setting name="PSRSEL" value="false" /> </P12> <P13> - <setting name="MODULE_UNUSED" value="true" /> + <setting name="MODULE_UNUSED" value="false" /> <setting name="INPUT_MODE" value="false" /> - <setting name="OUTPUT_MODE" value="false" /> + <setting name="OUTPUT_MODE" value="true" /> <setting name="PULLUP_ON" value="false" /> <setting name="NCH_ON" value="false" /> - <setting name="OUTPUT_1" value="false" /> + <setting name="OUTPUT_1" value="true" /> <setting name="INPUT_BUFFER" value="0" /> <setting name="PSRSEL" value="false" /> </P13> <P14> - <setting name="MODULE_UNUSED" value="true" /> - <setting name="INPUT_MODE" value="false" /> + <setting name="MODULE_UNUSED" value="false" /> + <setting name="INPUT_MODE" value="true" /> <setting name="OUTPUT_MODE" value="false" /> <setting name="PULLUP_ON" value="false" /> <setting name="NCH_ON" value="false" /> diff --git a/BCZT/RLIN_driver/RLIN_driver.c b/BCZT/RLIN_driver/RLIN_driver.c index 2f97759..fd8cf90 100644 --- a/BCZT/RLIN_driver/RLIN_driver.c +++ b/BCZT/RLIN_driver/RLIN_driver.c @@ -256,7 +256,7 @@ void RLIN_Master_HeaderTransmit(uint8_t ID) break; case 0x01: RLIN_Master_Receive(8); /* ready for response transmit*/ break; - case 0x02: RLIN_Master_Receive(4); /* ready for response transmit*/ + case 0x21: RLIN_Master_Receive(2); /* ready for response transmit*/ break; case 0x8B: RLIN_Master_Receive(2); /* ready for response receive*/ break; diff --git a/BCZT/r_cg_adc.c b/BCZT/r_cg_adc.c index d086c1c..4bf5f54 100644 --- a/BCZT/r_cg_adc.c +++ b/BCZT/r_cg_adc.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for ADC module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_adc.h b/BCZT/r_cg_adc.h index 82000a2..247fabb 100644 --- a/BCZT/r_cg_adc.h +++ b/BCZT/r_cg_adc.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for ADC module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ #ifndef ADC_H diff --git a/BCZT/r_cg_adc_user.c b/BCZT/r_cg_adc_user.c index 420cd39..5fe7708 100644 --- a/BCZT/r_cg_adc_user.c +++ b/BCZT/r_cg_adc_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for ADC module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_cgc.c b/BCZT/r_cg_cgc.c index aa28fdd..3b1a347 100644 --- a/BCZT/r_cg_cgc.c +++ b/BCZT/r_cg_cgc.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for CGC module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** @@ -62,7 +62,7 @@ void R_CGC_Create(void) MSTOP = 1U; /* Set fMAIN */ MCM0 = 0U; - MDIV = _01_CGC_FMP_DIV_1; + MDIV = _00_CGC_FMP_DIV_DEFAULT; /* Set fMP to clock through mode */ SELPLL = 0U; /* Set fSUB */ diff --git a/BCZT/r_cg_cgc.h b/BCZT/r_cg_cgc.h index 1d6cf95..483e93d 100644 --- a/BCZT/r_cg_cgc.h +++ b/BCZT/r_cg_cgc.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for CGC module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ #ifndef CGC_H diff --git a/BCZT/r_cg_cgc_user.c b/BCZT/r_cg_cgc_user.c index 59fbeaa..ca36f50 100644 --- a/BCZT/r_cg_cgc_user.c +++ b/BCZT/r_cg_cgc_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for CGC module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_macrodriver.h b/BCZT/r_cg_macrodriver.h index 656c2a3..c2fd0b9 100644 --- a/BCZT/r_cg_macrodriver.h +++ b/BCZT/r_cg_macrodriver.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements general head file. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ #ifndef STATUS_H diff --git a/BCZT/r_cg_port.c b/BCZT/r_cg_port.c index cdc8681..b576134 100644 --- a/BCZT/r_cg_port.c +++ b/BCZT/r_cg_port.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for PORT module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** @@ -56,17 +56,17 @@ Global variables and functions void R_PORT_Create(void) { P0 = _00_Pn0_OUTPUT_0; - P1 = _00_Pn0_OUTPUT_0 | _00_Pn1_OUTPUT_0 | _00_Pn2_OUTPUT_0 | _00_Pn5_OUTPUT_0 | _00_Pn6_OUTPUT_0 | - _00_Pn7_OUTPUT_0; + P1 = _00_Pn0_OUTPUT_0 | _00_Pn1_OUTPUT_0 | _00_Pn2_OUTPUT_0 | _08_Pn3_OUTPUT_1 | _00_Pn5_OUTPUT_0 | + _00_Pn6_OUTPUT_0 | _00_Pn7_OUTPUT_0; P3 = _00_Pn1_OUTPUT_0 | _00_Pn2_OUTPUT_0; P7 = _00_Pn0_OUTPUT_0 | _00_Pn1_OUTPUT_0 | _00_Pn2_OUTPUT_0 | _00_Pn3_OUTPUT_0; P13 = _00_Pn0_OUTPUT_0; P14 = _00_Pn0_OUTPUT_0; - PSRSEL = _00_PSR140_NORMAL | _00_PSR12_NORMAL | _00_PSR10_NORMAL; + PSRSEL = _00_PSR140_NORMAL | _00_PSR14_NORMAL | _00_PSR12_NORMAL | _00_PSR10_NORMAL; ADPC = _05_ADPC_DI_ON; PM0 = _00_PMn0_MODE_OUTPUT | _FE_PM0_DEFAULT; - PM1 = _00_PMn0_MODE_OUTPUT | _00_PMn1_MODE_OUTPUT | _00_PMn2_MODE_OUTPUT | _08_PMn3_NOT_USE | _10_PMn4_NOT_USE | - _00_PMn5_MODE_OUTPUT | _00_PMn6_MODE_OUTPUT | _00_PMn7_MODE_OUTPUT; + PM1 = _00_PMn0_MODE_OUTPUT | _00_PMn1_MODE_OUTPUT | _00_PMn2_MODE_OUTPUT | _00_PMn3_MODE_OUTPUT | + _10_PMn4_MODE_INPUT | _00_PMn5_MODE_OUTPUT | _00_PMn6_MODE_OUTPUT | _00_PMn7_MODE_OUTPUT; PM3 = _01_PMn0_NOT_USE | _00_PMn1_MODE_OUTPUT | _00_PMn2_MODE_OUTPUT | _08_PMn3_NOT_USE | _10_PMn4_NOT_USE | _E0_PM3_DEFAULT; PM7 = _00_PMn0_MODE_OUTPUT | _00_PMn1_MODE_OUTPUT | _00_PMn2_MODE_OUTPUT | _00_PMn3_MODE_OUTPUT | _F0_PM7_DEFAULT; diff --git a/BCZT/r_cg_port.h b/BCZT/r_cg_port.h index 18850e8..c96b9f6 100644 --- a/BCZT/r_cg_port.h +++ b/BCZT/r_cg_port.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for PORT module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ #ifndef PORT_H diff --git a/BCZT/r_cg_port_user.c b/BCZT/r_cg_port_user.c index 113a6da..f082842 100644 --- a/BCZT/r_cg_port_user.c +++ b/BCZT/r_cg_port_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for PORT module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_timer.c b/BCZT/r_cg_timer.c index b169cbc..ca341f5 100644 --- a/BCZT/r_cg_timer.c +++ b/BCZT/r_cg_timer.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for TAU module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_timer.h b/BCZT/r_cg_timer.h index 03ac1a9..8f821df 100644 --- a/BCZT/r_cg_timer.h +++ b/BCZT/r_cg_timer.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for TAU module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ #ifndef TAU_H diff --git a/BCZT/r_cg_timer_user.c b/BCZT/r_cg_timer_user.c index 9878971..e0f9d2b 100644 --- a/BCZT/r_cg_timer_user.c +++ b/BCZT/r_cg_timer_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for TAU module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_userdefine.h b/BCZT/r_cg_userdefine.h index 226e2a4..3af661c 100644 --- a/BCZT/r_cg_userdefine.h +++ b/BCZT/r_cg_userdefine.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file includes user definition. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ #ifndef _USER_DEF_H diff --git a/BCZT/r_cg_wdt.c b/BCZT/r_cg_wdt.c index ce0a468..3e0604f 100644 --- a/BCZT/r_cg_wdt.c +++ b/BCZT/r_cg_wdt.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for WDT module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_wdt.h b/BCZT/r_cg_wdt.h index cce25ba..ed86b6c 100644 --- a/BCZT/r_cg_wdt.h +++ b/BCZT/r_cg_wdt.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for WDT module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ #ifndef WDT_H diff --git a/BCZT/r_cg_wdt_user.c b/BCZT/r_cg_wdt_user.c index 00ea261..cede0fe 100644 --- a/BCZT/r_cg_wdt_user.c +++ b/BCZT/r_cg_wdt_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements device driver for WDT module. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_main.c b/BCZT/r_main.c index d86885c..936ed32 100644 --- a/BCZT/r_main.c +++ b/BCZT/r_main.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements main function. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_systeminit.c b/BCZT/r_systeminit.c index 1fa33ac..bb5c674 100644 --- a/BCZT/r_systeminit.c +++ b/BCZT/r_systeminit.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGC * Tool-Chain : CCRL * Description : This file implements system initializing function. -* Creation Date: 2023-11-14 +* Creation Date: 2023-11-22 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/user/appTask.c b/BCZT/user/appTask.c index fe5edaf..ca5114c 100644 --- a/BCZT/user/appTask.c +++ b/BCZT/user/appTask.c @@ -16,6 +16,7 @@ #include "hwCtrl.h" #include "MotorCtrl.h" #include "RLIN_driver.h" +#include "r_cg_wdt.h" static uint8_t EEL_BUF[50]; @@ -69,12 +70,13 @@ void Apply_task(void) if (Timer_10ms_flag == 1) { Timer_10ms_flag = 0; - MotorCtrl(); + //MotorCtrl(); LIN_Task(); } if (Timer_20ms_flag == 1) { Timer_20ms_flag = 0; + R_WDT_Restart(); } if (Timer_50ms_flag == 1) { @@ -84,6 +86,8 @@ void Apply_task(void) if (Timer_1000ms_flag == 1) { Timer_1000ms_flag = 0; + //temp = !temp; + //MOTOR1Ctrl(temp); } } @@ -100,7 +104,7 @@ void LIN_Task(void) RLIN_Master_HeaderTransmit(0x01); break; case 2: - RLIN_Master_HeaderTransmit(0x02); + RLIN_Master_HeaderTransmit(0x21); break; default: lin_sch_count = 0; @@ -113,7 +117,7 @@ void LIN_Task(void) } } -unsigned char keybyte1,keybyte2; +unsigned char keybyte1,keybyte2,keybyte3; void LIN_Rx_Handle(uint8_t pid,uint8_t *data) { uint8_t id = pid & 0x3f; @@ -334,6 +338,7 @@ void value_init(void) R_ADC_Set_OperationOn(); R_TMR_RJ0_Start(); + OUT_LINEN = 1; RLIN_Master_Init(); MotorValueInit(); diff --git a/BCZT/user/hwCtrl.c b/BCZT/user/hwCtrl.c index 0a852f9..cc76aec 100644 --- a/BCZT/user/hwCtrl.c +++ b/BCZT/user/hwCtrl.c @@ -56,7 +56,7 @@ uint8_t getKeyReleaseFlag(uint8_t id) } -extern unsigned char keybyte1,keybyte2; +extern unsigned char keybyte1,keybyte2,keybyte3; void KeyScan(void) { uint8_t i,key,key_nopress; @@ -67,10 +67,14 @@ void KeyScan(void) { key = (keybyte1 & 0x01<