diff --git a/BCZT/BCZT.mtpj b/BCZT/BCZT.mtpj index 9403c83..7db45e3 100644 --- a/BCZT/BCZT.mtpj +++ b/BCZT/BCZT.mtpj @@ -1754,10 +1754,209 @@ DataFlash DisplayAll - True - 1 - 1.0 - 0 + 48,30,153,0,0 + 0 + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + Free,-,-,, + 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"> @@ -2764,6 +2963,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"> @@ -3232,209 +3432,9 @@ DataFlash </SOAP-ENV:Body> </SOAP-ENV:Envelope> - 48,30,153,0,0 - 0 - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - Free,-,-,, - 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:219:219,9:210:210,10:100:100 @@ -3442,11 +3442,8 @@ DataFlash 0:112:112,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:219:219,10:210:210,11:100:100 0:112:112,1:100:100,2:43:43,3:182:150 0:112:112,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:219:219,10:210:210 - - - 1 - 0 - False + True + 1 @@ -3809,7 +3806,7 @@ DataFlash </RTC1HZ> <RXD0 Name="RXD0" Text="disable" /> <ProjectName Name="PrjName" Text="BCZT" /> - <ProjectPath Name="PrjPath" Text="F:\FCB_project\temp\bczt_new\CODE\BCZT" /> + <ProjectPath Name="PrjPath" Text="E:\workspace\BCZT\new\BCZT_NEW\BCZT" /> <ProjectKind Name="PrjKind" Text="Project78K0R" /> <DeviceName Name="DeviceName" Fixed="" Text="RL78F13" /> <MCUName Name="MCUName" Text="RL78F13_48pin" /> @@ -3872,7 +3869,7 @@ DataFlash <PrjVersion Name="PrjVersion" Text="1.2.0.1" /> <ProductVersion Name="ProductVersion" Text="4.08.05.01" /> <TO02_PWM Name="TO02_PWM" Text="false" /> - <TO03_PWM Name="TO03_PWM" Text="true" /> + <TO03_PWM Name="TO03_PWM" Text="false" /> <Ch3UseTI03 Name="Ch3UseTI03" Text="false" /> <Ch4UseTI03 Name="Ch4UseTI03" Text="false" /> <Ch5UseTI03 Name="Ch5UseTI03" Text="false" /> @@ -3975,7 +3972,7 @@ DataFlash </Port3> <Port4 Chip="RL78F13_30pin,RL78F13_32pin,RL78F13_48pin" Pullup="true"> <P40 Name="P40/TOOL0" AltFunc="TOOL0" Point="I/O" /> - <P41 Name="P41/TI10/TO10/TRJIO0/VCOUT0/SNZOUT2" AltFunc="" Point="I/O" /> + <P41 Name="P41/TI10/TO10/TRJIO0/VCOUT0/SNZOUT2" AltFunc="P41" Point="I/O" /> </Port4> <Port6 Chip="RL78F13_32pin,RL78F13_48pin,RL78F13_64pin" Pullup="true"> <P60 Name="P60/_SCK00/SCL00" PITHL="true" Nch="true" AltFunc="" Point="I/O" /> @@ -4002,15 +3999,15 @@ DataFlash <Port9 Chip="RL78F13_48pin"> <P90 Name="P90/ANI10" AltFunc="P90" Point="I/O" /> <P91 Name="P91/ANI11" AltFunc="P91" Point="I/O" /> - <P92 Name="P92/ANI12" Chip="R5F10AGF,R5F10AGG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG" AltFunc="" Point="I/O" /> + <P92 Name="P92/ANI12" Chip="R5F10AGF,R5F10AGG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG" AltFunc="P92" Point="I/O" /> </Port9> <Port12 Chip="RL78F13_48pin,RL78F13_64pin"> - <P120 Name="P120/ANI25/TI07/TO07/TRDIOD0/SO01/INTP4" Chip="R5F10AGF,R5F10AGG,R5F10ALF,R5F10ALG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG,R5F10BLC,R5F10BLD,R5F10BLE,R5F10BLF,R5F10BLG" DIN="true" Nch="true" Pullup="true" AltFunc="TO07" Point="I/O" /> + <P120 Name="P120/ANI25/TI07/TO07/TRDIOD0/SO01/INTP4" Chip="R5F10AGF,R5F10AGG,R5F10ALF,R5F10ALG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG,R5F10BLC,R5F10BLD,R5F10BLE,R5F10BLF,R5F10BLG" DIN="true" Nch="true" Pullup="true" AltFunc="P120" Point="I/O" /> <P121 Name="P121/X1" AltFunc="" Point="I" /> <P122 Name="P122/X2/EXCLK" AltFunc="" Point="I" /> <P123 Name="P123/XT1" AltFunc="" Point="I" /> <P124 Name="P124/XT2/EXCLKS" AltFunc="" Point="I" /> - <P125 Name="P125/ANI24/TI03/TO03/TRDIOB0/_SSI01/INTP1/SNZOUT1" Chip="R5F10AGF,R5F10AGG,R5F10ALF,R5F10ALG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG,R5F10BLC,R5F10BLD,R5F10BLE,R5F10BLF,R5F10BLG" DIN="true" TTL="true" PITHL="true" Pullup="true" AltFunc="TO03" Point="I/O" /> + <P125 Name="P125/ANI24/TI03/TO03/TRDIOB0/_SSI01/INTP1/SNZOUT1" Chip="R5F10AGF,R5F10AGG,R5F10ALF,R5F10ALG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG,R5F10BLC,R5F10BLD,R5F10BLE,R5F10BLF,R5F10BLG" DIN="true" TTL="true" PITHL="true" Pullup="true" AltFunc="P125" Point="I/O" /> </Port12> <Port13 Chip="RL78F13_48pin,RL78F13_64pin,RL78F13_80pin"> <P130 Name="P130/RESOUT" AltFunc="P130" Point="O" /> @@ -5096,10 +5093,9 @@ 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_value4 Name="pior_value4" Value="00" /> + <pior_value7 Name="pior_value7" Value="02" /> <pior_value1 Name="pior_value1" Value="00" /> <cg_security5 Name="cg_security5" Value="00" /> <ocdstart Name="ocdstart" Value="17E00" /> @@ -5109,16 +5105,17 @@ DataFlash <cg_security1 Name="cg_security1" Value="00" /> <wdt_option Name="wdt_option" Value="E9" /> <clock_option Name="clock_option" Value="E8" /> + <cg_security2 Name="cg_security2" Value="00" /> <cg_option Name="cg_option" Value="84" /> <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_onchip Name="cg_onchip" Value="" /> - <cg_security2 Name="cg_security2" Value="00" /> + <cg_crc_area Name="cg_crc_area" Value="00" /> <cg_iawctl_value Name="cg_iawctl_value" Value="00" /> <lvi_option Name="lvi_option" Value="FF" /> - <pior_value7 Name="pior_value7" Value="02" /> + <pior_value4 Name="pior_value4" Value="00" /> </GlobleUserTag> </TAG> </DIR> @@ -5243,8 +5240,79 @@ DataFlash </CGC> <TAU0> <Channel0> - <setting name="ChannelFunction" value="10" /> + <setting name="ChannelFunction" value="7" /> <setting name="Pinselection" value="-1" /> + <TAUPWMMaster0> + <PWMMaster0> + <setting name="Value_scale" value="1" /> + <setting name="PWM_cycle" value="100" /> + <setting name="Master_interrupt_priority" value="3" /> + <setting name="Master_interrupt" value="unused" /> + </PWMMaster0> + <PWMSlave1> + <setting name="PWM_duty" value="0" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="unused" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave1> + <PWMSlave2> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave2> + <PWMSlave3> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave3> + <PWMSlave4> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave4> + <PWMSlave5> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave5> + <PWMSlave6> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave6> + <PWMSlave7> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave7> + </TAUPWMMaster0> <TAUMultiPWMMaster0> <PWMMaster0> <setting name="Value_scale" value="1" /> @@ -5316,80 +5384,9 @@ DataFlash <setting name="TauPWMSlave cbPSRSEL" value="false" /> </PWMSlave7> </TAUMultiPWMMaster0> - <TAUPWMMaster0> - <PWMMaster0> - <setting name="Value_scale" value="1" /> - <setting name="PWM_cycle" value="100" /> - <setting name="Master_interrupt_priority" value="3" /> - <setting name="Master_interrupt" value="used" /> - </PWMMaster0> - <PWMSlave1> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave1> - <PWMSlave2> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave2> - <PWMSlave3> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave3> - <PWMSlave4> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave4> - <PWMSlave5> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave5> - <PWMSlave6> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave6> - <PWMSlave7> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave7> - </TAUPWMMaster0> </Channel0> <Channel1> - <setting name="ChannelFunction" value="9" /> + <setting name="ChannelFunction" value="8" /> <setting name="Pinselection" value="-1" /> </Channel1> <Channel2> @@ -5413,7 +5410,7 @@ DataFlash </TAUInterval2> </Channel2> <Channel3> - <setting name="ChannelFunction" value="9" /> + <setting name="ChannelFunction" value="0" /> <setting name="Pinselection" value="-1" /> </Channel3> <Channel4> @@ -5429,7 +5426,7 @@ DataFlash <setting name="Pinselection" value="-1" /> </Channel6> <Channel7> - <setting name="ChannelFunction" value="9" /> + <setting name="ChannelFunction" value="0" /> <setting name="Pinselection" value="-1" /> </Channel7> </TAU0> @@ -5675,9 +5672,9 @@ DataFlash <setting name="PSRSEL" value="false" /> </P40> <P41> - <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" /> @@ -5873,9 +5870,9 @@ DataFlash <setting name="PSRSEL" value="false" /> </P91> <P92> - <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" /> @@ -5885,8 +5882,8 @@ DataFlash </PortP9> <PortP12> <P120> - <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" /> @@ -5935,8 +5932,8 @@ DataFlash <setting name="PSRSEL" value="false" /> </P124> <P125> - <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" /> @@ -6087,9 +6084,9 @@ DataFlash <setting name="ADC_ONESHOT_SELECT_MODE" value="true" /> <setting name="ADC_CONTINUOUS_SCAN_MODE" value="false" /> <setting name="ADC_ONESHOT_SCAN_MODE" value="false" /> - <setting name="ADC_ANALOG_INPUT_SELECTION" value="8" /> - <setting name="ANALOG_INPUT_24" value="true" /> - <setting name="ANALOG_INPUT_25" value="true" /> + <setting name="ADC_ANALOG_INPUT_SELECTION" value="9" /> + <setting name="ANALOG_INPUT_24" value="false" /> + <setting name="ANALOG_INPUT_25" value="false" /> <setting name="ANALOG_INPUT_26" value="true" /> <setting name="ADC_CONVERSION_MODE" value="0" /> <setting name="ADC_CONVERSION_TIME" value="0" /> diff --git a/BCZT/BCZT.rcpe b/BCZT/BCZT.rcpe index 2d65bd9..c18630d 100644 --- a/BCZT/BCZT.rcpe +++ b/BCZT/BCZT.rcpe @@ -354,7 +354,7 @@ </RTC1HZ> <RXD0 Name="RXD0" Text="disable" /> <ProjectName Name="PrjName" Text="BCZT" /> - <ProjectPath Name="PrjPath" Text="F:\FCB_project\temp\bczt_new\CODE\BCZT" /> + <ProjectPath Name="PrjPath" Text="E:\workspace\BCZT\new\BCZT_NEW\BCZT" /> <ProjectKind Name="PrjKind" Text="Project78K0R" /> <DeviceName Name="DeviceName" Fixed="" Text="RL78F13" /> <MCUName Name="MCUName" Text="RL78F13_48pin" /> @@ -417,7 +417,7 @@ <PrjVersion Name="PrjVersion" Text="1.2.0.1" /> <ProductVersion Name="ProductVersion" Text="4.08.05.01" /> <TO02_PWM Name="TO02_PWM" Text="false" /> - <TO03_PWM Name="TO03_PWM" Text="true" /> + <TO03_PWM Name="TO03_PWM" Text="false" /> <Ch3UseTI03 Name="Ch3UseTI03" Text="false" /> <Ch4UseTI03 Name="Ch4UseTI03" Text="false" /> <Ch5UseTI03 Name="Ch5UseTI03" Text="false" /> @@ -520,7 +520,7 @@ </Port3> <Port4 Chip="RL78F13_30pin,RL78F13_32pin,RL78F13_48pin" Pullup="true"> <P40 Name="P40/TOOL0" AltFunc="TOOL0" Point="I/O" /> - <P41 Name="P41/TI10/TO10/TRJIO0/VCOUT0/SNZOUT2" AltFunc="" Point="I/O" /> + <P41 Name="P41/TI10/TO10/TRJIO0/VCOUT0/SNZOUT2" AltFunc="P41" Point="I/O" /> </Port4> <Port6 Chip="RL78F13_32pin,RL78F13_48pin,RL78F13_64pin" Pullup="true"> <P60 Name="P60/_SCK00/SCL00" PITHL="true" Nch="true" AltFunc="" Point="I/O" /> @@ -547,15 +547,15 @@ <Port9 Chip="RL78F13_48pin"> <P90 Name="P90/ANI10" AltFunc="P90" Point="I/O" /> <P91 Name="P91/ANI11" AltFunc="P91" Point="I/O" /> - <P92 Name="P92/ANI12" Chip="R5F10AGF,R5F10AGG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG" AltFunc="" Point="I/O" /> + <P92 Name="P92/ANI12" Chip="R5F10AGF,R5F10AGG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG" AltFunc="P92" Point="I/O" /> </Port9> <Port12 Chip="RL78F13_48pin,RL78F13_64pin"> - <P120 Name="P120/ANI25/TI07/TO07/TRDIOD0/SO01/INTP4" Chip="R5F10AGF,R5F10AGG,R5F10ALF,R5F10ALG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG,R5F10BLC,R5F10BLD,R5F10BLE,R5F10BLF,R5F10BLG" DIN="true" Nch="true" Pullup="true" AltFunc="TO07" Point="I/O" /> + <P120 Name="P120/ANI25/TI07/TO07/TRDIOD0/SO01/INTP4" Chip="R5F10AGF,R5F10AGG,R5F10ALF,R5F10ALG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG,R5F10BLC,R5F10BLD,R5F10BLE,R5F10BLF,R5F10BLG" DIN="true" Nch="true" Pullup="true" AltFunc="P120" Point="I/O" /> <P121 Name="P121/X1" AltFunc="" Point="I" /> <P122 Name="P122/X2/EXCLK" AltFunc="" Point="I" /> <P123 Name="P123/XT1" AltFunc="" Point="I" /> <P124 Name="P124/XT2/EXCLKS" AltFunc="" Point="I" /> - <P125 Name="P125/ANI24/TI03/TO03/TRDIOB0/_SSI01/INTP1/SNZOUT1" Chip="R5F10AGF,R5F10AGG,R5F10ALF,R5F10ALG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG,R5F10BLC,R5F10BLD,R5F10BLE,R5F10BLF,R5F10BLG" DIN="true" TTL="true" PITHL="true" Pullup="true" AltFunc="TO03" Point="I/O" /> + <P125 Name="P125/ANI24/TI03/TO03/TRDIOB0/_SSI01/INTP1/SNZOUT1" Chip="R5F10AGF,R5F10AGG,R5F10ALF,R5F10ALG,R5F10BGC,R5F10BGD,R5F10BGE,R5F10BGF,R5F10BGG,R5F10BLC,R5F10BLD,R5F10BLE,R5F10BLF,R5F10BLG" DIN="true" TTL="true" PITHL="true" Pullup="true" AltFunc="P125" Point="I/O" /> </Port12> <Port13 Chip="RL78F13_48pin,RL78F13_64pin,RL78F13_80pin"> <P130 Name="P130/RESOUT" AltFunc="P130" Point="O" /> @@ -1641,10 +1641,9 @@ </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_value4 Name="pior_value4" Value="00" /> + <pior_value7 Name="pior_value7" Value="02" /> <pior_value1 Name="pior_value1" Value="00" /> <cg_security5 Name="cg_security5" Value="00" /> <ocdstart Name="ocdstart" Value="17E00" /> @@ -1654,16 +1653,17 @@ <cg_security1 Name="cg_security1" Value="00" /> <wdt_option Name="wdt_option" Value="E9" /> <clock_option Name="clock_option" Value="E8" /> + <cg_security2 Name="cg_security2" Value="00" /> <cg_option Name="cg_option" Value="84" /> <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_onchip Name="cg_onchip" Value="" /> - <cg_security2 Name="cg_security2" Value="00" /> + <cg_crc_area Name="cg_crc_area" Value="00" /> <cg_iawctl_value Name="cg_iawctl_value" Value="00" /> <lvi_option Name="lvi_option" Value="FF" /> - <pior_value7 Name="pior_value7" Value="02" /> + <pior_value4 Name="pior_value4" Value="00" /> </GlobleUserTag> </TAG> </DIR> @@ -1788,8 +1788,79 @@ </CGC> <TAU0> <Channel0> - <setting name="ChannelFunction" value="10" /> + <setting name="ChannelFunction" value="7" /> <setting name="Pinselection" value="-1" /> + <TAUPWMMaster0> + <PWMMaster0> + <setting name="Value_scale" value="1" /> + <setting name="PWM_cycle" value="100" /> + <setting name="Master_interrupt_priority" value="3" /> + <setting name="Master_interrupt" value="unused" /> + </PWMMaster0> + <PWMSlave1> + <setting name="PWM_duty" value="0" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="unused" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave1> + <PWMSlave2> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave2> + <PWMSlave3> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave3> + <PWMSlave4> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave4> + <PWMSlave5> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave5> + <PWMSlave6> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave6> + <PWMSlave7> + <setting name="PWM_duty" value="50" /> + <setting name="OuputLevel" value="0" /> + <setting name="OuputValue" value="0" /> + <setting name="Slave_interrupt_priority" value="3" /> + <setting name="Slave_interrupt" value="used" /> + <setting name="OuputTime" value="0" /> + <setting name="TauPWMSlave cbPSRSEL" value="false" /> + </PWMSlave7> + </TAUPWMMaster0> <TAUMultiPWMMaster0> <PWMMaster0> <setting name="Value_scale" value="1" /> @@ -1861,80 +1932,9 @@ <setting name="TauPWMSlave cbPSRSEL" value="false" /> </PWMSlave7> </TAUMultiPWMMaster0> - <TAUPWMMaster0> - <PWMMaster0> - <setting name="Value_scale" value="1" /> - <setting name="PWM_cycle" value="100" /> - <setting name="Master_interrupt_priority" value="3" /> - <setting name="Master_interrupt" value="used" /> - </PWMMaster0> - <PWMSlave1> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave1> - <PWMSlave2> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave2> - <PWMSlave3> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave3> - <PWMSlave4> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave4> - <PWMSlave5> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave5> - <PWMSlave6> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave6> - <PWMSlave7> - <setting name="PWM_duty" value="50" /> - <setting name="OuputLevel" value="0" /> - <setting name="OuputValue" value="0" /> - <setting name="Slave_interrupt_priority" value="3" /> - <setting name="Slave_interrupt" value="used" /> - <setting name="OuputTime" value="0" /> - <setting name="TauPWMSlave cbPSRSEL" value="false" /> - </PWMSlave7> - </TAUPWMMaster0> </Channel0> <Channel1> - <setting name="ChannelFunction" value="9" /> + <setting name="ChannelFunction" value="8" /> <setting name="Pinselection" value="-1" /> </Channel1> <Channel2> @@ -1958,7 +1958,7 @@ </TAUInterval2> </Channel2> <Channel3> - <setting name="ChannelFunction" value="9" /> + <setting name="ChannelFunction" value="0" /> <setting name="Pinselection" value="-1" /> </Channel3> <Channel4> @@ -1974,7 +1974,7 @@ <setting name="Pinselection" value="-1" /> </Channel6> <Channel7> - <setting name="ChannelFunction" value="9" /> + <setting name="ChannelFunction" value="0" /> <setting name="Pinselection" value="-1" /> </Channel7> </TAU0> @@ -2220,9 +2220,9 @@ <setting name="PSRSEL" value="false" /> </P40> <P41> - <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" /> @@ -2418,9 +2418,9 @@ <setting name="PSRSEL" value="false" /> </P91> <P92> - <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" /> @@ -2430,8 +2430,8 @@ </PortP9> <PortP12> <P120> - <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" /> @@ -2480,8 +2480,8 @@ <setting name="PSRSEL" value="false" /> </P124> <P125> - <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" /> @@ -2632,9 +2632,9 @@ <setting name="ADC_ONESHOT_SELECT_MODE" value="true" /> <setting name="ADC_CONTINUOUS_SCAN_MODE" value="false" /> <setting name="ADC_ONESHOT_SCAN_MODE" value="false" /> - <setting name="ADC_ANALOG_INPUT_SELECTION" value="8" /> - <setting name="ANALOG_INPUT_24" value="true" /> - <setting name="ANALOG_INPUT_25" value="true" /> + <setting name="ADC_ANALOG_INPUT_SELECTION" value="9" /> + <setting name="ANALOG_INPUT_24" value="false" /> + <setting name="ANALOG_INPUT_25" value="false" /> <setting name="ANALOG_INPUT_26" value="true" /> <setting name="ADC_CONVERSION_MODE" value="0" /> <setting name="ADC_CONVERSION_TIME" value="0" /> diff --git a/BCZT/RLIN_driver/RLIN_driver.c b/BCZT/RLIN_driver/RLIN_driver.c index 0ce40b4..a1e17c7 100644 --- a/BCZT/RLIN_driver/RLIN_driver.c +++ b/BCZT/RLIN_driver/RLIN_driver.c @@ -252,7 +252,7 @@ void RLIN_Master_HeaderTransmit(uint8_t ID) switch(ID) { - case 0x80: RLIN_Master_Transmit(Master_TxData1,2); /* ready for response transmit*/ + case 0x80: RLIN_Master_Transmit(Master_TxData1,8); /* ready for response transmit*/ break; case 0x99: RLIN_Master_Receive(8); /* ready for response transmit*/ break; diff --git a/BCZT/r_cg_adc.c b/BCZT/r_cg_adc.c index 0454862..5a7204c 100644 --- a/BCZT/r_cg_adc.c +++ b/BCZT/r_cg_adc.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for ADC module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_adc.h b/BCZT/r_cg_adc.h index 86f086b..0728d73 100644 --- a/BCZT/r_cg_adc.h +++ b/BCZT/r_cg_adc.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for ADC module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ #ifndef ADC_H diff --git a/BCZT/r_cg_adc_user.c b/BCZT/r_cg_adc_user.c index bba3e76..8139009 100644 --- a/BCZT/r_cg_adc_user.c +++ b/BCZT/r_cg_adc_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for ADC module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_cgc.c b/BCZT/r_cg_cgc.c index ef36369..82e713f 100644 --- a/BCZT/r_cg_cgc.c +++ b/BCZT/r_cg_cgc.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for CGC module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_cgc.h b/BCZT/r_cg_cgc.h index 6a94524..a7b0140 100644 --- a/BCZT/r_cg_cgc.h +++ b/BCZT/r_cg_cgc.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for CGC module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ #ifndef CGC_H diff --git a/BCZT/r_cg_cgc_user.c b/BCZT/r_cg_cgc_user.c index b3eff47..d9eb8cf 100644 --- a/BCZT/r_cg_cgc_user.c +++ b/BCZT/r_cg_cgc_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for CGC module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_macrodriver.h b/BCZT/r_cg_macrodriver.h index bb7a1da..e5a7630 100644 --- a/BCZT/r_cg_macrodriver.h +++ b/BCZT/r_cg_macrodriver.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements general head file. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ #ifndef STATUS_H diff --git a/BCZT/r_cg_port.c b/BCZT/r_cg_port.c index 419b455..1e5b367 100644 --- a/BCZT/r_cg_port.c +++ b/BCZT/r_cg_port.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for PORT module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** @@ -59,20 +59,25 @@ void R_PORT_Create(void) 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; + P4 = _00_Pn1_OUTPUT_0; P7 = _00_Pn0_OUTPUT_0 | _00_Pn1_OUTPUT_0 | _00_Pn2_OUTPUT_0 | _00_Pn3_OUTPUT_0; + P9 = _00_Pn2_OUTPUT_0; P13 = _00_Pn0_OUTPUT_0; P14 = _00_Pn0_OUTPUT_0; - PSRSEL = _00_PSR140_NORMAL | _00_PSR14_NORMAL | _00_PSR12_NORMAL | _00_PSR10_NORMAL; + PMC12 = _00_PMCn0_DI_ON | _00_PMCn5_DI_ON | _DE_PMC12_DEFAULT; + PSRSEL = _00_PSR140_NORMAL | _00_PSR14_NORMAL | _00_PSR120_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 | _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; + PM4 = _01_PMn0_NOT_USE | _00_PMn1_MODE_OUTPUT | _FC_PM4_DEFAULT; PM7 = _00_PMn0_MODE_OUTPUT | _00_PMn1_MODE_OUTPUT | _00_PMn2_MODE_OUTPUT | _00_PMn3_MODE_OUTPUT | _F0_PM7_DEFAULT; PM8 = _01_PMn0_NOT_USE | _02_PMn1_NOT_USE | _04_PMn2_MODE_INPUT | _08_PMn3_MODE_INPUT | _10_PMn4_MODE_INPUT | _20_PMn5_MODE_INPUT | _40_PMn6_NOT_USE | _80_PMn7_NOT_USE; - PM9 = _01_PMn0_MODE_INPUT | _02_PMn1_MODE_INPUT | _04_PMn2_NOT_USE | _F8_PM9_DEFAULT; + PM9 = _01_PMn0_MODE_INPUT | _02_PMn1_MODE_INPUT | _00_PMn2_MODE_OUTPUT | _F8_PM9_DEFAULT; + PM12 = _01_PMn0_MODE_INPUT | _20_PMn5_MODE_INPUT | _DE_PM12_DEFAULT; PM14 = _00_PMn0_MODE_OUTPUT | _FE_PM14_DEFAULT; } diff --git a/BCZT/r_cg_port.h b/BCZT/r_cg_port.h index f0f54cf..a4cd8e5 100644 --- a/BCZT/r_cg_port.h +++ b/BCZT/r_cg_port.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for PORT module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ #ifndef PORT_H diff --git a/BCZT/r_cg_port_user.c b/BCZT/r_cg_port_user.c index cff7647..176b388 100644 --- a/BCZT/r_cg_port_user.c +++ b/BCZT/r_cg_port_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for PORT module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_timer.c b/BCZT/r_cg_timer.c index 70b7606..e183bc9 100644 --- a/BCZT/r_cg_timer.c +++ b/BCZT/r_cg_timer.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for TAU module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** @@ -99,7 +99,7 @@ void R_TAU0_Create(void) /* Channel 0 is used as master channel for PWM output function */ TMR00 = _0000_TAU_CLOCK_SELECT_CKM0 | _0000_TAU_CLOCK_MODE_CKS | _0000_TAU_TRIGGER_SOFTWARE | _0001_TAU_MODE_PWM_MASTER; - TDR00 = _3E7F_TAU_TDR00_VALUE; + TDR00 = _0C7F_TAU_TDR00_VALUE; TO0 &= ~_0001_TAU_CH0_OUTPUT_VALUE_1; TOE0 &= ~_0001_TAU_CH0_OUTPUT_ENABLE; /* Channel 1 is used as slave channel for PWM output function */ @@ -111,24 +111,6 @@ void R_TAU0_Create(void) TO0 &= ~_0002_TAU_CH1_OUTPUT_VALUE_1; PWMDLY1 |= _0000_TO01_OUTPUT_DELAY_0; TOE0 |= _0002_TAU_CH1_OUTPUT_ENABLE; - /* Channel 3 is used as slave channel for PWM output function */ - TMR03 = _0000_TAU_CLOCK_SELECT_CKM0 | _0000_TAU_CLOCK_MODE_CKS | _0000_TAU_COMBINATION_SLAVE | - _0400_TAU_TRIGGER_MASTER_INT | _0009_TAU_MODE_PWM_SLAVE; - TDR03 = _0000_TAU_TDR03_VALUE; - TOM0 |= _0008_TAU_CH3_OUTPUT_COMBIN; - TOL0 &= ~_0008_TAU_CH3_OUTPUT_LEVEL_L; - TO0 &= ~_0008_TAU_CH3_OUTPUT_VALUE_1; - PWMDLY1 |= _0000_TO03_OUTPUT_DELAY_0; - TOE0 |= _0008_TAU_CH3_OUTPUT_ENABLE; - /* Channel 7 is used as slave channel for PWM output function */ - TMR07 = _0000_TAU_CLOCK_SELECT_CKM0 | _0000_TAU_CLOCK_MODE_CKS | _0000_TAU_COMBINATION_SLAVE | - _0400_TAU_TRIGGER_MASTER_INT | _0009_TAU_MODE_PWM_SLAVE; - TDR07 = _0000_TAU_TDR07_VALUE; - TOM0 |= _0080_TAU_CH7_OUTPUT_COMBIN; - TOL0 &= ~_0080_TAU_CH7_OUTPUT_LEVEL_L; - TO0 &= ~_0080_TAU_CH7_OUTPUT_VALUE_1; - PWMDLY1 |= _0000_TO07_OUTPUT_DELAY_0; - TOE0 |= _0080_TAU_CH7_OUTPUT_ENABLE; /* Channel 2 used as interval timer */ TMR02 = _0000_TAU_CLOCK_SELECT_CKM0 | _0000_TAU_CLOCK_MODE_CKS | _0000_TAU_COMBINATION_SLAVE | _0000_TAU_TRIGGER_SOFTWARE | _0000_TAU_MODE_INTERVAL_TIMER | _0000_TAU_START_INT_UNUSED; @@ -140,13 +122,6 @@ void R_TAU0_Create(void) /* Set TO01 pin */ P3 &= 0xFEU; PM3 &= 0xFEU; - /* Set TO03 pin */ - P12 &= 0xDFU; - PM12 &= 0xDFU; - /* Set TO07 pin */ - POM12 &= 0xFEU; - P12 &= 0xFEU; - PM12 &= 0xFEU; } /*********************************************************************************************************************** @@ -157,9 +132,8 @@ void R_TAU0_Create(void) ***********************************************************************************************************************/ void R_TAU0_Channel0_Start(void) { - TOE0 |= _0002_TAU_CH1_OUTPUT_ENABLE | _0008_TAU_CH3_OUTPUT_ENABLE | _0080_TAU_CH7_OUTPUT_ENABLE; - TS0 |= _0001_TAU_CH0_START_TRG_ON | _0002_TAU_CH1_START_TRG_ON | _0008_TAU_CH3_START_TRG_ON | - _0080_TAU_CH7_START_TRG_ON; + TOE0 |= _0002_TAU_CH1_OUTPUT_ENABLE; + TS0 |= _0001_TAU_CH0_START_TRG_ON | _0002_TAU_CH1_START_TRG_ON; } /*********************************************************************************************************************** @@ -170,9 +144,8 @@ void R_TAU0_Channel0_Start(void) ***********************************************************************************************************************/ void R_TAU0_Channel0_Stop(void) { - TT0 |= _0001_TAU_CH0_STOP_TRG_ON | _0002_TAU_CH1_STOP_TRG_ON | _0008_TAU_CH3_STOP_TRG_ON | - _0080_TAU_CH7_STOP_TRG_ON; - TOE0 &= ~_0002_TAU_CH1_OUTPUT_ENABLE & ~_0008_TAU_CH3_OUTPUT_ENABLE & ~_0080_TAU_CH7_OUTPUT_ENABLE; + TT0 |= _0001_TAU_CH0_STOP_TRG_ON | _0002_TAU_CH1_STOP_TRG_ON; + TOE0 &= ~_0002_TAU_CH1_OUTPUT_ENABLE; } /*********************************************************************************************************************** diff --git a/BCZT/r_cg_timer.h b/BCZT/r_cg_timer.h index b36a117..74e056d 100644 --- a/BCZT/r_cg_timer.h +++ b/BCZT/r_cg_timer.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for TAU module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ #ifndef TAU_H @@ -997,21 +997,13 @@ Macro definitions (Register bit) Macro definitions ***********************************************************************************************************************/ /* 16-bit timer data register 00 (TDR00) */ -#define _3E7F_TAU_TDR00_VALUE (0x3E7FU) +#define _0C7F_TAU_TDR00_VALUE (0x0C7FU) /* 16-bit timer data register 01 (TDR01) */ #define _0000_TAU_TDR01_VALUE (0x0000U) -/* 16-bit timer data register 03 (TDR03) */ -#define _0000_TAU_TDR03_VALUE (0x0000U) -/* 16-bit timer data register 07 (TDR07) */ -#define _0000_TAU_TDR07_VALUE (0x0000U) /* Clock divisor for TAU0 channel 0 */ #define _0001_TAU0_CHANNEL0_DIVISOR (0x0001U) /* Clock divisor for TAU0 channel 1 */ #define _0001_TAU0_CHANNEL1_DIVISOR (0x0001U) -/* Clock divisor for TAU0 channel 3 */ -#define _0001_TAU0_CHANNEL3_DIVISOR (0x0001U) -/* Clock divisor for TAU0 channel 7 */ -#define _0001_TAU0_CHANNEL7_DIVISOR (0x0001U) /* 16-bit timer data register 02 (TDR02) */ #define _7CFF_TAU_TDR02_VALUE (0x7CFFU) /* Clock divisor for TAU0 channel 2 */ diff --git a/BCZT/r_cg_timer_user.c b/BCZT/r_cg_timer_user.c index 0574484..3c3185a 100644 --- a/BCZT/r_cg_timer_user.c +++ b/BCZT/r_cg_timer_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements device driver for TAU module. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_cg_userdefine.h b/BCZT/r_cg_userdefine.h index 2a83077..6be174b 100644 --- a/BCZT/r_cg_userdefine.h +++ b/BCZT/r_cg_userdefine.h @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file includes user definition. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ #ifndef _USER_DEF_H diff --git a/BCZT/r_main.c b/BCZT/r_main.c index c2e69a5..e2035c1 100644 --- a/BCZT/r_main.c +++ b/BCZT/r_main.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements main function. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/r_systeminit.c b/BCZT/r_systeminit.c index fe25a86..2f47f7f 100644 --- a/BCZT/r_systeminit.c +++ b/BCZT/r_systeminit.c @@ -23,7 +23,7 @@ * Device(s) : R5F10AGF * Tool-Chain : CCRL * Description : This file implements system initializing function. -* Creation Date: 2023-11-24 +* Creation Date: 2023/11/26 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/BCZT/user/MotorCtrl.c b/BCZT/user/MotorCtrl.c index b172af8..e696af7 100644 --- a/BCZT/user/MotorCtrl.c +++ b/BCZT/user/MotorCtrl.c @@ -790,11 +790,11 @@ void CurrentDetecte(void) static uint16_t OC_Count1=0,OC_Count2=0,OC_Count3 = 0; - current1 = getAdval(ADCH_RLY3); + current1 = getAdval(ADCH_RLY1); current2 = getAdval(ADCH_RLY2); - current3 = getAdval(ADCH_RLY1); + current3 = getAdval(ADCH_RLY3); - if (current1 > 100U && OC1flag == 0) + if (current1 > 60U && OC1flag == 0) { OC_Count1++; if (OC_Count1 >= 100) @@ -808,7 +808,7 @@ void CurrentDetecte(void) OC_Count1 = 0; } - if (current2 > 100U && OC2flag == 0) + if (current2 > 60U && OC2flag == 0) { OC_Count2++; if (OC_Count2 >= 100) @@ -823,7 +823,7 @@ void CurrentDetecte(void) OC_Count2 = 0; } - if (current3 > 100U && OC3flag == 0) + if (current3 > 60U && OC3flag == 0) { OC_Count3++; if (OC_Count3 >= 100) diff --git a/BCZT/user/PINdef.h b/BCZT/user/PINdef.h index 7665fb9..a1a1e7e 100644 --- a/BCZT/user/PINdef.h +++ b/BCZT/user/PINdef.h @@ -18,7 +18,7 @@ #define IN_HALL2 P9_bit.no0 #define IN_HALL3 P8_bit.no4 #define IN_HALL4 P8_bit.no5 -#define IN_HALL5 P8_bit.no5 +#define IN_HALL5 P8_bit.no2 #define IN_HALL6 P8_bit.no3 #define OUT_RLY1P P14_bit.no0 @@ -35,6 +35,10 @@ #define OUT_RLY6N P1_bit.no5 #define OUT_LINEN P1_bit.no2 #define LIN_TXD P1_bit.no3 +#define OUT_JR1 P9_bit.no2 +#define OUT_JR2 P4_bit.no1 +#define OUT_LOCK1 P1_bit.no1 +#define OUT_LOCK2 P1_bit.no0 #define ADCH_RLY3 0 #define ADCH_RLY2 1 diff --git a/BCZT/user/appTask.c b/BCZT/user/appTask.c index a06b41c..e10884b 100644 --- a/BCZT/user/appTask.c +++ b/BCZT/user/appTask.c @@ -42,6 +42,8 @@ void MotorCtrl(void); void HallDetecte(void); void LIN_Task(void); void TfJr_CtrlTask(void); +void JrTask(void); +void Lock_Ctrl(void); extern uint8_t OC1flag,OC2flag,OC3flag; uint8_t TfState,JrState; unsigned char keybyte1,keybyte2,keybyte3; @@ -56,6 +58,7 @@ void Apply_task(void) KeyScan(); HallDetecte(); CurrentDetecte(); + JrTask(); if (EEL_SAVE_CNT_DOWN_TIMER > 0) { EEL_SAVE_CNT_DOWN_TIMER--; @@ -64,7 +67,6 @@ void Apply_task(void) if (Timer_5ms_flag == 1) { Timer_5ms_flag = 0; - KeyPro(); } @@ -83,6 +85,7 @@ void Apply_task(void) { Timer_50ms_flag = 0; TfJr_CtrlTask(); + Lock_Ctrl(); } if (Timer_1000ms_flag == 1) { @@ -92,7 +95,9 @@ void Apply_task(void) } } +extern uint16_t MotorHallLoc[6],MotorHardStop1[6],MotorHardStop2[6]; extern uint8_t Master_TxData1[]; +extern uint16_t current1,current2,current3; void LIN_Task(void) { static uint8_t lin_sch_count=0; @@ -101,6 +106,13 @@ void LIN_Task(void) case 0: Master_TxData1[0] = (JrState<<4)|(TfState<<6); Master_TxData1[1] = keybyte3; + + Master_TxData1[3] = current1; + Master_TxData1[4] = current2; + Master_TxData1[5] = current3; + + //Master_TxData1[6] = MotorHallLoc[2]>>8; + //Master_TxData1[7] = MotorHallLoc[2]; RLIN_Master_HeaderTransmit(0x80); break; case 1: @@ -421,5 +433,83 @@ void TfJr_CtrlTask(void) } +void JrTask(void) +{ + static uint16_t count; + uint16_t duty; + if (JrState == 0) + { + OUT_JR1 = 0; + OUT_JR2 = 0; + count = 0; + } + else + { + duty = TfDutyTable[JrState] * 10; + } + count++; + if (count >= 1000) + { + count = 0; + } + + if (count >= duty) + { + OUT_JR1 = 0; + OUT_JR2 = 0; + } + else + { + OUT_JR1 = 1; + OUT_JR2 = 1; + } + + +} +#define LOCK_OUT_TIME 80 +void Lock_Ctrl(void)//50ms +{ + uint8_t key1,key2; + static uint8_t count; + key1 = GetKeyState(KEYID_K2); + key2 = GetKeyState(KEYID_K1); + if (key1 == 1 && key2 == 0) + { + + if (count < LOCK_OUT_TIME) + { + count++; + OUT_LOCK1 = 1; + OUT_LOCK2 = 0; + } + else + { + OUT_LOCK1 = 0; + OUT_LOCK2 = 0; + } + + } + else if (key1 == 0 && key2 == 1) + { + if (count < LOCK_OUT_TIME) + { + count++; + OUT_LOCK1 = 0; + OUT_LOCK2 = 1; + } + else + { + OUT_LOCK1 = 0; + OUT_LOCK2 = 0; + } + } + else + { + OUT_LOCK1 = 0; + OUT_LOCK2 = 0; + count = 0; + } +} + diff --git a/BCZT/user/hwCtrl.c b/BCZT/user/hwCtrl.c index ee50548..77853e4 100644 --- a/BCZT/user/hwCtrl.c +++ b/BCZT/user/hwCtrl.c @@ -8,7 +8,7 @@ static uint8_t keystate[KEY_NUM] = {0,0,0,0,0,0}; static uint8_t keyPressFlag[KEY_NUM] = {0,0,0,0,0,0}; static uint8_t keyReleaseFlag[KEY_NUM] = {0,0,0,0,0,0}; static uint16_t keydelay[KEY_NUM] = {0,0,0,0,0,0}; -extern uint16_t g_adval[3]; +extern uint16_t g_adval[]; #define KEY_DELAY_TIMES 20 //20Ms void ClearKeyState(void) @@ -129,7 +129,7 @@ uint8_t GetIOState(uint8_t keyno) uint8_t GetKeyState(uint8_t keyno) { - if (keyno > 0 && keyno <= 16) + if (keyno > 0 && keyno <= KEY_NUM) { return keystate[keyno-1]; } diff --git a/BCZT_PANEL/OUTPUT/lin_test.hex b/BCZT_PANEL/OUTPUT/lin_test.hex index 288c827..e0adab8 100644 --- a/BCZT_PANEL/OUTPUT/lin_test.hex +++ b/BCZT_PANEL/OUTPUT/lin_test.hex @@ -1,5 +1,5 @@ :80000000CE00000028010000000000000000000000000000A2012A016F01000000000000D1010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000079 -:180082008002000002FC610801000AFC00000000000000000000000076 +:180082008008000002FC610801000AFC00000000000000000000000070 :0400C000FF53E00406 :0A00C4000000000000000000000032 :FF00CE00CBF820FE305AFCFCEB0100FC6402003600FC3041FCEF04CC0000A747DFF93620FE3020FEEF04CC0000A747DFF94100321800EF08B3114982004842FCF643DFF44100320000EF08B3114980004820FEF643DFF4FC2F0200F6EFFE61FCC1C3C5C78EFD708EFCC1C78D129800AF34FC4232FC880061D323EB30FC99A230FCA232FCAF34FC4232FC61F8FC1B0500C0C09EFC609EFDC6C4C2C061FC318EFC1F0500EFEBC1C3C5C78EFD708EFCC1C7EB30FC8D1299AF0201605C0798008800318EBF0A018800FC210500C0C09EFC609EFDC6C4C2C061FCC1C3C5C78EFD708EFCC1AF2EFCF743DF06FC200500EF0CEB2CFC899D10A22CFCB22EFCC09EFC609EFDC6C409 diff --git a/BCZT_PANEL/lin_user.c b/BCZT_PANEL/lin_user.c index 33389fc..a192a0a 100644 --- a/BCZT_PANEL/lin_user.c +++ b/BCZT_PANEL/lin_user.c @@ -5,6 +5,6 @@ uint8_t g_rxbuf[8],g_txbuf[8]; //加const报错 MSGTYPE LIN_cfg_arr[MSG_NUM] = { //PID LEN DIR BUFFER - {0x80,2,MSG_DIR_RX,g_rxbuf}, + {0x80,8,MSG_DIR_RX,g_rxbuf}, {0x61,8,MSG_DIR_TX,g_txbuf} }; \ No newline at end of file