rvtr/ctr_mcu
1
Fork 0
mirror of https://github.com/rvtr/ctr_mcu.git synced 2025-06-18 16:45:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

trunk r320をマージ

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@321 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
N2614 2011-02-18 02:57:27 +00:00
parent 31a86caa69
commit 1ae045df55
7 changed files with 89 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
branches/SDK2.0_1NUP/config.h
View File

@ -12,11 +12,17 @@
//#define _ENABLE_WDT_TEST_
//#define _FORCE_TAIKENDAI_
//#define _FORCE_TAIKENDAI_NBD_
//#define _TAIKENDAI_SEISAN_SPECIAL_
// 生産中に体験台向け使用が発症すると、アダプタがないと電源が入らずに検査に支障があるので
// 一時ファーム
#define MCU_VER_MAJOR 0x01
#define MCU_VER_MINOR 0x1C
#define MCU_VER_MINOR 0x1D
#ifdef _TAIKENDAI_SEISAN_SPECIAL_
#define MCU_VER_MINOR 0x80
#endif
#define _firm_format_v3_

BIN
branches/SDK2.0_1NUP/hoge.bin
View File

Binary file not shown.

3
branches/SDK2.0_1NUP/led.c
View File

@ -192,8 +192,9 @@ void LED_init( )
LED_pow_red = 0;
LED_CAM = 0;
LED_old_pow_red = 0;
LED_pow_red_Mirror = 0;
if( system_status.reboot )
if( system_status.reboot )
{
vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO;
LED_duty_pow_blu = LED_BRIGHT_MAX;

6
branches/SDK2.0_1NUP/pedo_alg_thre_det2.c
View File

@ -497,6 +497,7 @@ static unsigned long my_sqrt(unsigned long x)
/* ========================================================
　二つの 前回呼ばれた時刻と、現在時刻の差分を求める。返るのはfill_hosu_hist_hours にそのまま渡せる
//. 引数がyear_bcd なのがちょっといやだけど...
======================================================== */
static u16 calc_hours_spend( u8 year )
{
@ -509,6 +510,11 @@ static u16 calc_hours_spend( u8 year )
{
return( now_longhour - last_hour_fny );
}
else if( now_longhour == 0 && last_hour_fny != 0 )
{
// 年明けたばかりで、境界を越えた一回目。これやらないと昨年最後に加算してしまう。
return( 1 );
}
else
{
return( 0 ); // 同じ時間帯(と、巻き戻り。　どうなっても知らない)

8
branches/SDK2.0_1NUP/task_sys.c
View File

@ -250,13 +250,15 @@ void tsk_sys( )
// 強制offカウント
force_off_check();
if( system_status.taikendai )
#ifndef _TAIKENDAI_SEISAN_SPECIAL_
if( system_status.taikendai ) // アダプタが抜けたら自動で電源off
{
if( PM_EXTDC_n )
{
system_status.pwr_state = OFF_TRIG;
}
}
#endif
break;
@ -272,7 +274,8 @@ void tsk_sys( )
force_off_check();
if( system_status.taikendai )
#ifndef _TAIKENDAI_SEISAN_SPECIAL_
if( system_status.taikendai ) // アダプタが刺さっていたら自動で電源on
{
if( PM_EXTDC_n )
{
@ -280,6 +283,7 @@ void tsk_sys( )
}
}
break;
#endif
default: //---------------------------------------
system_status.pwr_state = OFF_TRIG;

104
branches/SDK2.0_1NUP/yav_mcu_bsr.prj
View File

@ -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 (x86)\NEC Electronics Tools\ID78K0R-QB\V3.61\BIN\IDK0R32G.EXE
DebOption=
DebCpuReset=1
DebSymReset=1
MuitiLoad=0
LoadPrjNum=0
CheckVersion=CC78K0R|W2.12;RA78K0R|W1.33
CheckVersion=CC78K0R|W2.13;RA78K0R|W1.33
[Option.IDK0R32G]
File=yav_mcu_bsr.pri
[BuildMode2]
@ -245,7 +245,7 @@ Source21=pedo_alg_thre_det2.c
Source22=ini_VECT.c
Source23=task_status.c
[BuildBefore-AfterCmd]
Before1=touch magic.c
Before1=c:\cygwin\bin\touch magic.c
After1=ruby nec_s_2_bsrbin2.rb bsr.hex
[Options.CC78K0R 0]
Version=210
@ -400,8 +400,9 @@ Define1=_debug_,_TEG_,proc_is_ke3
Define2=_debug_,_TEG_,proc_is_ke3,%time%
Define3=_TEG_,proc_is_ke3
Define4=proc_is_ke3
Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
Include0=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r
Include1=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
Include2=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
Memorymodel=1
Flashobj=0
FlashStartadr=
@ -713,6 +714,48 @@ VfiFileBoot0=
VfiFileBoot1=boot.vfi
VF78K0Rchk=0
VF78K0Rvs=
[ToolSet]
ToolSetName=(•Ï<E280A2>X)78K0R Software Package V1.10
Tool1=CC78K0R|W2.13
Tool2=RA78K0R|W1.33
Tool3=SK78K0R|V3.10
Tool4=ID78K0R-QB|V3.61
[IncFile]
Include1=incs_loader.h
Include2=jhl_defs.h
Include3=config.h
Include4=user_define.h
Include5=bsr_system.h
Include6=renge\renge.h
Include7=renge\renge_defs.h
Include8=renge\renge_task_immediate.h
Include9=vreg_ctr.h
Include10=vreg_twl.h
Include11=loader.h
Include12=i2c_mcu.h
Include13=WDT.h
Include14=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
Include15=fsl_user.h
Include16=i2c_ctr.h
Include17=pm.h
Include18=rtc.h
Include19=reboot.h
Include20=magic.h
Include21=incs.h
Include22=i2c_twl.h
Include23=accero.h
Include24=pedometer.h
Include25=sw.h
Include26=adc.h
Include27=led.h
Include28=batt_params.h
Include29=pool.h
Include30=i2c_twl_defs.h
Include31=voltable.h
Include32=renge\renge_task_intval.h
Include33=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
Include34=self_flash.h
Include35=pedo_lpf_coeff.h
[Options.LK78K0R 0]
Version=100
O0=bsr_k0r.lmf
@ -819,7 +862,8 @@ KP=0
KL=0
LF=0
LL=0
B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
B0=C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib
B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
@ -830,7 +874,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
@ -1005,45 +1049,3 @@ DefaultMode2=1
DefaultMode3=1
DefaultMode4=1
DefaultMode5=1
[ToolSet]
ToolSetName=(•Ï<E280A2>X)78K0R Software Package V1.10
Tool1=CC78K0R|W2.12
Tool2=RA78K0R|W1.33
Tool3=SK78K0R|V3.10
Tool4=ID78K0R-QB|E3.60f
[IncFile]
Include1=incs_loader.h
Include2=jhl_defs.h
Include3=config.h
Include4=user_define.h
Include5=bsr_system.h
Include6=renge\renge.h
Include7=renge\renge_defs.h
Include8=renge\renge_task_immediate.h
Include9=vreg_ctr.h
Include10=vreg_twl.h
Include11=loader.h
Include12=i2c_mcu.h
Include13=WDT.h
Include14=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
Include15=fsl_user.h
Include16=i2c_ctr.h
Include17=pm.h
Include18=rtc.h
Include19=reboot.h
Include20=magic.h
Include21=incs.h
Include22=i2c_twl.h
Include23=accero.h
Include24=pedometer.h
Include25=sw.h
Include26=adc.h
Include27=led.h
Include28=batt_params.h
Include29=pool.h
Include30=i2c_twl_defs.h
Include31=voltable.h
Include32=renge\renge_task_intval.h
Include33=..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.12\inc78k0r\math.h
Include34=self_flash.h
Include35=pedo_lpf_coeff.h

31
branches/SDK2.0_1NUP/yav_mcu_bsr.prk
View File

@ -1,26 +1,25 @@
[ProjectManager]
FrameMax=1
FrameX=71
FrameY=115
FrameCX=1200
FrameCY=854
FrameMax=0
FrameX=447
FrameY=116
FrameCX=1435
FrameCY=1045
OpenFile1=jhl_defs.h,0,286,286,1530,1012,0,15,26,0
OpenFile2=self_flash.c,0,352,352,1596,1078,0,142,5,0
OpenFile3=ini_VECT.c,0,330,330,1574,1056,6,93,6,0
OpenFile4=renge\renge.c,0,348,332,1592,1058,0,31,0,0
OpenFile5=renge\renge.h,0,264,264,1508,990,3,4,3,0
OpenFile6=adc.c,0,220,220,1464,946,8,230,8,0
OpenFile7=led.c,0,264,264,1508,990,0,731,0,0
OpenFile8=task_misc.c,0,286,286,1530,1012,65,141,69,0
OpenFile9=main.c,0,220,220,1464,946,3,27,1,0
OpenFile10=i2c_mcu.c,0,308,308,1552,1034,10,76,7,0
OpenFile11=task_sys.c,0,330,330,1574,1056,10,38,7,0
OpenFile12=pm.c,0,110,110,1078,614,11,677,11,0
OpenFile13=ProjectWindow
PrjPos=0,0,1039,0,345
OpenFile14=config.h,0,242,242,1486,968,29,16,28,0
OpenFile15=OutputWindow
OutputPos=0,3,734,347,1591
OpenFile7=config.h,0,242,242,1486,968,0,40,0,0
OpenFile8=led.c,0,264,264,1508,990,0,731,0,0
OpenFile9=task_misc.c,0,286,286,1530,1012,65,141,69,0
OpenFile10=main.c,0,220,220,1464,946,3,27,1,0
OpenFile11=i2c_mcu.c,0,308,308,1552,1034,10,76,7,0
OpenFile12=ProjectWindow
PrjPos=0,0,706,0,291
OpenFile13=OutputWindow
OutputPos=0,58,764,389,1336
OpenFile14=task_sys.c,0,465,262,1709,988,27,35,27,0
ActivePRJ=yav_mcu_bsr.prj
[ProjectWindow]
ProjectWindowDispType=0