From e95f4b39b1db95f33506f7fc26b49500526ca3c4 Mon Sep 17 00:00:00 2001 From: sunbeam Date: Fri, 24 May 2024 17:09:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E6=88=90IO=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- K80.mtpj | 100 +++++++++--------------------- K80.rcpe | 53 ++++++++-------- OUTPUT/K80L_SW0103.mot | 136 +++++++++++++++++++++++++++++++++++++++++ OUTPUT/K80R_SW0103.mot | 136 +++++++++++++++++++++++++++++++++++++++++ appTask.c | 6 +- hwCtrl.c | 11 ++-- r_cg_cgc.c | 2 +- r_cg_cgc.h | 2 +- r_cg_cgc_user.c | 2 +- r_cg_macrodriver.h | 2 +- r_cg_port.c | 6 +- r_cg_port.h | 2 +- r_cg_port_user.c | 2 +- r_cg_serial.c | 2 +- r_cg_serial.h | 2 +- r_cg_serial_user.c | 2 +- r_cg_timer.c | 40 +----------- r_cg_timer.h | 8 +-- r_cg_timer_user.c | 15 +---- r_cg_userdefine.h | 2 +- r_cg_wdt.c | 2 +- r_cg_wdt.h | 2 +- r_cg_wdt_user.c | 2 +- r_main.c | 3 +- r_systeminit.c | 4 +- 25 files changed, 354 insertions(+), 190 deletions(-) create mode 100644 OUTPUT/K80L_SW0103.mot create mode 100644 OUTPUT/K80R_SW0103.mot diff --git a/K80.mtpj b/K80.mtpj index 0542d79..d675f04 100644 --- a/K80.mtpj +++ b/K80.mtpj @@ -190,27 +190,6 @@ 03cad1e8-2eb3-4cde-a8a3-982423631122 b8348788-df17-4b71-a9fa-eab0f1824fb1 - - r_cg_adc.c - File - r_cg_adc.c - 941832c1-fc3b-4e1b-94e8-01ea17128b42 - b8348788-df17-4b71-a9fa-eab0f1824fb1 - - - r_cg_adc_user.c - File - r_cg_adc_user.c - 941832c1-fc3b-4e1b-94e8-01ea17128b42 - b8348788-df17-4b71-a9fa-eab0f1824fb1 - - - r_cg_adc.h - File - r_cg_adc.h - 03cad1e8-2eb3-4cde-a8a3-982423631122 - b8348788-df17-4b71-a9fa-eab0f1824fb1 - @@ -291,11 +270,7 @@ CSource ecd17489-356b-4667-a2ea-7262a0474482 CSource - 52c43fa9-b8f5-41ce-8427-a93af15f047c - CSource - 1ddc16f0-9a49-4ce4-bd28-375332ad6fd6 - CSource - 19 + 17 0 @@ -681,7 +656,7 @@ False False - -8585295532319714959 + -8584850664709027733 True False Debug @@ -877,7 +852,7 @@ None False - -8585295532319714959 + -8584850664709027733 Debug LibraryU @@ -1041,18 +1016,6 @@ 637886506058257853 2 - - 638312461937751590 - 0 - - - 638312461937751590 - 1 - - - 638312461937751590 - 2 - -8585485826286446099 False @@ -1124,14 +1087,6 @@ False True False - -8585059862917014246 - False - True - False - -8585059862917014246 - False - True - False @@ -3031,8 +2986,8 @@ </Effect> </VDDValue> <VDD Name="VDD" Text="false" Comment="used" /> - <AD_ADPC_USEDPIN Name="AD_ADPC_USEDPIN" Text="ANI0,ANI1," /> - <ADC_ADS_VALUE Name="ADC_ADS_VALUE" Text="ANI0," /> + <AD_ADPC_USEDPIN Name="AD_ADPC_USEDPIN" Text="" /> + <ADC_ADS_VALUE Name="ADC_ADS_VALUE" Text="" /> <IIC00 Chip="RL78G12_20pin,RL78G12_24pin" Name="IIC00" Text="false" Comment="unused" Trigger="IIC00"> <Effect> <PORT Forcible="" /> @@ -3091,7 +3046,7 @@ <RAMEndAddress Name="RAMEndAddress" Fixed="" Text="000FFEFF" /> <ROMEndAddress Chip="R5F10268,R5F10278,R5F102A8" Name="ROMEndAddress" Fixed="" Text="00001FFF" /> <MirrorROM Chip="R5F10266, R5F10366,R5F10267, R5F10277, R5F102A7,R5F10367, R5F10377, R5F103A7,R5F10268, R5F10278, R5F102A8,R5F10368, R5F10378, R5F103A8" Name="MirrorROM" Fixed="" Text="0" /> - <ADPC_AD Name="ADPC_AD" Value="1" /> + <ADPC_AD Name="ADPC_AD" Value="-1" /> <CodePath Name="CodePath" Text=".\" /> <ReportType Name="ReportType" Text="Html" /> <CreationDateType Name="CreationDateType" Text="OutputDate" /> @@ -3137,8 +3092,8 @@ <P14 Name="P14/ANI20/TI01/TO01/INTP3" AltFunc="P14" Point="I/O" /> </Port1> <Port2 ADIN="true"> - <P20 Name="P20/ANI0/AVREFP" AltFunc="ANI0" Point="I/O" /> - <P21 Name="P21/ANI1/AVREFM" AltFunc="ANALOG_1" Point="I/O" /> + <P20 Name="P20/ANI0/AVREFP" AltFunc="" Point="I/O" /> + <P21 Name="P21/ANI1/AVREFM" AltFunc="" Point="I/O" /> <P22 Name="P22/ANI2" AltFunc="P22" Point="I/O" /> <P23 Name="P23/ANI3" AltFunc="P23" Point="I/O" /> </Port2> @@ -3305,7 +3260,7 @@ </IICA0> </Serial> <ADC> - <INTAD InUse="1" ISR="r_adc_interrupt" IsDMATrigger="true" /> + <INTAD InUse="0" ISR="r_adc_interrupt" IsDMATrigger="true" /> </ADC> <TAU> <TAU0> @@ -3313,7 +3268,7 @@ <INTTM00 InUse="1" ISR="r_tau0_channel0_interrupt" /> </Channel0> <Channel1> - <INTTM01 InUse="1" ISR="r_tau0_channel1_interrupt" /> + <INTTM01 InUse="0" ISR="r_tau0_channel1_interrupt" /> <INTTM01H InUse="0" ISR="r_tau0_channel1_higher8bits_interrupt" /> </Channel1> <Channel2> @@ -3591,14 +3546,14 @@ <r_cg_serial.h UserName="r_cg_serial.h" LibName=".h" InUse="1" /> </Serial> <ADC> - <r_cg_adc.c UserName="r_cg_adc.c" LibName=".c" InUse="1"> + <r_cg_adc.c UserName="r_cg_adc.c" LibName=".c" InUse="0"> <Type R_ADC_Create="void R_ADC_Create(void)" R_ADC_Start="void R_ADC_Start(void)" R_ADC_Stop="void R_ADC_Stop(void)" R_ADC_Set_OperationOn="void R_ADC_Set_OperationOn(void)" R_ADC_Set_OperationOff="void R_ADC_Set_OperationOff(void)" R_ADC_Get_Result="void R_ADC_Get_Result(uint16_t * const buffer)" R_ADC_Get_Result_8bit="void R_ADC_Get_Result_8bit(uint8_t * const buffer)" R_ADC_Set_ADChannel="MD_STATUS R_ADC_Set_ADChannel(ad_channel_t channel)" R_ADC_Set_SnoozeOn="void R_ADC_Set_SnoozeOn(void)" R_ADC_Set_SnoozeOff="void R_ADC_Set_SnoozeOff(void)" R_ADC_Set_TestChannel="MD_STATUS R_ADC_Set_TestChannel(test_channel_t channel)" R_ADC_Set_PowerOff="void R_ADC_Set_PowerOff(void)" /> - <R_ADC_Create UserName="R_ADC_Create" LibName="R_ADC_Create" InUse="1" Init="1" InitMode="" /> - <R_ADC_Start UserName="R_ADC_Start" LibName="R_ADC_Start" InUse="1" /> - <R_ADC_Stop UserName="R_ADC_Stop" LibName="R_ADC_Stop" InUse="1" /> - <R_ADC_Set_OperationOn UserName="R_ADC_Set_OperationOn" LibName="R_ADC_Set_OperationOn" InUse="1" /> - <R_ADC_Set_OperationOff UserName="R_ADC_Set_OperationOff" LibName="R_ADC_Set_OperationOff" InUse="1" /> - <R_ADC_Get_Result UserName="R_ADC_Get_Result" LibName="R_ADC_Get_Result" InUse="1" /> + <R_ADC_Create UserName="R_ADC_Create" LibName="R_ADC_Create" InUse="0" Init="1" InitMode="" /> + <R_ADC_Start UserName="R_ADC_Start" LibName="R_ADC_Start" InUse="0" /> + <R_ADC_Stop UserName="R_ADC_Stop" LibName="R_ADC_Stop" InUse="0" /> + <R_ADC_Set_OperationOn UserName="R_ADC_Set_OperationOn" LibName="R_ADC_Set_OperationOn" InUse="0" /> + <R_ADC_Set_OperationOff UserName="R_ADC_Set_OperationOff" LibName="R_ADC_Set_OperationOff" InUse="0" /> + <R_ADC_Get_Result UserName="R_ADC_Get_Result" LibName="R_ADC_Get_Result" InUse="0" /> <R_ADC_Get_Result_8bit UserName="R_ADC_Get_Result_8bit" LibName="R_ADC_Get_Result_8bit" InUse="0" /> <R_ADC_Set_ADChannel UserName="R_ADC_Set_ADChannel" LibName="R_ADC_Set_ADChannel" InUse="0" /> <R_ADC_Set_SnoozeOn UserName="R_ADC_Set_SnoozeOn" LibName="R_ADC_Set_SnoozeOn" InUse="0" /> @@ -3606,12 +3561,12 @@ <R_ADC_Set_TestChannel UserName="R_ADC_Set_TestChannel" LibName="R_ADC_Set_TestChannel" InUse="0" /> <R_ADC_Set_PowerOff UserName="R_ADC_Set_PowerOff" LibName="R_ADC_Set_PowerOff" InUse="0" /> </r_cg_adc.c> - <r_cg_adc_user.c UserName="r_cg_adc_user.c" LibName="_user.c" InUse="1"> + <r_cg_adc_user.c UserName="r_cg_adc_user.c" LibName="_user.c" InUse="0"> <Type R_ADC_Create_UserInit="void R_ADC_Create_UserInit(void)" r_adc_interrupt="__interrupt static void r_adc_interrupt(void)" /> <R_ADC_Create_UserInit UserName="R_ADC_Create_UserInit" LibName="R_ADC_Create_UserInit" InUse="0" /> - <r_adc_interrupt UserName="r_adc_interrupt" INTHandle="" LibName="r_adc_interrupt" InUse="1" /> + <r_adc_interrupt UserName="r_adc_interrupt" INTHandle="" LibName="r_adc_interrupt" InUse="0" /> </r_cg_adc_user.c> - <r_cg_adc.h UserName="r_cg_adc.h" LibName=".h" InUse="1" /> + <r_cg_adc.h UserName="r_cg_adc.h" LibName=".h" InUse="0" /> </ADC> <TAU> <r_cg_timer.c UserName="r_cg_timer.c" LibName=".c" InUse="1"> @@ -3626,10 +3581,10 @@ <R_TAU0_Channel0_Set_SoftwareTriggerOn UserName="R_TAU0_Channel0_Set_SoftwareTriggerOn" LibName="R_TAU_Channeln_Set_SoftwareTriggerOn" InUse="0" /> </Channel0> <Channel1 InUse=""> - <R_TAU0_Channel1_Start UserName="R_TAU0_Channel1_Start" LibName="R_TAU_Channeln_Start" InUse="1" /> + <R_TAU0_Channel1_Start UserName="R_TAU0_Channel1_Start" LibName="R_TAU_Channeln_Start" InUse="0" /> <R_TAU0_Channel1_Higher8bits_Start UserName="R_TAU0_Channel1_Higher8bits_Start" LibName="R_TAU_Channeln_Higher8bits_Start" InUse="0" /> <R_TAU0_Channel1_Lower8bits_Start UserName="R_TAU0_Channel1_Lower8bits_Start" LibName="R_TAU_Channeln_Lower8bits_Start" InUse="0" /> - <R_TAU0_Channel1_Stop UserName="R_TAU0_Channel1_Stop" LibName="R_TAU_Channeln_Stop" InUse="1" /> + <R_TAU0_Channel1_Stop UserName="R_TAU0_Channel1_Stop" LibName="R_TAU_Channeln_Stop" InUse="0" /> <R_TAU0_Channel1_Higher8bits_Stop UserName="R_TAU0_Channel1_Higher8bits_Stop" LibName="R_TAU_Channeln_Higher8bits_Stop" InUse="0" /> <R_TAU0_Channel1_Lower8bits_Stop UserName="R_TAU0_Channel1_Lower8bits_Stop" LibName="R_TAU_Channeln_Lower8bits_Stop" InUse="0" /> <R_TAU0_Channel1_Get_PulseWidth UserName="R_TAU0_Channel1_Get_PulseWidth" LibName="R_TAU_Channeln_Get_PulseWidth" InUse="0" /> @@ -3659,7 +3614,7 @@ <r_tau0_channel0_interrupt UserName="r_tau0_channel0_interrupt" INTHandle="" LibName="r_tau_channeln_interrupt" InUse="1" /> </Channel0> <Channel1 InUse=""> - <r_tau0_channel1_interrupt UserName="r_tau0_channel1_interrupt" INTHandle="" LibName="r_tau_channeln_interrupt" InUse="1" /> + <r_tau0_channel1_interrupt UserName="r_tau0_channel1_interrupt" INTHandle="" LibName="r_tau_channeln_interrupt" InUse="0" /> <r_tau0_channel1_higher8bits_interrupt UserName="r_tau0_channel1_higher8bits_interrupt" INTHandle="" LibName="r_tau_channeln_higher8bits_interrupt" InUse="0" /> </Channel1> <Channel2 InUse=""> @@ -3801,8 +3756,8 @@ </SAU0> <IICA0 Accelerate="No" MacroName="IICA" Channel="0" TabEnable="True" /> </Serial> - <ADC SetFlag="True" HelpID="adc" NeedRefresh="False"> - <ADC SetFlag="True" MacroName="ADC" /> + <ADC SetFlag="False" HelpID="adc" NeedRefresh="False"> + <ADC SetFlag="False" MacroName="ADC" /> </ADC> <TAU SetFlag="True" HelpID="timer" NeedRefresh="False"> <TAU0 Accelerate="No" Chip="RL78G12_20pin,RL78G12_24pin" MacroName="TAU" Channel="0" ChannelNum="0,1,2,3" SetFlag="True" /> @@ -4017,7 +3972,7 @@ </PortP13> </PORT> <ADC> - <setting name="AD_convertion" value="used" /> + <setting name="AD_convertion" value="unused" /> <setting name="Comparator_operation" value="enable" /> <setting name="Resolution" value="10bit" /> <setting name="AD_Positive" value="VDD" /> @@ -4070,7 +4025,7 @@ </TAUInterval0> </Channel0> <Channel1> - <setting name="ChannelFunction" value="1" /> + <setting name="ChannelFunction" value="0" /> <setting name="Pinselection" value="-1" /> <TAUInterval1> <setting name="OperationMode" value="16bits" /> @@ -4180,6 +4135,7 @@ </RL78G12> 1.0 6c6bb60a-ffe1-4884-8dec-f255a2e58155 + b8348788-df17-4b71-a9fa-eab0f1824fb1 diff --git a/K80.rcpe b/K80.rcpe index da08ed6..1288eda 100644 --- a/K80.rcpe +++ b/K80.rcpe @@ -30,9 +30,6 @@ r_cg_serial.h r_cg_timer.h r_cg_wdt.h - r_cg_adc.c - r_cg_adc_user.c - r_cg_adc.h appTask.c event.c @@ -66,8 +63,6 @@ DefaultBuild\appTask.obj DefaultBuild\event.obj DefaultBuild\hwCtrl.obj - DefaultBuild\r_cg_adc.obj - DefaultBuild\r_cg_adc_user.obj . @@ -193,8 +188,8 @@ </Effect> </VDDValue> <VDD Name="VDD" Text="false" Comment="used" /> - <AD_ADPC_USEDPIN Name="AD_ADPC_USEDPIN" Text="ANI0,ANI1," /> - <ADC_ADS_VALUE Name="ADC_ADS_VALUE" Text="ANI0," /> + <AD_ADPC_USEDPIN Name="AD_ADPC_USEDPIN" Text="" /> + <ADC_ADS_VALUE Name="ADC_ADS_VALUE" Text="" /> <IIC00 Chip="RL78G12_20pin,RL78G12_24pin" Name="IIC00" Text="false" Comment="unused" Trigger="IIC00"> <Effect> <PORT Forcible="" /> @@ -253,7 +248,7 @@ <RAMEndAddress Name="RAMEndAddress" Fixed="" Text="000FFEFF" /> <ROMEndAddress Chip="R5F10268,R5F10278,R5F102A8" Name="ROMEndAddress" Fixed="" Text="00001FFF" /> <MirrorROM Chip="R5F10266, R5F10366,R5F10267, R5F10277, R5F102A7,R5F10367, R5F10377, R5F103A7,R5F10268, R5F10278, R5F102A8,R5F10368, R5F10378, R5F103A8" Name="MirrorROM" Fixed="" Text="0" /> - <ADPC_AD Name="ADPC_AD" Value="1" /> + <ADPC_AD Name="ADPC_AD" Value="-1" /> <CodePath Name="CodePath" Text=".\" /> <ReportType Name="ReportType" Text="Html" /> <CreationDateType Name="CreationDateType" Text="OutputDate" /> @@ -299,8 +294,8 @@ <P14 Name="P14/ANI20/TI01/TO01/INTP3" AltFunc="P14" Point="I/O" /> </Port1> <Port2 ADIN="true"> - <P20 Name="P20/ANI0/AVREFP" AltFunc="ANI0" Point="I/O" /> - <P21 Name="P21/ANI1/AVREFM" AltFunc="ANALOG_1" Point="I/O" /> + <P20 Name="P20/ANI0/AVREFP" AltFunc="" Point="I/O" /> + <P21 Name="P21/ANI1/AVREFM" AltFunc="" Point="I/O" /> <P22 Name="P22/ANI2" AltFunc="P22" Point="I/O" /> <P23 Name="P23/ANI3" AltFunc="P23" Point="I/O" /> </Port2> @@ -467,7 +462,7 @@ </IICA0> </Serial> <ADC> - <INTAD InUse="1" ISR="r_adc_interrupt" IsDMATrigger="true" /> + <INTAD InUse="0" ISR="r_adc_interrupt" IsDMATrigger="true" /> </ADC> <TAU> <TAU0> @@ -475,7 +470,7 @@ <INTTM00 InUse="1" ISR="r_tau0_channel0_interrupt" /> </Channel0> <Channel1> - <INTTM01 InUse="1" ISR="r_tau0_channel1_interrupt" /> + <INTTM01 InUse="0" ISR="r_tau0_channel1_interrupt" /> <INTTM01H InUse="0" ISR="r_tau0_channel1_higher8bits_interrupt" /> </Channel1> <Channel2> @@ -753,14 +748,14 @@ <r_cg_serial.h UserName="r_cg_serial.h" LibName=".h" InUse="1" /> </Serial> <ADC> - <r_cg_adc.c UserName="r_cg_adc.c" LibName=".c" InUse="1"> + <r_cg_adc.c UserName="r_cg_adc.c" LibName=".c" InUse="0"> <Type R_ADC_Create="void R_ADC_Create(void)" R_ADC_Start="void R_ADC_Start(void)" R_ADC_Stop="void R_ADC_Stop(void)" R_ADC_Set_OperationOn="void R_ADC_Set_OperationOn(void)" R_ADC_Set_OperationOff="void R_ADC_Set_OperationOff(void)" R_ADC_Get_Result="void R_ADC_Get_Result(uint16_t * const buffer)" R_ADC_Get_Result_8bit="void R_ADC_Get_Result_8bit(uint8_t * const buffer)" R_ADC_Set_ADChannel="MD_STATUS R_ADC_Set_ADChannel(ad_channel_t channel)" R_ADC_Set_SnoozeOn="void R_ADC_Set_SnoozeOn(void)" R_ADC_Set_SnoozeOff="void R_ADC_Set_SnoozeOff(void)" R_ADC_Set_TestChannel="MD_STATUS R_ADC_Set_TestChannel(test_channel_t channel)" R_ADC_Set_PowerOff="void R_ADC_Set_PowerOff(void)" /> - <R_ADC_Create UserName="R_ADC_Create" LibName="R_ADC_Create" InUse="1" Init="1" InitMode="" /> - <R_ADC_Start UserName="R_ADC_Start" LibName="R_ADC_Start" InUse="1" /> - <R_ADC_Stop UserName="R_ADC_Stop" LibName="R_ADC_Stop" InUse="1" /> - <R_ADC_Set_OperationOn UserName="R_ADC_Set_OperationOn" LibName="R_ADC_Set_OperationOn" InUse="1" /> - <R_ADC_Set_OperationOff UserName="R_ADC_Set_OperationOff" LibName="R_ADC_Set_OperationOff" InUse="1" /> - <R_ADC_Get_Result UserName="R_ADC_Get_Result" LibName="R_ADC_Get_Result" InUse="1" /> + <R_ADC_Create UserName="R_ADC_Create" LibName="R_ADC_Create" InUse="0" Init="1" InitMode="" /> + <R_ADC_Start UserName="R_ADC_Start" LibName="R_ADC_Start" InUse="0" /> + <R_ADC_Stop UserName="R_ADC_Stop" LibName="R_ADC_Stop" InUse="0" /> + <R_ADC_Set_OperationOn UserName="R_ADC_Set_OperationOn" LibName="R_ADC_Set_OperationOn" InUse="0" /> + <R_ADC_Set_OperationOff UserName="R_ADC_Set_OperationOff" LibName="R_ADC_Set_OperationOff" InUse="0" /> + <R_ADC_Get_Result UserName="R_ADC_Get_Result" LibName="R_ADC_Get_Result" InUse="0" /> <R_ADC_Get_Result_8bit UserName="R_ADC_Get_Result_8bit" LibName="R_ADC_Get_Result_8bit" InUse="0" /> <R_ADC_Set_ADChannel UserName="R_ADC_Set_ADChannel" LibName="R_ADC_Set_ADChannel" InUse="0" /> <R_ADC_Set_SnoozeOn UserName="R_ADC_Set_SnoozeOn" LibName="R_ADC_Set_SnoozeOn" InUse="0" /> @@ -768,12 +763,12 @@ <R_ADC_Set_TestChannel UserName="R_ADC_Set_TestChannel" LibName="R_ADC_Set_TestChannel" InUse="0" /> <R_ADC_Set_PowerOff UserName="R_ADC_Set_PowerOff" LibName="R_ADC_Set_PowerOff" InUse="0" /> </r_cg_adc.c> - <r_cg_adc_user.c UserName="r_cg_adc_user.c" LibName="_user.c" InUse="1"> + <r_cg_adc_user.c UserName="r_cg_adc_user.c" LibName="_user.c" InUse="0"> <Type R_ADC_Create_UserInit="void R_ADC_Create_UserInit(void)" r_adc_interrupt="__interrupt static void r_adc_interrupt(void)" /> <R_ADC_Create_UserInit UserName="R_ADC_Create_UserInit" LibName="R_ADC_Create_UserInit" InUse="0" /> - <r_adc_interrupt UserName="r_adc_interrupt" INTHandle="" LibName="r_adc_interrupt" InUse="1" /> + <r_adc_interrupt UserName="r_adc_interrupt" INTHandle="" LibName="r_adc_interrupt" InUse="0" /> </r_cg_adc_user.c> - <r_cg_adc.h UserName="r_cg_adc.h" LibName=".h" InUse="1" /> + <r_cg_adc.h UserName="r_cg_adc.h" LibName=".h" InUse="0" /> </ADC> <TAU> <r_cg_timer.c UserName="r_cg_timer.c" LibName=".c" InUse="1"> @@ -788,10 +783,10 @@ <R_TAU0_Channel0_Set_SoftwareTriggerOn UserName="R_TAU0_Channel0_Set_SoftwareTriggerOn" LibName="R_TAU_Channeln_Set_SoftwareTriggerOn" InUse="0" /> </Channel0> <Channel1 InUse=""> - <R_TAU0_Channel1_Start UserName="R_TAU0_Channel1_Start" LibName="R_TAU_Channeln_Start" InUse="1" /> + <R_TAU0_Channel1_Start UserName="R_TAU0_Channel1_Start" LibName="R_TAU_Channeln_Start" InUse="0" /> <R_TAU0_Channel1_Higher8bits_Start UserName="R_TAU0_Channel1_Higher8bits_Start" LibName="R_TAU_Channeln_Higher8bits_Start" InUse="0" /> <R_TAU0_Channel1_Lower8bits_Start UserName="R_TAU0_Channel1_Lower8bits_Start" LibName="R_TAU_Channeln_Lower8bits_Start" InUse="0" /> - <R_TAU0_Channel1_Stop UserName="R_TAU0_Channel1_Stop" LibName="R_TAU_Channeln_Stop" InUse="1" /> + <R_TAU0_Channel1_Stop UserName="R_TAU0_Channel1_Stop" LibName="R_TAU_Channeln_Stop" InUse="0" /> <R_TAU0_Channel1_Higher8bits_Stop UserName="R_TAU0_Channel1_Higher8bits_Stop" LibName="R_TAU_Channeln_Higher8bits_Stop" InUse="0" /> <R_TAU0_Channel1_Lower8bits_Stop UserName="R_TAU0_Channel1_Lower8bits_Stop" LibName="R_TAU_Channeln_Lower8bits_Stop" InUse="0" /> <R_TAU0_Channel1_Get_PulseWidth UserName="R_TAU0_Channel1_Get_PulseWidth" LibName="R_TAU_Channeln_Get_PulseWidth" InUse="0" /> @@ -821,7 +816,7 @@ <r_tau0_channel0_interrupt UserName="r_tau0_channel0_interrupt" INTHandle="" LibName="r_tau_channeln_interrupt" InUse="1" /> </Channel0> <Channel1 InUse=""> - <r_tau0_channel1_interrupt UserName="r_tau0_channel1_interrupt" INTHandle="" LibName="r_tau_channeln_interrupt" InUse="1" /> + <r_tau0_channel1_interrupt UserName="r_tau0_channel1_interrupt" INTHandle="" LibName="r_tau_channeln_interrupt" InUse="0" /> <r_tau0_channel1_higher8bits_interrupt UserName="r_tau0_channel1_higher8bits_interrupt" INTHandle="" LibName="r_tau_channeln_higher8bits_interrupt" InUse="0" /> </Channel1> <Channel2 InUse=""> @@ -963,8 +958,8 @@ </SAU0> <IICA0 Accelerate="No" MacroName="IICA" Channel="0" TabEnable="True" /> </Serial> - <ADC SetFlag="True" HelpID="adc" NeedRefresh="False"> - <ADC SetFlag="True" MacroName="ADC" /> + <ADC SetFlag="False" HelpID="adc" NeedRefresh="False"> + <ADC SetFlag="False" MacroName="ADC" /> </ADC> <TAU SetFlag="True" HelpID="timer" NeedRefresh="False"> <TAU0 Accelerate="No" Chip="RL78G12_20pin,RL78G12_24pin" MacroName="TAU" Channel="0" ChannelNum="0,1,2,3" SetFlag="True" /> @@ -1179,7 +1174,7 @@ </PortP13> </PORT> <ADC> - <setting name="AD_convertion" value="used" /> + <setting name="AD_convertion" value="unused" /> <setting name="Comparator_operation" value="enable" /> <setting name="Resolution" value="10bit" /> <setting name="AD_Positive" value="VDD" /> @@ -1232,7 +1227,7 @@ </TAUInterval0> </Channel0> <Channel1> - <setting name="ChannelFunction" value="1" /> + <setting name="ChannelFunction" value="0" /> <setting name="Pinselection" value="-1" /> <TAUInterval1> <setting name="OperationMode" value="16bits" /> diff --git a/OUTPUT/K80L_SW0103.mot b/OUTPUT/K80L_SW0103.mot new file mode 100644 index 0000000..bda5db3 --- /dev/null +++ b/OUTPUT/K80L_SW0103.mot @@ -0,0 +1,136 @@ +S00E00004B383020202020206D6F744E +S1130000CE0000000000000000000000000000001E +S1130010000000008701280100000000000000002B +S1130020B601000000000000000000000000000015 +S113003000000000000000000000000000000000BC +S113004000000000000000000000000000000000AC +S1130050000000000000000000000000000000009C +S1130060000000000000000000000000000000008C +S1130070000000000000000000000000000000007C +S10A00805AA5040000000072 +S11300880000000000000000000000000000000064 +S10F009800000000000000000000000058 +S10700C07A47E00493 +S10D00C4000000000000000000002E +S11300CECBF820FE303EFCFCD00100FC4902003689 +S11300DE00FC3021FCEF04CC0000A747DFF93620EA +S11300EEFE3020FEEF04CC0000A747DFF9410032BA +S11300FE1C00EF08B3114988004822FCF643DFF4D4 +S113010E4100320000EF08B3114980004820FEF68A +S113011E43DFF4FC140200F6EFFEC1C3C5C78EFD27 +S113012E708EFCC1C7AF0201605C07980088003175 +S113013E8EBF0A018800D1DD068800FC9903008D6C +S113014E129801AF08FC4206FC880161D323EB042C +S113015EFC99A204FCA206FCAF08FC4206FC61F862 +S113016EFC850300C0C09EFC609EFDC6C4C2C06177 +S113017EFC318EFC940300EFEBC1C3C5C78EFD703A +S113018E8EFCC1AF02FCF743DF06FC950300EF0CB7 +S113019EEB00FC899D10A200FCB202FCC09EFC6028 +S11301AE9EFDC6C4C2C061FCC1C3C5C78EFD708EA0 +S11301BEFCC1FCEF0600C09EFC609EFDC6C4C2C01E +S10501CE61FCCE +S11301D016C80300AEF82761D339315E12F643DD49 +S11301E027BBBC02BC04BC06BC08BC0ABC0CBC0ECD +S11301F0BC10BC12BC14BC16BC18BC1ABC1CBC1E63 +S11302003704200037B3EFD6AEF847DD06F6BBA7B8 +S1130210A7EFF5D7717AFAFC170400FC310400FC4F +S11302206D0600EFFA717AFAD7CF770002FC5F020D +S113023000FC4E0200FC620200FC800200FC9A03F7 +S113024000FC0C0400F57800D7717BFAEFDB36A1D3 +S1130250FFCEA00071F2714BA4F5F3007183D78E29 +S1130260A8D7346100CD011FF402CD0406CA00E012 +S1130270CA03F9CA1501CE21E0CE22F3CE24F9D760 +S113028036F00030440071A200000000BC36347027 +S113029000AAB4086C0308BAB4710AE5710BE171E1 +S11302A01AE5711BE1712AE5712BE1710AED710AFE +S11302B0E9711AED711AE9302200BAA030A783BAA5 +S11302C0A8C910009A89718A99300700BA9A302215 +S11302D001BAA2309743BAAAC912009AAAB8086C04 +S11302E00108BAB8AAC4BAC4AABA086C0108BABA4E +S11302F051026F26FF9E266A060151FE5F26FF9E6D +S113030026D7342201AA06086C0108BA06AA0808EE +S11303106C0108BA08A9086C0308B9710BE1711BD8 +S1130320E1710BE5711BE5D7342401710AE5711AFB +S1130330E5A9086C0308B9AA06085CFE08BA0671A8 +S11303400BE1711BE1D714136168DF04308100D71E +S1130350F6BF06FC13BF08FC15BF04FCF6D7141344 +S11303606168DF04308100D736E5FF15BF00FC1358 +S1130370BF02FC7182EB00FC899D10A200FCB2025A +S1130380FC7183F6D78F0AFCFCC10400E7300AFC39 +S1130390EC460300D7E50DFCD7D734F00036F00067 +S11303A0F67182BAC6300F0ABAC4716AE5716BE19C +S11303B0717AE5717BE1713AE5713BE1710AE671AD +S11303C00BE2711AE6711BE2714AE5714BE1716A45 +S11303D0ED716AE9F6BAA0C918BF5DAAC8085CFE47 +S11303E008BAC8AACA085CFE08BACAD734B20171EE +S11303F06BE1716BE5A9086C0108B9D734B401A9A4 +S1130400086C0108B9716AE5716BE1D7710AE4718E +S11304100BE0D7CEABACD7FCEC0300F1FC960700A5 +S1130420F1FCC70700FC020300E7300AFCEC4603BA +S113043000E50DFCD72008704100118F8000980062 +S1130440118F81009801118F82009802118F83000F +S1130450759803118F8400739804118F8500729826 +S113046005118F86009806D0DD1390DD1990DF4EBC +S11304708F24FCD1DF1AC8040D530DEF1851030F5C +S113048022FC3149EF0551030F23FC759803EF0556 +S11304900C0973980465610A610B9806F3AEF816AB +S11304A061C91828FC83634C07DFF2400DFC01DFAF +S11304B00DF50DFC3207003028FCFC5E030010082B +S11304C0D7C798004032FC5ADF124CA5DF0EE53145 +S11304D0FCF52FFCF533FCE528FCEF328F31FC4CA6 +S11304E001DF0F88009F33FCCF31FC02CF28FC02D0 +S11304F0EF1C4C02DF18E92FFC8800180EFC836304 +S11305009F2FFC708F33FC614061C8FE0A00880095 +S11305109F32FCF530FCC0D74C04F1737261D8D71C +S1130520318E040EFC16630D7382624C03DFF1639B +S11305304F11FCDF738F0EFC0C80DD290C7FDD284E +S113054091DD2A0CFBDD2C91DD2F0CF8DD3391DDE0 +S11305502D0CF1DD0A4C50DF2BCF25FC02EF09CF27 +S113056025FC03EF03E525FCF526FCEF17CF26FC5D +S113057003EF0ECF26FC02EF08E526FCEF03F52679 +S1130580FCF525FC8F0FFC0CE6DD0E91DD1091DDF2 +S11305901391DF14F527FCEF0FE527FCEF0ACF27B3 +S11305A0FC02EF04CF27FC03F531FCF530FCF52FFA +S11305B0FCD770D0DD186091DD2891DF378F27FCE0 +S11305C0814C0461C8F19F24FC9F27FCEF268F25F2 +S11305D0FC814C0461C8F19F22FC9F25FCF526FC9C +S11305E0EF128F26FC814C0461C8F19F23FC9F26E7 +S11305F0FCF525FC60EE3DFE2004F19800FCF907B3 +S1130600007291DF328800318E148800730934FC43 +S1130610D1DF241501B8020438FC14A9A1B9440798 +S113062000DC291934FC01A802123006007838FCD9 +S11306308800FE7DFFEF15D2DF1288007388001951 +S113064034FC00318E12311CF67838FC8800819815 +S1130650004C03DFA81004D78F26FCFC9607008FFC +S113066025FCFCC707008F27FCEC640700401BFC3B +S113067001DF1EF51BFCFE7FFFD531FCDF05F530E5 +S1130680FCEF0E8F30FC819F30FC4C0761C8F531C4 +S1130690FC401CFC01DF06F51CFCFEBBFF401FFCFC +S11306A001DF07F51FFCFC1304004020FC0161F886 +S11306B0F520FCD720041436FFFF62318EA104FF1D +S11306C0FFB802DD26530889318E617F08617E08F8 +S11306D0B800311E168800310508177CA0087C017B +S11306E008169317DFEAA5A802EFD3100417D7A2C0 +S11306F018FCE51AFCAF18FC320500FC1E0800F7D4 +S11307004361F8E51BFCAF18FC520AFC1E0800F715 +S11307104361F8E51CFCAF18FC5214FC1E0800F7FA +S11307204361F8E51DFCAF18FC5232FC1E0800F7CB +S11307304361F8E51EFCAF18FC5264FC1E0800F788 +S11307404361F8E51FFCAF18FC32E803FC1E080007 +S1130750F74361F8E520FCAF18FC4460EADC04F6DA +S1130760BF18FCD7D1DD0A91DD2191DD1491DD0C98 +S1130770D77112043602FF71B371A3D7711304EF5A +S1130780F33602FF71130471B2EFEE3602FF7113F8 +S11307900471B271A2D7D1DD0A91DD2191DD1591E9 +S11307A0DD0BD73601FF71A271B271C2D73601FFDA +S11307B071A3EFF43601FF71A371B3EFED3601FFBE +S11307C071A371B371C3D7D1DD0A91DD2191DD1419 +S11307D091DD0CD77122043601FF71827192D771B9 +S11307E02304EFF33601FF7123047183EFEE360126 +S11307F0FF71230471837193D7D1DD0C91DD1191C5 +S1130800F1DF1AE15B02EF138D02311A5C01EF0B89 +S11108108D0C71ACE1DE068D0D317A7C01D7C2 +S113081E14F64315DD2261DD717BFACFE80080BE4C +S113082EF013BEF6F6BEF2BEF4CFE800818FE800F8 +S10C083E3103FAAFE00061CDD7EB +S9030000FC diff --git a/OUTPUT/K80R_SW0103.mot b/OUTPUT/K80R_SW0103.mot new file mode 100644 index 0000000..2011fa2 --- /dev/null +++ b/OUTPUT/K80R_SW0103.mot @@ -0,0 +1,136 @@ +S00E00004B383020202020206D6F744E +S1130000CE0000000000000000000000000000001E +S1130010000000008701280100000000000000002B +S1130020B601000000000000000000000000000015 +S113003000000000000000000000000000000000BC +S113004000000000000000000000000000000000AC +S1130050000000000000000000000000000000009C +S1130060000000000000000000000000000000008C +S1130070000000000000000000000000000000007C +S10A00805AA5040000000072 +S11300880000000000000000000000000000000064 +S10F009800000000000000000000000058 +S10700C07A47E00493 +S10D00C4000000000000000000002E +S11300CECBF820FE303EFCFCD00100FC4902003689 +S11300DE00FC3021FCEF04CC0000A747DFF93620EA +S11300EEFE3020FEEF04CC0000A747DFF9410032BA +S11300FE1C00EF08B3114988004822FCF643DFF4D4 +S113010E4100320000EF08B3114980004820FEF68A +S113011E43DFF4FC140200F6EFFEC1C3C5C78EFD27 +S113012E708EFCC1C7AF0201605C07980088003175 +S113013E8EBF0A018800D1DD068800FC9903008D6C +S113014E129801AF08FC4206FC880161D323EB042C +S113015EFC99A204FCA206FCAF08FC4206FC61F862 +S113016EFC850300C0C09EFC609EFDC6C4C2C06177 +S113017EFC318EFC940300EFEBC1C3C5C78EFD703A +S113018E8EFCC1AF02FCF743DF06FC950300EF0CB7 +S113019EEB00FC899D10A200FCB202FCC09EFC6028 +S11301AE9EFDC6C4C2C061FCC1C3C5C78EFD708EA0 +S11301BEFCC1FCEF0600C09EFC609EFDC6C4C2C01E +S10501CE61FCCE +S11301D016C80300AEF82761D339315E12F643DD49 +S11301E027BBBC02BC04BC06BC08BC0ABC0CBC0ECD +S11301F0BC10BC12BC14BC16BC18BC1ABC1CBC1E63 +S11302003704200037B3EFD6AEF847DD06F6BBA7B8 +S1130210A7EFF5D7717AFAFC170400FC310400FC4F +S11302206D0600EFFA717AFAD7CF770002FC5F020D +S113023000FC4E0200FC620200FC800200FC9A03F7 +S113024000FC0C0400F57800D7717BFAEFDB36A1D3 +S1130250FFCEA00071F2714BA4F5F3007183D78E29 +S1130260A8D7346100CD011FF402CD0406CA00E012 +S1130270CA03F9CA1501CE21E0CE22F3CE24F9D760 +S113028036F00030440071A200000000BC36347027 +S113029000AAB4086C0308BAB4710AE5710BE171E1 +S11302A01AE5711BE1712AE5712BE1710AED710AFE +S11302B0E9711AED711AE9302200BAA030A783BAA5 +S11302C0A8C910009A89718A99300700BA9A302215 +S11302D001BAA2309743BAAAC912009AAAB8086C04 +S11302E00108BAB8AAC4BAC4AABA086C0108BABA4E +S11302F051026F26FF9E266A060151FE5F26FF9E6D +S113030026D7342201AA06086C0108BA06AA0808EE +S11303106C0108BA08A9086C0308B9710BE1711BD8 +S1130320E1710BE5711BE5D7342401710AE5711AFB +S1130330E5A9086C0308B9AA06085CFE08BA0671A8 +S11303400BE1711BE1D714136168DF04308100D71E +S1130350F6BF06FC13BF08FC15BF04FCF6D7141344 +S11303606168DF04308100D736E5FF15BF00FC1358 +S1130370BF02FC7182EB00FC899D10A200FCB2025A +S1130380FC7183F6D78F0AFCFCC10400E7300AFC39 +S1130390EC460300D7E50DFCD7D734F00036F00067 +S11303A0F67182BAC6300F0ABAC4716AE5716BE19C +S11303B0717AE5717BE1713AE5713BE1710AE671AD +S11303C00BE2711AE6711BE2714AE5714BE1716A45 +S11303D0ED716AE9F6BAA0C918BF5DAAC8085CFE47 +S11303E008BAC8AACA085CFE08BACAD734B20171EE +S11303F06BE1716BE5A9086C0108B9D734B401A9A4 +S1130400086C0108B9716AE5716BE1D7710AE4718E +S11304100BE0D7CEABACD7FCEC0300F1FC640700D7 +S1130420F1FCC70700FC020300E7300AFCEC4603BA +S113043000E50DFCD72008704100118F8000980062 +S1130440118F81009801118F82009802118F83000F +S1130450759803118F8400739804118F8500729826 +S113046005118F86009806D0DD1390DD1990DF4EBC +S11304708F24FCD1DF1AC8040D530DEF1851030F5C +S113048022FC3149EF0551030F23FC759803EF0556 +S11304900C0973980465610A610B9806F3AEF816AB +S11304A061C91828FC83634C07DFF2400DFC01DFAF +S11304B00DF50DFC3207003028FCFC5E030010082B +S11304C0D7C798004032FC5ADF124CA5DF0EE53145 +S11304D0FCF52FFCF533FCE528FCEF328F31FC4CA6 +S11304E001DF0F88009F33FCCF31FC02CF28FC02D0 +S11304F0EF1C4C02DF18E92FFC8800180EFC836304 +S11305009F2FFC708F33FC614061C8FE0A00880095 +S11305109F32FCF530FCC0D74C04F1737261D8D71C +S1130520318E040EFC16630D7382624C03DFF1639B +S11305304F11FCDF738F0EFC0C80DD290C7FDD284E +S113054091DD2A0CFBDD2C91DD2F0CF8DD3391DDE0 +S11305502D0CF1DD0A4C50DF2BCF25FC02EF09CF27 +S113056025FC03EF03E525FCF526FCEF17CF26FC5D +S113057003EF0ECF26FC02EF08E526FCEF03F52679 +S1130580FCF525FC8F0FFC0CE6DD0E91DD1091DDF2 +S11305901391DF14F527FCEF0FE527FCEF0ACF27B3 +S11305A0FC02EF04CF27FC03F531FCF530FCF52FFA +S11305B0FCD770D0DD186091DD2891DF378F27FCE0 +S11305C0814C0461C8F19F24FC9F27FCEF268F25F2 +S11305D0FC814C0461C8F19F22FC9F25FCF526FC9C +S11305E0EF128F26FC814C0461C8F19F23FC9F26E7 +S11305F0FCF525FC60EE3DFE2004F19800FCF907B3 +S1130600007291DF328800318E148800730934FC43 +S1130610D1DF241501B8020438FC14A9A1B9440798 +S113062000DC291934FC01A802123006007838FCD9 +S11306308800FE7DFFEF15D2DF1288007388001951 +S113064034FC00318E12311CF67838FC8800819815 +S1130650004C03DFA81004D78F26FCFC6407008F2E +S113066025FCFCC707008F27FCEC960700401BFC09 +S113067001DF1EF51BFCFE7FFFD531FCDF05F530E5 +S1130680FCEF0E8F30FC819F30FC4C0761C8F531C4 +S1130690FC401CFC01DF06F51CFCFEBBFF401FFCFC +S11306A001DF07F51FFCFC1304004020FC0161F886 +S11306B0F520FCD720041436FFFF62318EA104FF1D +S11306C0FFB802DD26530889318E617F08617E08F8 +S11306D0B800311E168800310508177CA0087C017B +S11306E008169317DFEAA5A802EFD3100417D7A2C0 +S11306F018FCE51AFCAF18FC320500FC1E0800F7D4 +S11307004361F8E51BFCAF18FC520AFC1E0800F715 +S11307104361F8E51CFCAF18FC5214FC1E0800F7FA +S11307204361F8E51DFCAF18FC5232FC1E0800F7CB +S11307304361F8E51EFCAF18FC5264FC1E0800F788 +S11307404361F8E51FFCAF18FC32E803FC1E080007 +S1130750F74361F8E520FCAF18FC4460EADC04F6DA +S1130760BF18FCD7D1DD0A91DD2191DD1491DD0C98 +S1130770D77112043602FF71B371A3D7711304EF5A +S1130780F33602FF71130471B2EFEE3602FF7113F8 +S11307900471B271A2D7D1DD0A91DD2191DD1591E9 +S11307A0DD0BD73601FF71A271B271C2D73601FFDA +S11307B071A3EFF43601FF71A371B3EFED3601FFBE +S11307C071A371B371C3D7D1DD0A91DD2191DD1419 +S11307D091DD0CD77122043601FF71827192D771B9 +S11307E02304EFF33601FF7123047183EFEE360126 +S11307F0FF71230471837193D7D1DD1991DD1191B8 +S1130800F1DF1A8D0C71ACE1DE138D0D317AEF0B33 +S1110810E15B02EF068D02311A5C017C01D718 +S113081E14F64315DD2261DD717BFACFE80080BE4C +S113082EF013BEF6F6BEF2BEF4CFE800818FE800F8 +S10C083E3103FAAFE00061CDD7EB +S9030000FC diff --git a/appTask.c b/appTask.c index 88db9b6..ae6c343 100644 --- a/appTask.c +++ b/appTask.c @@ -24,9 +24,9 @@ void HardWare_Init(void) //AnmoLED_Ctrl(0); //AD ³õʼ»¯ - R_ADC_Start(); - R_ADC_Set_OperationOn(); - R_TAU0_Channel1_Start(); + //R_ADC_Start(); + //R_ADC_Set_OperationOn(); + //R_TAU0_Channel1_Start(); //UART³õʼ»¯ R_UART0_Start(); diff --git a/hwCtrl.c b/hwCtrl.c index 0427b8a..66b63bd 100644 --- a/hwCtrl.c +++ b/hwCtrl.c @@ -40,7 +40,8 @@ #endif - +#define IO_KEY1 P2_bit.no0 +#define IO_KEY2 P2_bit.no1 #define IO_KEY5 P12_bit.no2 #define IO_KEY6 P13_bit.no7 @@ -213,10 +214,10 @@ uint8_t GetKeyState(uint8_t keyno) #if BOARD == K74R //RIGHT case KEY_FAN: - return g_AdVal[0]<1000?1:0; + return IO_KEY1==0?1:0; break; case KEY_JR: - return g_AdVal[1]<1000?1:0; + return IO_KEY2==0?1:0; break; case KEY_AM: return (IO_KEY5==0||IO_KEY6==0)?1:0; @@ -224,10 +225,10 @@ uint8_t GetKeyState(uint8_t keyno) #else //left case KEY_AM: - return g_AdVal[0]<1000?1:0; + return IO_KEY1==0?1:0; break; case KEY_JR: - return g_AdVal[1]<1000?1:0; + return IO_KEY2==0?1:0; break; case KEY_FAN: return (IO_KEY5==0||IO_KEY6==0)?1:0; diff --git a/r_cg_cgc.c b/r_cg_cgc.c index 6c11564..b7144ac 100644 --- a/r_cg_cgc.c +++ b/r_cg_cgc.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for CGC module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/r_cg_cgc.h b/r_cg_cgc.h index 294fc15..a141060 100644 --- a/r_cg_cgc.h +++ b/r_cg_cgc.h @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for CGC module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ #ifndef CGC_H diff --git a/r_cg_cgc_user.c b/r_cg_cgc_user.c index a94de0c..dee2715 100644 --- a/r_cg_cgc_user.c +++ b/r_cg_cgc_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for CGC module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/r_cg_macrodriver.h b/r_cg_macrodriver.h index 395e440..1ced8ce 100644 --- a/r_cg_macrodriver.h +++ b/r_cg_macrodriver.h @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements general head file. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ #ifndef STATUS_H diff --git a/r_cg_port.c b/r_cg_port.c index f1d1dab..b6f0f30 100644 --- a/r_cg_port.c +++ b/r_cg_port.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for PORT module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** @@ -60,10 +60,10 @@ void R_PORT_Create(void) P4 = _02_Pn1_OUTPUT_1 | _04_Pn2_OUTPUT_1; PMC1 = _00_PMCn0_DI_ON | _00_PMCn1_DI_ON | _00_PMCn2_DI_ON | _00_PMCn3_DI_ON | _00_PMCn4_DI_ON | _E0_PMC1_DEFAULT; PMC4 = _00_PMCn1_DI_ON | _00_PMCn2_DI_ON | _F9_PMC4_DEFAULT; - ADPC = _03_ADPC_DI_ON; + ADPC = _01_ADPC_DI_ON; PM1 = _00_PMn0_MODE_OUTPUT | _00_PMn1_MODE_OUTPUT | _00_PMn2_MODE_OUTPUT | _00_PMn3_MODE_OUTPUT | _00_PMn4_MODE_OUTPUT | _E0_PM1_DEFAULT; - PM2 = _01_PMn0_NOT_USE | _02_PMn1_NOT_USE | _00_PMn2_MODE_OUTPUT | _00_PMn3_MODE_OUTPUT | _F0_PM2_DEFAULT; + PM2 = _01_PMn0_MODE_INPUT | _02_PMn1_MODE_INPUT | _00_PMn2_MODE_OUTPUT | _00_PMn3_MODE_OUTPUT | _F0_PM2_DEFAULT; PM4 = _01_PMn0_NOT_USE | _00_PMn1_MODE_OUTPUT | _00_PMn2_MODE_OUTPUT | _F8_PM4_DEFAULT; } diff --git a/r_cg_port.h b/r_cg_port.h index 7ff48c3..89e2dfe 100644 --- a/r_cg_port.h +++ b/r_cg_port.h @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for PORT module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ #ifndef PORT_H diff --git a/r_cg_port_user.c b/r_cg_port_user.c index 14974dd..61653e1 100644 --- a/r_cg_port_user.c +++ b/r_cg_port_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for PORT module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/r_cg_serial.c b/r_cg_serial.c index ca778d6..5a2845b 100644 --- a/r_cg_serial.c +++ b/r_cg_serial.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for Serial module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/r_cg_serial.h b/r_cg_serial.h index 7036740..69ed97d 100644 --- a/r_cg_serial.h +++ b/r_cg_serial.h @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for Serial module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ #ifndef SERIAL_H diff --git a/r_cg_serial_user.c b/r_cg_serial_user.c index d6db59c..03fb0a2 100644 --- a/r_cg_serial_user.c +++ b/r_cg_serial_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for Serial module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/r_cg_timer.c b/r_cg_timer.c index db06572..218dbe9 100644 --- a/r_cg_timer.c +++ b/r_cg_timer.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for TAU module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** @@ -81,23 +81,12 @@ void R_TAU0_Create(void) /* Set INTTM00 low priority */ TMPR100 = 1U; TMPR000 = 1U; - /* Set INTTM01 low priority */ - TMPR101 = 1U; - TMPR001 = 1U; /* Channel 0 used as interval timer */ TMR00 = _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; TDR00 = _5DBF_TAU_TDR00_VALUE; TO0 &= ~_0001_TAU_CH0_OUTPUT_VALUE_1; TOE0 &= ~_0001_TAU_CH0_OUTPUT_ENABLE; - /* Channel 1 used as interval timer */ - TMR01 = _0000_TAU_CLOCK_SELECT_CKM0 | _0000_TAU_CLOCK_MODE_CKS | _0000_TAU_16BITS_MODE | - _0000_TAU_TRIGGER_SOFTWARE | _0000_TAU_MODE_INTERVAL_TIMER | _0000_TAU_START_INT_UNUSED; - TDR01 = _5DBF_TAU_TDR01_VALUE; - TOM0 &= ~_0002_TAU_CH1_OUTPUT_COMBIN; - TOL0 &= ~_0002_TAU_CH1_OUTPUT_LEVEL_L; - TO0 &= ~_0002_TAU_CH1_OUTPUT_VALUE_1; - TOE0 &= ~_0002_TAU_CH1_OUTPUT_ENABLE; } /*********************************************************************************************************************** @@ -127,32 +116,5 @@ void R_TAU0_Channel0_Stop(void) TMIF00 = 0U; /* clear INTTM00 interrupt flag */ } -/*********************************************************************************************************************** -* Function Name: R_TAU0_Channel1_Start -* Description : This function starts TAU0 channel 1 counter. -* Arguments : None -* Return Value : None -***********************************************************************************************************************/ -void R_TAU0_Channel1_Start(void) -{ - TMIF01 = 0U; /* clear INTTM01 interrupt flag */ - TMMK01 = 0U; /* enable INTTM01 interrupt */ - TS0 |= _0002_TAU_CH1_START_TRG_ON; -} - -/*********************************************************************************************************************** -* Function Name: R_TAU0_Channel1_Stop -* Description : This function stops TAU0 channel 1 counter. -* Arguments : None -* Return Value : None -***********************************************************************************************************************/ -void R_TAU0_Channel1_Stop(void) -{ - TT0 |= _0002_TAU_CH1_STOP_TRG_ON; - /* Mask channel 1 interrupt */ - TMMK01 = 1U; /* disable INTTM01 interrupt */ - TMIF01 = 0U; /* clear INTTM01 interrupt flag */ -} - /* Start user code for adding. Do not edit comment generated here */ /* End user code. Do not edit comment generated here */ diff --git a/r_cg_timer.h b/r_cg_timer.h index 94aec4d..aded12b 100644 --- a/r_cg_timer.h +++ b/r_cg_timer.h @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for TAU module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ #ifndef TAU_H @@ -298,10 +298,6 @@ Macro definitions #define _5DBF_TAU_TDR00_VALUE (0x5DBFU) /* Clock divisor for TAU0 channel 0 */ #define _0001_TAU0_CHANNEL0_DIVISOR (0x0001U) -/* 16-bit timer data register 01 (TDR01) */ -#define _5DBF_TAU_TDR01_VALUE (0x5DBFU) -/* Clock divisor for TAU0 channel 1 */ -#define _0001_TAU0_CHANNEL1_DIVISOR (0x0001U) /*********************************************************************************************************************** Typedef definitions @@ -313,8 +309,6 @@ Global functions void R_TAU0_Create(void); void R_TAU0_Channel0_Start(void); void R_TAU0_Channel0_Stop(void); -void R_TAU0_Channel1_Start(void); -void R_TAU0_Channel1_Stop(void); /* Start user code for function. Do not edit comment generated here */ /* End user code. Do not edit comment generated here */ diff --git a/r_cg_timer_user.c b/r_cg_timer_user.c index 5f877c0..b8b2a7b 100644 --- a/r_cg_timer_user.c +++ b/r_cg_timer_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for TAU module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** @@ -40,7 +40,6 @@ Includes Pragma directive ***********************************************************************************************************************/ #pragma interrupt r_tau0_channel0_interrupt(vect=INTTM00) -#pragma interrupt r_tau0_channel1_interrupt(vect=INTTM01) /* Start user code for pragma. Do not edit comment generated here */ /* End user code. Do not edit comment generated here */ @@ -63,17 +62,5 @@ static void __near r_tau0_channel0_interrupt(void) /* End user code. Do not edit comment generated here */ } -/*********************************************************************************************************************** -* Function Name: r_tau0_channel1_interrupt -* Description : This function is INTTM01 interrupt service routine. -* Arguments : None -* Return Value : None -***********************************************************************************************************************/ -static void __near r_tau0_channel1_interrupt(void) -{ - /* Start user code. Do not edit comment generated here */ - /* End user code. Do not edit comment generated here */ -} - /* Start user code for adding. Do not edit comment generated here */ /* End user code. Do not edit comment generated here */ diff --git a/r_cg_userdefine.h b/r_cg_userdefine.h index 89c676c..c549e0a 100644 --- a/r_cg_userdefine.h +++ b/r_cg_userdefine.h @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file includes user definition. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ #ifndef _USER_DEF_H diff --git a/r_cg_wdt.c b/r_cg_wdt.c index 5ff21bf..5b43ee0 100644 --- a/r_cg_wdt.c +++ b/r_cg_wdt.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for WDT module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/r_cg_wdt.h b/r_cg_wdt.h index 0bf859c..99163f4 100644 --- a/r_cg_wdt.h +++ b/r_cg_wdt.h @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for WDT module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ #ifndef WDT_H diff --git a/r_cg_wdt_user.c b/r_cg_wdt_user.c index 70eb731..f1fa65e 100644 --- a/r_cg_wdt_user.c +++ b/r_cg_wdt_user.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements device driver for WDT module. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** diff --git a/r_main.c b/r_main.c index ef33b63..626a703 100644 --- a/r_main.c +++ b/r_main.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements main function. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** @@ -33,7 +33,6 @@ Includes #include "r_cg_cgc.h" #include "r_cg_port.h" #include "r_cg_serial.h" -#include "r_cg_adc.h" #include "r_cg_timer.h" #include "r_cg_wdt.h" /* Start user code for include. Do not edit comment generated here */ diff --git a/r_systeminit.c b/r_systeminit.c index 8a868e1..a220cbb 100644 --- a/r_systeminit.c +++ b/r_systeminit.c @@ -23,7 +23,7 @@ * Device(s) : R5F10268 * Tool-Chain : CCRL * Description : This file implements system initializing function. -* Creation Date: 2023-10-05 +* Creation Date: 2024-05-24 ***********************************************************************************************************************/ /*********************************************************************************************************************** @@ -33,7 +33,6 @@ Includes #include "r_cg_cgc.h" #include "r_cg_port.h" #include "r_cg_serial.h" -#include "r_cg_adc.h" #include "r_cg_timer.h" #include "r_cg_wdt.h" /* Start user code for include. Do not edit comment generated here */ @@ -65,7 +64,6 @@ void R_Systeminit(void) R_CGC_Create(); R_PORT_Create(); R_SAU0_Create(); - R_ADC_Create(); R_TAU0_Create(); R_WDT_Create(); IAWCTL = 0x00U;