0.1C

電源off時にmcu_irqをLに落とし忘れていた reset2でtwl側のsysmodeを0クリアするように変更、CTR側からはR onlyに。無駄なプルアップ設定を修正(PU5.0) git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@191 013db118-44a6-b54f-8bf7-843cb86687b1
2025-10-31 13:51:10 -04:00 · 2010-06-11 00:06:00 +00:00 · 2010-06-11 00:06:00 +00:00 · 28ee4ed10a
commit 28ee4ed10a
parent e7f6124f7a
9 changed files with 78 additions and 106 deletions
--- a/trunk/config.h
+++ b/trunk/config.h
@ -8,7 +8,7 @@
 //#define _debug_bt_irq_

 #define MCU_VER_MAJOR    0x00
-#define MCU_VER_MINOR    0x1B
+#define MCU_VER_MINOR    0x1C

 //#define PM_CCIC_TIM

--- a/trunk/loader.c
+++ b/trunk/loader.c
@ -268,7 +268,7 @@ void hdwinit2(  )
    PU1 = 0b00000000;
    PU3 = 0b00000000;          // 外部でプルアップしないと具合が悪い。CPUがプルアップする
    PU4 = 0b00000000;          // 外部でプルアップしてほしいtool0,1)
-    PU5 = 0b00000011;
+    PU5 = 0b00000010;
    PU7 = 0b00011001;
    PU12 = 0b00000000;
    PU14 = 0b00000000;
--- a/trunk/pm.c
+++ b/trunk/pm.c
@ -242,7 +242,7 @@ err PM_sys_pow_on(  )
 //    PM_reset_ast(  );       不要 PM_LDSW_onまかせ
    RESET2_ast;
    FCRAM_RST_ast;
-    GYRO_CS_DISABLE();
+    GYRO_DISABLE();

    PM_LDSW_on(  );

@ -252,9 +252,9 @@ err PM_sys_pow_on(  )

    PM_VDD_normMode();
    PM_VDD_on(  );
-//    wait_ms( DELAY_PM_TW_PWUP );   // gyro_csを挟むため
+//    wait_ms( DELAY_PM_TW_PWUP );   // GYROを挟むため
    wait_ms( 10 );
-    GYRO_CS_ENABLE();
+    GYRO_ENABLE();
    wait_ms( DELAY_PM_TW_PWUP - 10 );

    PM_VDD50A_on(  );  // 液晶電源ではなく、ledとかに使うものです
--- a/trunk/task_misc.c
+++ b/trunk/task_misc.c
@ -179,6 +179,7 @@ task_status_immed do_command0(  )
            else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET2_REQ )
            {
                RESET2_ast;
+                vreg_twl[ REG_TWL_INT_ADRS_MODE ] &= ~0x03;
            }
            wait_ms( 5 );
            FCRAM_RST_neg;
--- a/trunk/task_sys.c
+++ b/trunk/task_sys.c
@ -294,6 +294,8 @@ void tsk_sys(  )
        IF1 = 0;
        IF2 = 0;

+        IRQ0_disable;
+
        PM_sys_pow_off(  );
        BT_set_relax_timer();

--- a/trunk/user_define.h
+++ b/trunk/user_define.h
@ -55,8 +55,9 @@
 #endif
 #ifdef _MODEL_CTR_
 #define IRQ0_ast            { P7.6 = 0; PM7.6 = 0; }
-//#define IRQ0_neg            { PM7.6 = 1; }
 #define IRQ0_neg            { P7.6 = 1; }
+#define IRQ0_enable         { PM7.6 = 0; }
+#define IRQ0_disable        { PM7.6 = 1; }
 #define IRQ0              ( P7.6 )
 #endif

@ -185,11 +186,11 @@
 #endif

 #ifdef _MODEL_CTR_
-#define GYRO_CS_ENABLE()     P5.0 = 0
-#define GYRO_CS_DISABLE()    P5.0 = 1
+#define GYRO_ENABLE()     P5.0 = 0
+#define GYRO_DISABLE()    P5.0 = 1
 #else
-#define GYRO_CS_ENABLE()     ;
-#define GYRO_CS_DISABLE()    ;
+#define GYRO_ENABLE()     ;
+#define GYRO_DISABLE()    ;
 #endif

 //#define I2C_M_SDA            P3.1      // SDA10
--- a/trunk/yav_mcu_bsr.pri
+++ b/trunk/yav_mcu_bsr.pri
@ -78,10 +78,10 @@ Symbol Type=OFF
 Language=C
 Kanji=SJIS
 [Source]
-Geometry=81, 63, 844, 790
+Geometry=27, 79, 844, 790
 Window=Normal
-DispStart=267
-CaretPos=319,0
+DispStart=355
+CaretPos=356,0
 Mode=Normal
 DispFile=
 Address1=
@ -139,35 +139,11 @@ SaveRange=Screen
 SaveStart=
 SaveEnd=
 Accumulative=ON
-[Source1]
-Geometry=0, 0, 844, 790
-Window=Normal
-DispStart=945
-CaretPos=946,0
-Mode=Normal
-DispFile=pm.c
-Accumulative=ON
-[Source2]
-Geometry=25, 25, 844, 790
-Window=Normal
-DispStart=1
-CaretPos=1,0
-Mode=Normal
-DispFile=task_misc.c
-Accumulative=ON
-[Source3]
-Geometry=50, 50, 844, 790
-Window=Normal
-DispStart=351
-CaretPos=352,0
-Mode=Normal
-DispFile=task_sys.c
-Accumulative=ON
 [Assemble]
 Geometry=282, 92, 968, 626
 Window=Normal
-DispStart=15201
-CaretPos=15201,27
+DispStart=16807
+CaretPos=16807,27
 Address1=
 Address2=
 Address3=
@ -280,8 +256,8 @@ Window=Hide
 Boundary=0
 Mode=Proper
 [Sfr]
-Geometry=613, 51, 596, 915
-Window=Hide
+Geometry=512, 0, 596, 915
+Window=Normal
 Address1=
 Address2=
 Address3=
@ -298,13 +274,13 @@ Address13=
 Address14=
 Address15=
 Address16=
-Boundary=0, 0
-Mode=Hex
+Boundary=202, 89
+Mode=Bin
 Attribute=Show
 Sort=Unsort
 Pickup=OFF
 SelectSort=Address
-Last Name=TSR01
+Last Name=P0
 Line=531
 L1=P0
 L2=P1
@ -984,63 +960,56 @@ Count=0
 Geometry=929, 17, 320, 595
 Window=Normal
 Boundary=18088086
-0=.bt_relax_timer,P,N,A,+,1
-1=.bt_remain_old,P,N,A,+,1
-2=.vreg_ctr,P,N,A,+,1
-3=.temp_zone_charge_enable,P,N,A,+,1
-4=.pif4,P,S,A,+,1
-5=.pmk4,P,S,A,+,1
-6=.chg_led_override,P,N,A,+,1
-7=.p4.3,P,S,A,+,1
-8=.PM0.0,P,S,A,+,1
-9=.P0.0,P,S,A,+,1
-10=.system_status,.,N,A,+,1
-11=.battery_manufacturer,P,N,A,+,1
+0=.pu20,P,S,A,+,1
+1=.bt_relax_timer,P,N,A,+,1
+2=.bt_remain_old,P,N,A,+,1
+3=.vreg_ctr,P,N,A,+,1
+4=.temp_zone_charge_enable,P,N,A,+,1
+5=.chg_led_override,P,N,A,+,1
+6=.system_status,.,N,A,+,1
+7=.battery_manufacturer,P,N,A,+,1
+8=.bt_comp,.,N,A,+,1
+9=.raw_adc_temperature,P,N,A,+,1
+10=.PM1.7,P,S,A,+,1
+11=.P1.7,P,S,A,+,1
 12=.bt_comp,.,N,A,+,1
-13=.raw_adc_temperature,P,N,A,+,1
-14=.PM1.7,P,S,A,+,1
-15=.P1.7,P,S,A,+,1
-16=.bt_comp,.,N,A,+,1
-17=.tasks_immed,P,N,A,+,1
-18=.vreg_ctr[2],P,N,A,+,1
-19=.vreg_twl[3],P,N,A,+,1
-20=.cnt_force_off,P,N,A,+,1
-21=.pool.vreg_c_ext,.,N,A,+,1
-22=.p_record,P,N,A,+,1
-23=.temp_hours,P,N,A,+,1
-24=.temp,P,N,A,+,1
-25=.bt_remain_old,P,N,A,+,1
-Line=26
+13=.tasks_immed,P,N,A,+,1
+14=.vreg_ctr[2],P,N,A,+,1
+15=.vreg_twl[3],P,N,A,+,1
+16=.cnt_force_off,P,N,A,+,1
+17=.pool.vreg_c_ext,.,N,A,+,1
+18=.p_record,P,N,A,+,1
+19=.PER2,B,S,A,+,1
+20=.per0,B,S,A,+,1
+21=.bt_relax_timer,P,N,A,+,1
+22=.temp_hours,P,N,A,+,1
+23=.temp,P,N,A,+,1
+24=.pm4,B,S,A,+,1
+25=.p4,B,S,A,+,1
+26=.bt_remain_old,P,N,A,+,1
+Line=27
 [Quick Watch]
-0=system_status,P,A,1
-1=vreg_ctr[11],P,A,1
-2=chg_led_override,P,A,1
-3=temp_zone_charge_enable,P,A,1
-4=bt_chg_ready,P,A,1
-5=pmk04,P,A,1
-6=pmk4,P,A,1
-7=pif4,P,A,1
-8=egn0,P,A,1
-9=p4.3,P,A,1
-10=vreg_ctr,P,A,1
-11=bt_relax_timer,P,A,1
-12=temp,P,A,1
-13=P0.0,P,A,1
-14=PM0.0,P,A,1
-15=bt_remain_old,P,A,1
+0=egn0,P,A,1
+1=p4.3,P,A,1
+2=vreg_ctr,P,A,1
+3=temp,P,A,1
+4=P0.0,P,A,1
+5=PM0.0,P,A,1
+6=bt_remain_old,P,A,1
+7=bt_relax_timer,P,A,1
+8=p4,B,A,1
+9=pm4,B,A,1
+10=per0,P,A,1
+11=per1,B,A,1
+12=PER0,P,A,1
+13=PER2,B,A,1
+14=PER1,P,A,1
+15=pu20,P,A,1
 [Software Break]
 Geometry=408, 387, 756, 532
 Window=Normal
 Width=150 30 200 100
-Name0=Swb00002
-Address0=pm.c#_BT_get_left+0x56
-Window0=ASM
-Status0=ON
-Name1=Swb00003
-Address1=task_sys.c#_chk_emergencyExit+0x0
-Window1=ASM
-Status1=ON
-Count=2
+Count=0
 [Reset]
 Debugger=ON
 Symbol=OFF
--- a/trunk/yav_mcu_bsr.prk
+++ b/trunk/yav_mcu_bsr.prk
@ -9,11 +9,10 @@ OpenFile2=renge\renge_defs.h,0,132,132,1376,889,25,15,25,0
 OpenFile3=renge\\..\jhl_defs.h,0,411,261,1655,1018,10,14,18,0
 OpenFile4=ProjectWindow
 PrjPos=0,2,754,3,253
-OpenFile5=renge\renge.c,0,198,198,1442,955,0,27,0,0
+OpenFile5=renge\renge.c,0,198,198,1442,955,0,24,0,0
 OpenFile6=user_define.h,0,242,242,1486,999,0,1,0,0
-OpenFile7=pm.c,0,264,264,1508,1021,0,1021,25,0
-OpenFile8=config.h,0,154,154,1398,911,29,11,0,0
-OpenFile9=OutputWindow
+OpenFile7=pm.c,0,264,264,1508,1021,5,970,60,0
+OpenFile8=OutputWindow
 OutputPos=0,44,989,1000,1587
 ActivePRJ=yav_mcu_bsr.prj
 [ProjectWindow]
--- a/trunk/yav_mcu_bsr.sdb
+++ b/trunk/yav_mcu_bsr.sdb
@ -1,7 +1,7 @@
 [SdbInfo]
 Ver=5
 [loader.c]
-T=4c04abbf
+T=4c107185
 1=incs_loader.h
 2=fsl.h
 3=fsl_user.h
@ -11,7 +11,7 @@ T=4c04abbf
 7=rtc.h
 8=reboot.h
 [pm.c]
-T=4c0e00b6
+T=4c10707a
 1=incs.h
 2=adc.h
 3=led.h
@ -35,7 +35,7 @@ T=4c0cd4a6
 7=adc.h
 8=pool.h
 [magic.c]
-T=4c0e07ec
+T=4c1073a1
 1=config.h
 [WDT.c]
 T=4bf0d1e1
@ -126,7 +126,7 @@ T=4bfb53e4
 6=i2c_mcu.h
 7=led.h
 [task_sys.c]
-T=4c0dc8dc
+T=4c107614
 1=incs.h
 2=i2c_twl.h
 3=i2c_ctr.h
@ -173,7 +173,7 @@ T=4c075832
 [config.h]
 T=4c0dfdcf
 [user_define.h]
-T=4c03603c
+T=4c107614
 [bsr_system.h]
 T=4c072dc9
 [renge\renge.h]
@ -203,7 +203,7 @@ T=4bf0d1e0
 [i2c_ctr.h]
 T=4bf0d1e1
 [pm.h]
-T=4c072cf1
+T=4c0f33c0
 [rtc.h]
 T=4bf0d1e1
 [reboot.h]
@ -235,7 +235,7 @@ T=4bf0d1e1
 [led.h]
 T=4c072cf1
 [batt_params.h]
-T=4c072cf1
+T=4c0f394b
 [i2c_twl_defs.h]
 T=4bf0d1e1
 [renge\renge_task_intval.h]