From 8c6c8a0acc9ed804d488cb827d294a350561d8fe Mon Sep 17 00:00:00 2001 From: n2232 Date: Fri, 15 Oct 2010 06:41:58 +0000 Subject: [PATCH] =?UTF-8?q?=EF=BC=88=E6=A9=9F=E8=83=BD=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=EF=BC=89=E4=BD=93=E9=A8=93=E5=8F=B0=E5=AF=BE=E5=BF=9C=20?= =?UTF-8?q?=EF=BC=88=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4=EF=BC=89RTC?= =?UTF-8?q?=E3=82=A2=E3=83=A9=E3=83=BC=E3=83=A0=E3=81=A7=E9=9B=BB=E6=BA=90?= =?UTF-8?q?=E3=82=92=E5=85=A5=E3=82=8C=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@243 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/bsr_system.h | 5 +-- trunk/config.h | 4 +- trunk/hoge.bin | Bin 16387 -> 16387 bytes trunk/led.c | 1 + trunk/loader.c | 15 ++++++++ trunk/main.c | 1 - trunk/renge/renge.c | 2 +- trunk/renge/renge.h | 2 +- trunk/rtc.c | 13 +------ trunk/rtc.h | 2 +- trunk/task_sys.c | 34 ++++++++++------- trunk/yav_mcu_bsr.prj | 83 +++++++++++++++++++++--------------------- trunk/yav_mcu_bsr.prk | 23 ++++++------ 13 files changed, 97 insertions(+), 88 deletions(-) diff --git a/trunk/bsr_system.h b/trunk/bsr_system.h index 2631114..32aff94 100644 --- a/trunk/bsr_system.h +++ b/trunk/bsr_system.h @@ -17,9 +17,7 @@ enum pwr_state_ enum poweron_reason_ { NONE = 0, - PWSW, - RTC_ALARM, - EXT_POWER + PWSW }; @@ -43,6 +41,7 @@ typedef struct _system_status_ unsigned char info_fullcolor:1; unsigned char force_off:1; unsigned char captureBox:1; // キャプチャ箱 SDKには実機と返す + unsigned char taikendai:1; enum model_ model; }system_status_; diff --git a/trunk/config.h b/trunk/config.h index de4f9f3..09e3aaa 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -10,10 +10,10 @@ //#define _DBG_FORCE_FULLCOLOR_ //#define _PMIC_TEST_ //#define _ENABLE_WDT_TEST_ -//#define _TAIKENDAI_ +#define _FORCE_TAIKENDAI_ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x09 +#define MCU_VER_MINOR 10 #define _firm_format_v3_ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index 0f38753a42d16da89a084eab5ec12835a31246b8..69d2c335c7ba5053e16b836f94f2ade103caa1ab 100644 GIT binary patch delta 4081 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 Xwz1>(?s>JEW|ThfW$oldFO&Tbq18&= delta 4067 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 diff --git a/trunk/led.c b/trunk/led.c index 3bed32a..857ccc5 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -9,6 +9,7 @@ #include "led.h" + // ======================================================== // TPS0 #define BIT_PRS012 ( 1 << 2 ) diff --git a/trunk/loader.c b/trunk/loader.c index 5acdd72..5bafdfc 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -135,6 +135,21 @@ void main( ) } } + // 試遊台判定 + // デバッガつないでると上手に判定できないことがあります。 +#ifndef _FORCE_TAIKENDAI_ + if( !P4.1 ) +#else + if(1) +#endif + { + system_status.taikendai = 1; + } + else + { + system_status.taikendai = 0; + } + // 通常運転 main_loop( ); } diff --git a/trunk/main.c b/trunk/main.c index d9b8d0e..c3c05c1 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -29,7 +29,6 @@ uni_pool pool; ======================================================== */ void main_loop( void ) { - // 電池投入時、ファームアップデート後のみ RTC_init( ); // 内部でリブートか判定しています diff --git a/trunk/renge/renge.c b/trunk/renge/renge.c index 8d44de2..1c5eedc 100644 --- a/trunk/renge/renge.c +++ b/trunk/renge/renge.c @@ -137,7 +137,7 @@ void renge_task_immed_init(){ 逐次実行タスクの登録 割り込み禁止 36us → **************************************/ -err renge_task_immed_add( task_status_immed* new_task ){ +err renge_task_immed_add( task_status_immed (*new_task)() ){ u8 i; // リストの空きの先頭に登録 diff --git a/trunk/renge/renge.h b/trunk/renge/renge.h index bd7c5ae..b029eb9 100644 --- a/trunk/renge/renge.h +++ b/trunk/renge/renge.h @@ -14,7 +14,7 @@ void renge_init(); void renge_task_immed_init(); err renge_task_immed_run(); -err renge_task_immed_add( task_status_immed* ); +err renge_task_immed_add( task_status_immed (*p_task_func)() ); // static err renge_task_immed_del( u8 ); diff --git a/trunk/rtc.c b/trunk/rtc.c index 19332dd..0b89d3c 100644 --- a/trunk/rtc.c +++ b/trunk/rtc.c @@ -78,18 +78,7 @@ __interrupt void int_rtc( ) && ( vreg_ctr[VREG_C_RTC_ALARM_MONTH] == MONTH ) && ( vreg_ctr[VREG_C_RTC_ALARM_YEAR] == YEAR ) ) { - if( ( vreg_ctr[VREG_C_IRQ_MASK1] & REG_BIT_RTC_ALARM ) == 0 ) - { - vreg_ctr[VREG_C_IRQ1] |= REG_BIT_RTC_ALARM; - IRQ0_ast; - // マスクをしてあったら、電源を入れません - if(( system_status.pwr_state == BT_CHARGE ) || - ( system_status.pwr_state == OFF )) - { - system_status.poweron_reason = RTC_ALARM; - system_status.pwr_state = OFF; - } - } + set_irq( VREG_C_IRQ1, REG_BIT_RTC_ALARM ); } RWAIT = 0; } diff --git a/trunk/rtc.h b/trunk/rtc.h index cd1a0f7..f189a89 100644 --- a/trunk/rtc.h +++ b/trunk/rtc.h @@ -4,7 +4,7 @@ void RTC_init( void ); void rtc_buf_reflesh( ); -void set_rtc( ); +void set_rtc( u8 adrs, u8 data ); //task_status_immed tski_rtc_close(); void rtc_unlock( ); diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 0d4f052..4b42945 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -243,12 +243,14 @@ void tsk_sys( ) // 強制offカウント force_off_check(); -#ifdef _TAIKENDAI_ - if( PM_EXTDC_n ) + if( system_status.taikendai ) { - system_status.pwr_state = OFF_TRIG; + if( PM_EXTDC_n ) + { + system_status.pwr_state = OFF_TRIG; + } } -#endif + break; case SLEEP: //------------------------------------------ @@ -263,12 +265,13 @@ void tsk_sys( ) force_off_check(); -#ifdef _TAIKENDAI_ - if( PM_EXTDC_n ) + if( system_status.taikendai ) { - system_status.pwr_state = OFF_TRIG; + if( PM_EXTDC_n ) + { + system_status.pwr_state = OFF_TRIG; + } } -#endif break; case OFF_TRIG: //--------------------------------------- @@ -369,12 +372,14 @@ void tsk_sys( ) { iic_mcu_stop( ); } -#ifdef _TAIKENDAI_ + + if( system_status.taikendai ) + { // 電源投入 wait_ms(46); system_status.poweron_reason = PWSW; system_status.pwr_state = OFF; -#endif + } } else { @@ -428,9 +433,12 @@ void tsk_sys( ) # endif RTCIMK = 0; system_status.pwr_state = OFF; -#ifdef _TAIKENDAI_ - system_status.pwr_state = OFF_TRIG; -#endif + + if( system_status.taikendai ) + { + system_status.pwr_state = OFF_TRIG; + } + } return; diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 145c625..05d3d2a 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -1,12 +1,12 @@ [ProjectManager] Version=6.00 -Path=D:\MyDocuments\workspace\mcufirm_RED\trunk\ +Path=C:\78k_data\yav-mcu-basara\trunk\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 DeviceVer=E1.00b DebugMode=1 -Target=D:\MyDocuments\workspace\mcufirm_RED\trunk\bsr.lmf +Target=C:\78k_data\yav-mcu-basara\trunk\bsr.lmf [BuildMode0] BuildModeName=Debug Build TargetFile=0 @@ -15,13 +15,13 @@ BuildModeName=Release Build TargetFile=0 [Tools] MakeFile=yav_mcu_bsr.mak -Debugger=D:\Program Files\NEC Electronics Tools\ID78K0R-QB\E3.60f\BIN\IDK0R32G.EXE +Debugger=C:\Program Files\NEC Electronics Tools\ID78K0R-QB\E3.60f\BIN\IDK0R32G.EXE DebOption= DebCpuReset=1 DebSymReset=1 MuitiLoad=0 LoadPrjNum=0 -CheckVersion=CC78K0R|W2.12;RA78K0R|W1.33 +CheckVersion=CC78K0R|W2.10;RA78K0R|W1.31 [Option.IDK0R32G] File=yav_mcu_bsr.pri [BuildMode2] @@ -713,6 +713,37 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[Options.LCNV78K0R 0] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 1] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 2] +Version=100 +LCNV_GO=0 +O0=inter_asm +E=0 +CommandFile=0 +[Options.LCNV78K0R 3] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 4] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 5] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -830,7 +861,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=D:\MyDocuments\workspace\mcufirm_RED\trunk\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara\trunk\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf @@ -964,37 +995,6 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -[Options.LCNV78K0R 0] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 1] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 2] -Version=100 -LCNV_GO=0 -O0=inter_asm -E=0 -CommandFile=0 -[Options.LCNV78K0R 3] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 4] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 5] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 [Options.78K0R] BuildMode=2 BuildMode2=K0R_dbg @@ -1007,10 +1007,9 @@ DefaultMode4=1 DefaultMode5=1 [ToolSet] ToolSetName=(変更)78K0R Software Package V1.10 -Tool1=CC78K0R|W2.12 -Tool2=RA78K0R|W1.33 -Tool3=SK78K0R|V3.10 -Tool4=ID78K0R-QB|E3.60f +Tool1=CC78K0R|W2.10 +Tool2=RA78K0R|W1.31 +Tool3=ID78K0R-QB|E3.60f [IncFile] Include1=incs_loader.h Include2=jhl_defs.h @@ -1045,5 +1044,5 @@ Include30=pool.h Include31=pedo_lpf_coeff.h Include32=voltable.h Include33=magic.h -Include34=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h -Include35=..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.12\inc78k0r\math.h +Include34=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +Include35=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 086e671..05a7676 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -5,19 +5,18 @@ FrameY=115 FrameCX=1200 FrameCY=854 OpenFile1=jhl_defs.h,0,286,286,1530,1012,0,15,26,0 -OpenFile2=i2c_mcu.c,0,330,330,1574,1056,24,552,28,0 -OpenFile3=ProjectWindow +OpenFile2=ProjectWindow PrjPos=0,0,1039,0,345 -OpenFile4=self_flash.c,0,352,352,1596,1078,0,142,5,0 -OpenFile5=ini_VECT.c,0,330,330,1574,1056,6,93,6,0 -OpenFile6=config.h,0,220,220,1464,946,29,16,29,0 -OpenFile7=magic.c,0,242,242,1486,968,0,11,0,0 -OpenFile8=renge\renge.c,0,348,332,1592,1058,31,143,54,0 -OpenFile9=loader.c,0,264,264,1508,990,5,195,25,0 -OpenFile10=batt_params.h,0,352,352,1596,1078,0,83,0,0 -OpenFile11=pm.c,0,286,286,1530,1012,0,1078,0,0 -OpenFile12=vreg_ctr.c,0,308,308,1552,1034,9,148,64,0 -OpenFile13=OutputWindow +OpenFile3=self_flash.c,0,352,352,1596,1078,0,142,5,0 +OpenFile4=ini_VECT.c,0,330,330,1574,1056,6,93,6,0 +OpenFile5=config.h,0,220,220,1464,946,29,16,29,0 +OpenFile6=renge\renge.c,0,348,332,1592,1058,31,143,54,0 +OpenFile7=vreg_ctr.c,0,330,330,1574,1056,0,123,0,0 +OpenFile8=loader.c,0,264,264,1508,990,0,122,95,0 +OpenFile9=pm.c,0,352,352,1596,1078,0,853,0,0 +OpenFile10=i2c_mcu.c,0,330,330,1574,1056,0,205,28,0 +OpenFile11=led.c,0,0,0,1244,726,68,109,68,0 +OpenFile12=OutputWindow OutputPos=0,3,734,347,1591 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow]