From 0e77e5cb04f1a6a5d3e134a59414b4ceae567554 Mon Sep 17 00:00:00 2001 From: n2232 Date: Wed, 20 Oct 2010 01:48:32 +0000 Subject: [PATCH] =?UTF-8?q?twl=E3=81=AE=E9=9F=B3=E9=87=8F=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB=E3=80=81=E5=89=B2?= =?UTF-8?q?=E3=82=8A=E8=BE=BC=E3=81=BF=E3=82=92=E5=85=A5=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E3=83=AC=E3=83=99=E3=83=AB=E3=82=92=E9=96=93=E9=81=95=E3=81=88?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=20wdt=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AE=E5=AE=9F=E8=A3=85=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?= =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E6=B0=97=E3=81=8C=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=81=A7=E3=80=82=E3=80=80=E3=82=B3=E3=83=9E?= =?UTF-8?q?=E3=83=B3=E3=83=89=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BF=E5=BE=8C?= =?UTF-8?q?=E3=80=81=E6=95=B0=E7=A7=92=E5=BE=85=E3=81=9F=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=BE=E3=81=99=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@247 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/renge/renge_task_immediate.h | 2 +- trunk/self_flash.c | 2 +- trunk/task_misc.c | 2 +- trunk/vreg_ctr.c | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/trunk/renge/renge_task_immediate.h b/trunk/renge/renge_task_immediate.h index 9d64945..374960b 100644 --- a/trunk/renge/renge_task_immediate.h +++ b/trunk/renge/renge_task_immediate.h @@ -4,7 +4,7 @@ #include "renge_defs.h" // ************************************* -#define TASK_IMMED_RUN_LIST_MAX 14 +#define TASK_IMMED_RUN_LIST_MAX 16 extern task_status_immed tski_do_command0( ); diff --git a/trunk/self_flash.c b/trunk/self_flash.c index 6921ec7..b54c73e 100644 --- a/trunk/self_flash.c +++ b/trunk/self_flash.c @@ -554,7 +554,7 @@ task_status_immed tski_mcu_reset() FSL_Close( ); // 保険? // -// mcu_wdt_reset; // WDTで再起動(テスト向け) + mcu_wdt_reset; return( ERR_SUCCESS ); // no reach } diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 17eb2c6..e54c78f 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -53,7 +53,7 @@ u8 vol_twl_readed; // // twl の8段階volのリニア値からの境界 const u8 TWL_VOL_BOUNDARY[] = { - 0, 1, 6, 11, 16, 21, 26, 31 + 0, 2, 6, 11, 16, 21, 26, 31 }; diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 0da5ff4..c9cfcd6 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -312,7 +312,11 @@ void vreg_ctr_write( u8 adrs, u8 data ) #ifdef _ENABLE_WDT_TEST_ case ( 'w' ): // WDTで再起動(テスト向け) - mcu_wdt_reset; + while(1) + { + NOP(); + } +// mcu_wdt_reset; // このコマンド使ったら意味ないでしょ! break; #endif }