From 43466f31cd953ca2dee63e0e346eda206bf416d4 Mon Sep 17 00:00:00 2001 From: n2232 Date: Wed, 13 Jun 2012 02:16:56 +0000 Subject: [PATCH] =?UTF-8?q?RBR=E3=81=AE=E5=AF=BE=E5=BF=9C=E3=82=92?= =?UTF-8?q?=E6=9A=AB=E5=AE=9A=E5=AF=BE=E7=AD=96=E3=81=94=E3=81=A8=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=80=82?= 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@460 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/VCProj/bsr_trunk.sdf | Bin 2248704 -> 2248704 bytes trunk/VCProj/bsr_trunk.suo | Bin 74752 -> 75776 bytes trunk/loader.c | 2 +- trunk/task_misc.c | 2 -- trunk/task_sys.c | 8 -------- trunk/user_define.h | 5 ++--- trunk/vreg_ctr.c | 27 +++++---------------------- trunk/vreg_ctr.h | 2 +- 8 files changed, 9 insertions(+), 37 deletions(-) diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf index 9b0bee7a66d50edd40248862dee200c7ccef411e..1c815f89122d9411fa146119438695b4023d7f38 100644 GIT binary patch delta 12393 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

GS1= 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 diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo index bf9192d509f9177522831321357f2b069eea51d8..a26d8ef56e616ccb1a5b2d36f610d93a991f06b1 100644 GIT binary patch delta 2167 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 AnE(I) diff --git a/trunk/loader.c b/trunk/loader.c index 1fd6f50..009e093 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -287,7 +287,7 @@ static void hdwinit2( ) // リセット後の初期値0が保証されているのは省略 // P0 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,-, -,-,/reset2,/reset1 // P1 = bits8(0,0,0,0, 0,0,0,0); // bt_temp_p,bt_det_p,led_info_r,led_pow_b led_info_g,32khz_o,led_wifi,led_info_b -// P2 = bits8(0,0,0,0, 0,0,0,0); // ad_vol,ad_3d,acc_int1,led_chg, (sw_sel),(rbr_flight),(/rbr_rst),(ext_vdd33) +// P2 = bits8(0,0,0,0, 0,0,0,0); // ad_vol,ad_3d,acc_int1,led_chg, (sw_sel),(-),(-),(ext_vdd33) P3 = bits8(0,0,0,0, 1,1,1,0); // -,-,-,-, i2c_pu,scl_m,sda_m,/fcr_rst // 簡易I2Cは出力ラッチを1にする // P6 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,-, -,-,sda2,scl2 // P7 = bits8(0,0,0,0, 0,0,0,0); // slp_o,/irq,led_cam,sw_wifi, sw_pow,pm_irw,shell_close,/extdc diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 7c01f14..f13e0da 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -385,12 +385,10 @@ u8 extinfo_read(void) infos_temp[3] = 1; /* 仕様変更により1固定になった */ infos_temp[4] = 0 // | ( PM_EXTDC_n ? REG_BIT_HAL0_PM_EXTDC_n : 0 ) // status0にある - | ( RBR_RESET_n ? REG_BIT_HAL0_PM_EXTDC_n : 0 ) // ↑空きを使わせてもらう | ( BT_IN_CHG_n ? REG_BIT_HAL0_BT_IN_CHG_n : 0 ) | ( BT_CHG_Ena_n ? REG_BIT_HAL0_RSV_5 : 0 ) // 空きビット使用,out pin | 0 // WL_TX 使えない // | ( SHELL_OPEN ? REG_BIT_HAL0_SHELL_OPEN : 0 ) // status0にある - | ( RBR_FLIGHT ? REG_BIT_HAL0_SHELL_OPEN : 0 ) // ↑空きを使わせてもらう | ( SW_WIFI_n ? REG_BIT_HAL0_SW_WIFI_n : 0 ) | ( SW_HOME_n ? REG_BIT_HAL0_SW_HOME_n : 0 ) | ( SW_POW_n ? REG_BIT_HAL0_SW_POW_n : 0 ); diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 35ab583..9fff2ea 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -221,10 +221,6 @@ void tsk_sys( ) // PMK21 = 0; // wifi 使わない PMK6 = 0; // pm_irq - // todo 将来的には完全にレジスタ制御に - RBR_RESET_n = 1; - RBR_FLIGHT = 0; - // リブート時、ステータスを何となく更新 if( system_status.reboot ) { @@ -345,10 +341,6 @@ void tsk_sys( ) IIC_twl_Stop( ); RTC_32k_off(); - // todo マクロにでもする - RBR_RESET_n = 0; - RBR_FLIGHT = 0; - // 電源オン条件の割り込みセット // PWSW KR3 押すとL // BG24 KR4 diff --git a/trunk/user_define.h b/trunk/user_define.h index f6d8ea1..8215bff 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -125,9 +125,8 @@ #define WL_TX P20.3 // INTP21 // F3 #define PM_WL_TX PM20.3 // INTP21 -// RBR制御 -#define RBR_RESET_n P2.1 // E5 -#define RBR_FLIGHT P2.2 // F5 +//#define VOL_P P2.1 // E5 現状open +//#define VOL_N P2.2 // F5 〃 //#define LED_CAM P1.0 // TO02 // E4 //#define LED_WIFI P1.1 // TO03 // E3 diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 5d4b915..b238e33 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -68,8 +68,6 @@ void vreg_ctr_init( ) vreg_ctr[ VREG_C_VOL_CAL_MIN ] = 0x36; vreg_ctr[ VREG_C_VOL_CAL_MAX ] = 0xFF - 0x36; - - vreg_ctr[ VREG_C_RBR_CONTROL ] = REG_BIT_RESET_n; // todo | REG_BIT_FLIGHT; } @@ -317,26 +315,6 @@ void vreg_ctr_write( u8 adrs, u8 data ) vreg_free_adrs = data; break; - case ( VREG_C_RBR_CONTROL ): - if(( data & REG_BIT_RESET_n ) != 0 ) - { - RBR_RESET_n = 1; - } - else - { - RBR_RESET_n = 0; - } - if(( data & REG_BIT_FLIGHT ) != 0 ) - { - RBR_FLIGHT = 1; - } - else - { - RBR_FLIGHT = 0; - } - vreg_ctr[ VREG_C_RBR_CONTROL ] = data; - break; - case ( VREG_C_COMMAND3 ): switch ( data ) { @@ -369,6 +347,11 @@ void vreg_ctr_write( u8 adrs, u8 data ) // vreg_ctr[ VREG_C_COMMAND3 ] = data; // 書く必要なし break; + case ( VREG_C_RBR_CONTROL ): + vreg_ctr[ VREG_C_RBR_CONTROL ] = data; // todo debug ブレークポイントを置くため。現状、フリーレジスタ + break; + + // read only ////////////////////////////////////////// case VREG_C_MCU_VER_MAJOR: case VREG_C_MCU_VER_MINOR: diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index 9e0b11e..ef15ba6 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -223,7 +223,7 @@ enum VREG_C_ADRS VREG_C_LED_NOTIFY_DATA, VREG_C_LED_NOTIFY_FLAG, - VREG_C_RBR_CONTROL = 0x2F, + VREG_C_RBR_CONTROL = 0x2F, // 廃止 VREG_C_RTC_SEC = 0x30, VREG_C_RTC_MIN,