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

SPFL対応など

Browse Source 
・RBR制御追加、レジスタ追加(0x57)
　ｔｏｄｏ:本体リセット時
・加速度センサ割り込みピンを一本化(回路ミスの件)(完)
・アモルファス液晶対応コード追加(完)

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@346 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2011-06-20 09:03:41 +00:00
parent 33808e9a92
commit 575da59406
23 changed files with 1326 additions and 1248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
branches/sim/VCProj/Debug/bsr_trunk.log
View File

@ -1,15 +1,17 @@
2011/06/20 12:57:28 にビルドを開始しました。
1>ノード 2 上のプロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (build ターゲット)。
1>InitializeBuildStatus:
2011/06/20 15:03:03 にビルドを開始しました。
1>ノード 2 上のプロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (rebuild ターゲット)。
1>_PrepareForClean:
ファイル "Debug\sim.lastbuildstate" を削除しています。
InitializeBuildStatus:
"AlwaysCreate" が指定されたため "Debug\sim.unsuccessfulbuild" を作成しています。
ClCompile:
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Zi /nologo /W1 /WX- /O2 /Oy- /D _MBCS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\WDT.c ..\accero.c ..\adc.c ..\i2c_ctr.c ..\i2c_mcu.c ..\i2c_twl.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\pedo_alg_thre_det2.c ..\pm.c ..\renge\renge.c ..\rtc.c ..\self_flash.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\vreg_ctr.c ..\vreg_twl.c
WDT.c
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Z7 /nologo /W1 /WX- /Od /Oy- /D _MBCS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\accero.c ..\adc.c ..\i2c_ctr.c ..\i2c_mcu.c ..\i2c_twl.c ..\ini_VECT.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\pedo_alg_thre_det2.c ..\pm.c ..\rtc.c ..\self_flash.c ..\sim\simFixture.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\vreg_ctr.c ..\vreg_twl.c ..\WDT.c ..\renge\renge.c
accero.c
adc.c
i2c_ctr.c
i2c_mcu.c
i2c_twl.c
ini_VECT.c
led.c
led_cam.c
led_pow.c
@ -19,9 +21,9 @@
pedo_alg_thre_det2.c
pm.c
1>..\pm.c(1259): warning C4090: '=' : 異なる 'const' 修飾子です。
renge.c
rtc.c
self_flash.c
simFixture.c
sw.c
task_debug.c
task_misc.c
@ -31,9 +33,11 @@
task_sys.c
vreg_ctr.c
vreg_twl.c
WDT.c
renge.c
コードを生成中...
Link:
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.exe" /NOLOGO kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"Debug\sim.exe.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /PDB:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.pdb" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.lib" /MACHINE:X86 Debug\accero.obj
C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.exe" /NOLOGO kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"Debug\sim.exe.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DEBUG /PDB:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.pdb" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\78k_data\yav-mcu-basara\branches\sim\VCProj\Debug\sim.lib" /MACHINE:X86 Debug\accero.obj
Debug\adc.obj
Debug\i2c_ctr.obj
Debug\i2c_mcu.obj
@ -65,8 +69,8 @@
FinalizeBuildStatus:
ファイル "Debug\sim.unsuccessfulbuild" を削除しています。
"Debug\sim.lastbuildstate" のタッチ タスクを実行しています。
1>プロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (build ターゲット) のビルドが完了しました。
1>プロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (rebuild ターゲット) のビルドが完了しました。
ビルドに成功しました。
経過時間 00:00:03.77
経過時間 00:00:02.95

BIN
branches/sim/VCProj/bsr_trunk.sdf
View File

Binary file not shown.

BIN
branches/sim/VCProj/bsr_trunk.suo
View File

Binary file not shown.

9
branches/sim/VCProj/bsr_trunk.vcxproj
View File

@ -68,6 +68,15 @@
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\accero.c" />
<ClCompile Include="..\adc.c" />

9
branches/sim/accero.c
View File

@ -195,7 +195,14 @@ if( system_status.model == MODEL_TS_BOARD )
str_send_buf[2] = 0x10; // 3 IRQ pol :Active HI, Drive:Pushpull,
}
*/
str_send_buf[2] = bits8(0,0,0,1, 0,0,1,0); // 面倒なので両方...。
if( system_status.model == MODEL_TS_BOARD )
{
str_send_buf[2] = bits8(0,0,0,0, 0,0,1,0); // ピン不足のため、ちゃんと分ける
}
else
{
str_send_buf[2] = bits8(0,0,0,1, 0,0,0,0);
}
str_send_buf[3] = 0x80; // ctrl3 block update:enable, MSB first, scale: +-2G(default), selftest: dis
if( ( vreg_ctr[VREG_C_ACC_CONFIG] &

4
branches/sim/adc.c
View File

@ -126,12 +126,12 @@ void tsk_adc( )
ADCEN = 1;
ADM = bits8(0,0,0,0, 1,0,1,1); // セレクトモード、昇圧、fCLK/6 ///ここから ↓
ADM = bits8(0,0,0,0, 1,0,1,1); // セレクトモード、昇圧、fCLK/6 // ここから ↓
ADPC = 0x06; // ADCポートのセレクト
ADS = ADC_SEL_3D;
nop8();
ADCS = 1; // AD開始。 /// ここまで　↑　までに1us=8clk以上開ける
ADCS = 1; // AD開始。 // ここまで　↑　までに1us=8clk以上開ける
ADIF = 0;
ADMK = 0;

1890
branches/sim/bsr.hex
View File

File diff suppressed because it is too large Load Diff

BIN
branches/sim/bsr.lmf
View File

Binary file not shown.

504
branches/sim/bsr_k0r.map
View File

@ -24,8 +24,8 @@ Direc-file:bsr_mcu.dr
*** Link information ***
65 output segment(s)
3DA3H byte(s) real data
5778 symbol(s) defined
3E17H byte(s) real data
5807 symbol(s) defined
*** Memory map ***
@ -98,53 +98,53 @@ Direc-file:bsr_mcu.dr
LDR_CODL task_status
000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG
LDR_CODE 000CEH 00945H CSEG
LDR_CODE loader 000CEH 00218H
LDR_CODE main 002E6H 00042H
LDR_CODE WDT 00328H 00000H
LDR_CODE i2c_mcu 00328H 002F0H
LDR_CODE 000CEH 00955H CSEG
LDR_CODE loader 000CEH 00228H
LDR_CODE main 002F6H 00042H
LDR_CODE WDT 00338H 00000H
LDR_CODE i2c_mcu 00338H 002F0H
LDR_CODE self_flash
00618H 00373H
00628H 00373H
LDR_CODE task_debug
0098BH 00000H
0099BH 00000H
LDR_CODE task_status
0098BH 00088H
FSL_CODE 00A13H 00322H CSEG
0099BH 00088H
FSL_CODE 00A23H 00322H CSEG
FSL_CODE fsl_block_cmd
00A13H 0002BH
00A23H 0002BH
FSL_CODE fsl_block_check
00A3EH 00013H
00A4EH 00013H
FSL_CODE fsl_common
00A51H 0014FH
00A61H 0014FH
FSL_CODE fsl_reset
00BA0H 00001H
00BB0H 00001H
FSL_CODE fsl_si_ibf
00BA1H 00064H
00BB1H 00064H
FSL_CODE fsl_phySwap
00C05H 0004DH
00C15H 0004DH
FSL_CODE fsl_si_common
00C52H 00061H
FSL_CODE fsl_swap 00CB3H 00030H
00C62H 00061H
FSL_CODE fsl_swap 00CC3H 00030H
FSL_CODE fsl_write
00CE3H 00052H
@@LCODE 00D35H 00277H CSEG
@@LCODE @cstart 00D35H 0006DH
@@LCODE @imul 00DA2H 00011H
@@LCODE @lumul 00DB3H 0002BH
@@LCODE @isdiv 00DDEH 00022H
@@LCODE @iudiv 00E00H 0002DH
@@LCODE @isrem 00E2DH 00021H
@@LCODE @iurem 00E4EH 0002FH
@@LCODE @lsdiv 00E7DH 00039H
@@LCODE @ludiv 00EB6H 0003FH
@@LCODE @divuw 00EF5H 00034H
@@LCODE @ladd 00F29H 0000FH
@@LCODE @llsh 00F38H 0001BH
@@LCODE @lursh 00F53H 0001FH
@@LCODE @iscmp 00F72H 0000CH
@@LCODE @lband 00F7EH 00014H
@@LCODE @bcdtob 00F92H 0001AH
* gap * 00FACH 0004AH
00CF3H 00052H
@@LCODE 00D45H 00277H CSEG
@@LCODE @cstart 00D45H 0006DH
@@LCODE @imul 00DB2H 00011H
@@LCODE @lumul 00DC3H 0002BH
@@LCODE @isdiv 00DEEH 00022H
@@LCODE @iudiv 00E10H 0002DH
@@LCODE @isrem 00E3DH 00021H
@@LCODE @iurem 00E5EH 0002FH
@@LCODE @lsdiv 00E8DH 00039H
@@LCODE @ludiv 00EC6H 0003FH
@@LCODE @divuw 00F05H 00034H
@@LCODE @ladd 00F39H 0000FH
@@LCODE @llsh 00F48H 0001BH
@@LCODE @lursh 00F63H 0001FH
@@LCODE @iscmp 00F82H 0000CH
@@LCODE @lband 00F8EH 00014H
@@LCODE @bcdtob 00FA2H 0001AH
* gap * 00FBCH 0003AH
MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH
@ -186,251 +186,251 @@ Direc-file:bsr_mcu.dr
0226CH 00000H
@@CNST led_cam 0226CH 00000H
@@CNST led_pow 0226CH 00020H
ROM_CODE 0228CH 026EDH CSEG
ROM_CODE pm 0228CH 009F7H
ROM_CODE i2c_ctr 02C83H 00060H
ROM_CODE i2c_twl 02CE3H 0005EH
ROM_CODE led 02D41H 00265H
ROM_CODE rtc 02FA6H 000E0H
ROM_CODE vreg_ctr 03086H 00486H
ROM_CODE vreg_twl 0350CH 000FAH
ROM_CODE adc 03606H 002E7H
ROM_CODE renge 038EDH 00190H
ROM_CODE accero 03A7DH 0013DH
ROM_CODE sw 03BBAH 00176H
ROM_CODE 0228CH 02751H CSEG
ROM_CODE pm 0228CH 00A16H
ROM_CODE i2c_ctr 02CA2H 00060H
ROM_CODE i2c_twl 02D02H 0005EH
ROM_CODE led 02D60H 00265H
ROM_CODE rtc 02FC5H 000E0H
ROM_CODE vreg_ctr 030A5H 004C0H
ROM_CODE vreg_twl 03565H 000FAH
ROM_CODE adc 0365FH 002E7H
ROM_CODE renge 03946H 00190H
ROM_CODE accero 03AD6H 00148H
ROM_CODE sw 03C1EH 00176H
ROM_CODE task_misc
03D30H 00177H
ROM_CODE task_sys 03EA7H 00373H
03D94H 00177H
ROM_CODE task_sys 03F0BH 00373H
ROM_CODE pedo_alg_thre_det2
0421AH 00502H
ROM_CODE led_cam 0471CH 000DBH
ROM_CODE led_pow 047F7H 00182H
@@BASE 04979H 004C6H CSEG BASE
@@BASE loader 04979H 00000H
@@BASE pm 04979H 0003FH
@@BASE i2c_ctr 049B8H 0018DH
@@BASE main 04B45H 00000H
@@BASE magic 04B45H 00000H
@@BASE WDT 04B45H 00000H
@@BASE i2c_mcu 04B45H 0009CH
@@BASE i2c_twl 04BE1H 000CBH
@@BASE led 04CACH 00000H
@@BASE rtc 04CACH 0005EH
@@BASE vreg_ctr 04D0AH 00000H
@@BASE vreg_twl 04D0AH 00000H
@@BASE adc 04D0AH 000B3H
@@BASE renge 04DBDH 00000H
@@BASE accero 04DBDH 0004AH
0427EH 00502H
ROM_CODE led_cam 04780H 000DBH
ROM_CODE led_pow 0485BH 00182H
@@BASE 049DDH 004C6H CSEG BASE
@@BASE loader 049DDH 00000H
@@BASE pm 049DDH 0003FH
@@BASE i2c_ctr 04A1CH 0018DH
@@BASE main 04BA9H 00000H
@@BASE magic 04BA9H 00000H
@@BASE WDT 04BA9H 00000H
@@BASE i2c_mcu 04BA9H 0009CH
@@BASE i2c_twl 04C45H 000CBH
@@BASE led 04D10H 00000H
@@BASE rtc 04D10H 0005EH
@@BASE vreg_ctr 04D6EH 00000H
@@BASE vreg_twl 04D6EH 00000H
@@BASE adc 04D6EH 000B3H
@@BASE renge 04E21H 00000H
@@BASE accero 04E21H 0004AH
@@BASE self_flash
04E07H 00000H
@@BASE sw 04E07H 00000H
04E6BH 00000H
@@BASE sw 04E6BH 00000H
@@BASE task_debug
04E07H 00000H
04E6BH 00000H
@@BASE task_misc
04E07H 00000H
@@BASE task_sys 04E07H 00000H
04E6BH 00000H
@@BASE task_sys 04E6BH 00000H
@@BASE pedo_alg_thre_det2
04E07H 00000H
@@BASE ini_VECT 04E07H 00038H
04E6BH 00000H
@@BASE ini_VECT 04E6BH 00038H
@@BASE task_status
04E3FH 00000H
@@BASE led_cam 04E3FH 00000H
@@BASE led_pow 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL @cstart 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL pm 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL led 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL rtc 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL adc 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL renge 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL accero 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL sw 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
04EA3H 00000H
@@BASE led_cam 04EA3H 00000H
@@BASE led_pow 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL @cstart 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL pm 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL led 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL rtc 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL adc 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL renge 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL accero 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL sw 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL task_misc
04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL task_sys 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL task_sys 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2
04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL led_cam 04E3FH 00000H
@@CNSTL 04E3FH 00000H CSEG PAGE64KP
@@CNSTL led_pow 04E3FH 00000H
@@R_INIS 04E3FH 00000H CSEG UNIT64KP
@@R_INIS @cstart 04E3FH 00000H
@@R_INIS loader 04E3FH 00000H
@@R_INIS pm 04E3FH 00000H
@@R_INIS i2c_ctr 04E3FH 00000H
@@R_INIS main 04E3FH 00000H
@@R_INIS magic 04E3FH 00000H
@@R_INIS WDT 04E3FH 00000H
@@R_INIS i2c_mcu 04E3FH 00000H
@@R_INIS i2c_twl 04E3FH 00000H
@@R_INIS led 04E3FH 00000H
@@R_INIS rtc 04E3FH 00000H
@@R_INIS vreg_ctr 04E3FH 00000H
@@R_INIS vreg_twl 04E3FH 00000H
@@R_INIS adc 04E3FH 00000H
@@R_INIS renge 04E3FH 00000H
@@R_INIS accero 04E3FH 00000H
04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL led_cam 04EA3H 00000H
@@CNSTL 04EA3H 00000H CSEG PAGE64KP
@@CNSTL led_pow 04EA3H 00000H
@@R_INIS 04EA3H 00000H CSEG UNIT64KP
@@R_INIS @cstart 04EA3H 00000H
@@R_INIS loader 04EA3H 00000H
@@R_INIS pm 04EA3H 00000H
@@R_INIS i2c_ctr 04EA3H 00000H
@@R_INIS main 04EA3H 00000H
@@R_INIS magic 04EA3H 00000H
@@R_INIS WDT 04EA3H 00000H
@@R_INIS i2c_mcu 04EA3H 00000H
@@R_INIS i2c_twl 04EA3H 00000H
@@R_INIS led 04EA3H 00000H
@@R_INIS rtc 04EA3H 00000H
@@R_INIS vreg_ctr 04EA3H 00000H
@@R_INIS vreg_twl 04EA3H 00000H
@@R_INIS adc 04EA3H 00000H
@@R_INIS renge 04EA3H 00000H
@@R_INIS accero 04EA3H 00000H
@@R_INIS self_flash
04E3FH 00000H
@@R_INIS sw 04E3FH 00000H
04EA3H 00000H
@@R_INIS sw 04EA3H 00000H
@@R_INIS task_debug
04E3FH 00000H
04EA3H 00000H
@@R_INIS task_misc
04E3FH 00000H
@@R_INIS task_sys 04E3FH 00000H
04EA3H 00000H
@@R_INIS task_sys 04EA3H 00000H
@@R_INIS pedo_alg_thre_det2
04E3FH 00000H
@@R_INIS ini_VECT 04E3FH 00000H
04EA3H 00000H
@@R_INIS ini_VECT 04EA3H 00000H
@@R_INIS task_status
04E3FH 00000H
@@R_INIS led_cam 04E3FH 00000H
@@R_INIS led_pow 04E3FH 00000H
@@R_INIS @rom 04E3FH 00000H
@@CALT 04E3FH 00000H CSEG
@@CALT @cstart 04E3FH 00000H
@@CALT loader 04E3FH 00000H
@@CALT pm 04E3FH 00000H
@@CALT i2c_ctr 04E3FH 00000H
@@CALT main 04E3FH 00000H
@@CALT magic 04E3FH 00000H
@@CALT WDT 04E3FH 00000H
@@CALT i2c_mcu 04E3FH 00000H
@@CALT i2c_twl 04E3FH 00000H
@@CALT led 04E3FH 00000H
@@CALT rtc 04E3FH 00000H
@@CALT vreg_ctr 04E3FH 00000H
@@CALT vreg_twl 04E3FH 00000H
@@CALT adc 04E3FH 00000H
@@CALT renge 04E3FH 00000H
@@CALT accero 04E3FH 00000H
04EA3H 00000H
@@R_INIS led_cam 04EA3H 00000H
@@R_INIS led_pow 04EA3H 00000H
@@R_INIS @rom 04EA3H 00000H
@@CALT 04EA3H 00000H CSEG
@@CALT @cstart 04EA3H 00000H
@@CALT loader 04EA3H 00000H
@@CALT pm 04EA3H 00000H
@@CALT i2c_ctr 04EA3H 00000H
@@CALT main 04EA3H 00000H
@@CALT magic 04EA3H 00000H
@@CALT WDT 04EA3H 00000H
@@CALT i2c_mcu 04EA3H 00000H
@@CALT i2c_twl 04EA3H 00000H
@@CALT led 04EA3H 00000H
@@CALT rtc 04EA3H 00000H
@@CALT vreg_ctr 04EA3H 00000H
@@CALT vreg_twl 04EA3H 00000H
@@CALT adc 04EA3H 00000H
@@CALT renge 04EA3H 00000H
@@CALT accero 04EA3H 00000H
@@CALT self_flash
04E3FH 00000H
@@CALT sw 04E3FH 00000H
04EA3H 00000H
@@CALT sw 04EA3H 00000H
@@CALT task_debug
04E3FH 00000H
04EA3H 00000H
@@CALT task_misc
04E3FH 00000H
@@CALT task_sys 04E3FH 00000H
04EA3H 00000H
@@CALT task_sys 04EA3H 00000H
@@CALT pedo_alg_thre_det2
04E3FH 00000H
@@CALT ini_VECT 04E3FH 00000H
04EA3H 00000H
@@CALT ini_VECT 04EA3H 00000H
@@CALT task_status
04E3FH 00000H
@@CALT led_cam 04E3FH 00000H
@@CALT led_pow 04E3FH 00000H
@@RLINIT 04E3FH 00000H CSEG UNIT64KP
@@RLINIT loader 04E3FH 00000H
@@RLINIT pm 04E3FH 00000H
@@RLINIT i2c_ctr 04E3FH 00000H
@@RLINIT main 04E3FH 00000H
@@RLINIT magic 04E3FH 00000H
@@RLINIT WDT 04E3FH 00000H
@@RLINIT i2c_mcu 04E3FH 00000H
@@RLINIT i2c_twl 04E3FH 00000H
@@RLINIT led 04E3FH 00000H
@@RLINIT rtc 04E3FH 00000H
@@RLINIT vreg_ctr 04E3FH 00000H
@@RLINIT vreg_twl 04E3FH 00000H
@@RLINIT adc 04E3FH 00000H
@@RLINIT renge 04E3FH 00000H
@@RLINIT accero 04E3FH 00000H
04EA3H 00000H
@@CALT led_cam 04EA3H 00000H
@@CALT led_pow 04EA3H 00000H
@@RLINIT 04EA3H 00000H CSEG UNIT64KP
@@RLINIT loader 04EA3H 00000H
@@RLINIT pm 04EA3H 00000H
@@RLINIT i2c_ctr 04EA3H 00000H
@@RLINIT main 04EA3H 00000H
@@RLINIT magic 04EA3H 00000H
@@RLINIT WDT 04EA3H 00000H
@@RLINIT i2c_mcu 04EA3H 00000H
@@RLINIT i2c_twl 04EA3H 00000H
@@RLINIT led 04EA3H 00000H
@@RLINIT rtc 04EA3H 00000H
@@RLINIT vreg_ctr 04EA3H 00000H
@@RLINIT vreg_twl 04EA3H 00000H
@@RLINIT adc 04EA3H 00000H
@@RLINIT renge 04EA3H 00000H
@@RLINIT accero 04EA3H 00000H
@@RLINIT self_flash
04E3FH 00000H
@@RLINIT sw 04E3FH 00000H
04EA3H 00000H
@@RLINIT sw 04EA3H 00000H
@@RLINIT task_debug
04E3FH 00000H
04EA3H 00000H
@@RLINIT task_misc
04E3FH 00000H
@@RLINIT task_sys 04E3FH 00000H
04EA3H 00000H
@@RLINIT task_sys 04EA3H 00000H
@@RLINIT pedo_alg_thre_det2
04E3FH 00000H
@@RLINIT ini_VECT 04E3FH 00000H
04EA3H 00000H
@@RLINIT ini_VECT 04EA3H 00000H
@@RLINIT task_status
04E3FH 00000H
@@RLINIT led_cam 04E3FH 00000H
@@RLINIT led_pow 04E3FH 00000H
@@RLINIT @rom 04E3FH 00000H
@@CODEL 04E3FH 00000H CSEG
@@CODEL pm 04E3FH 00000H
@@CODEL i2c_ctr 04E3FH 00000H
@@CODEL magic 04E3FH 00000H
@@CODEL i2c_twl 04E3FH 00000H
@@CODEL led 04E3FH 00000H
@@CODEL rtc 04E3FH 00000H
@@CODEL vreg_ctr 04E3FH 00000H
@@CODEL vreg_twl 04E3FH 00000H
@@CODEL adc 04E3FH 00000H
@@CODEL renge 04E3FH 00000H
@@CODEL accero 04E3FH 00000H
@@CODEL sw 04E3FH 00000H
04EA3H 00000H
@@RLINIT led_cam 04EA3H 00000H
@@RLINIT led_pow 04EA3H 00000H
@@RLINIT @rom 04EA3H 00000H
@@CODEL 04EA3H 00000H CSEG
@@CODEL pm 04EA3H 00000H
@@CODEL i2c_ctr 04EA3H 00000H
@@CODEL magic 04EA3H 00000H
@@CODEL i2c_twl 04EA3H 00000H
@@CODEL led 04EA3H 00000H
@@CODEL rtc 04EA3H 00000H
@@CODEL vreg_ctr 04EA3H 00000H
@@CODEL vreg_twl 04EA3H 00000H
@@CODEL adc 04EA3H 00000H
@@CODEL renge 04EA3H 00000H
@@CODEL accero 04EA3H 00000H
@@CODEL sw 04EA3H 00000H
@@CODEL task_misc
04E3FH 00000H
@@CODEL task_sys 04E3FH 00000H
04EA3H 00000H
@@CODEL task_sys 04EA3H 00000H
@@CODEL pedo_alg_thre_det2
04E3FH 00000H
@@CODEL ini_VECT 04E3FH 00000H
@@CODEL led_cam 04E3FH 00000H
@@CODEL led_pow 04E3FH 00000H
* gap * 04E3FH 00001H
@@CNSTL 04E40H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04E40H 0000AH
@@R_INIT 04E4AH 00038H CSEG UNIT64KP
@@R_INIT @cstart 04E4AH 00000H
@@R_INIT loader 04E4AH 00000H
@@R_INIT pm 04E4AH 00002H
@@R_INIT i2c_ctr 04E4CH 00002H
@@R_INIT main 04E4EH 00000H
@@R_INIT magic 04E4EH 00000H
@@R_INIT WDT 04E4EH 00000H
@@R_INIT i2c_mcu 04E4EH 00000H
@@R_INIT i2c_twl 04E4EH 00000H
@@R_INIT led 04E4EH 00000H
@@R_INIT rtc 04E4EH 00000H
@@R_INIT vreg_ctr 04E4EH 00000H
@@R_INIT vreg_twl 04E4EH 00000H
@@R_INIT adc 04E4EH 0000CH
@@R_INIT renge 04E5AH 00014H
@@R_INIT accero 04E6EH 00000H
04EA3H 00000H
@@CODEL ini_VECT 04EA3H 00000H
@@CODEL led_cam 04EA3H 00000H
@@CODEL led_pow 04EA3H 00000H
* gap * 04EA3H 00001H
@@CNSTL 04EA4H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04EA4H 0000AH
@@R_INIT 04EAEH 00038H CSEG UNIT64KP
@@R_INIT @cstart 04EAEH 00000H
@@R_INIT loader 04EAEH 00000H
@@R_INIT pm 04EAEH 00002H
@@R_INIT i2c_ctr 04EB0H 00002H
@@R_INIT main 04EB2H 00000H
@@R_INIT magic 04EB2H 00000H
@@R_INIT WDT 04EB2H 00000H
@@R_INIT i2c_mcu 04EB2H 00000H
@@R_INIT i2c_twl 04EB2H 00000H
@@R_INIT led 04EB2H 00000H
@@R_INIT rtc 04EB2H 00000H
@@R_INIT vreg_ctr 04EB2H 00000H
@@R_INIT vreg_twl 04EB2H 00000H
@@R_INIT adc 04EB2H 0000CH
@@R_INIT renge 04EBEH 00014H
@@R_INIT accero 04ED2H 00000H
@@R_INIT self_flash
04E6EH 00000H
@@R_INIT sw 04E6EH 00002H
04ED2H 00000H
@@R_INIT sw 04ED2H 00002H
@@R_INIT task_debug
04E70H 00000H
04ED4H 00000H
@@R_INIT task_misc
04E70H 00000H
@@R_INIT task_sys 04E70H 00002H
04ED4H 00000H
@@R_INIT task_sys 04ED4H 00002H
@@R_INIT pedo_alg_thre_det2
04E72H 00006H
@@R_INIT ini_VECT 04E78H 00000H
04ED6H 00006H
@@R_INIT ini_VECT 04EDCH 00000H
@@R_INIT task_status
04E78H 00002H
@@R_INIT led_cam 04E7AH 00002H
@@R_INIT led_pow 04E7CH 00006H
@@R_INIT @rom 04E82H 00000H
@@LCODEL 04E82H 00008H CSEG
@@LCODEL abs 04E82H 00008H
* gap * 04E8AH 0016CH
04EDCH 00002H
@@R_INIT led_cam 04EDEH 00002H
@@R_INIT led_pow 04EE0H 00006H
@@R_INIT @rom 04EE6H 00000H
@@LCODEL 04EE6H 00008H CSEG
@@LCODEL abs 04EE6H 00008H
* gap * 04EEEH 00108H
MGC_TAIL 04FF6H 0000AH CSEG AT
MGC_TAIL magic 04FF6H 0000AH

BIN
branches/sim/hoge.bin
View File

Binary file not shown.

12
branches/sim/loader.c
View File

@ -114,8 +114,10 @@ void main( )
hdwinit2( );
#ifndef _WIN32
// ファームの整合性チェック //
chk_firm_broke();
#endif
// 試遊台判定
chk_platform_type();
@ -170,6 +172,14 @@ void chk_platform_type()
{
// ●CTRファミリ //
system_status.family = (enum _family)( DEV_DET >> 1 ); /// あぁ...
if( system_status.family == FAMILY_SPFL )
{
pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_AMO;
}
else
{
pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_CGS;
}
// ●CTR＆その開発機材 //
// 一応初期化
@ -278,7 +288,7 @@ void hdwinit2( )
MK2 = 0xFFFF;
PM20 = bits8(1,1,1,1,1,1,0,0);
PM20 = bits8(1,1,1,1,1,0,0,0);
PM1 = bits8(0,0,0,0,0,0,0,0);
PM2 = bits8(1,1,1,0,1,0,0,1);

2
branches/sim/pedo_alg_thre_det2.c
View File

@ -389,7 +389,7 @@ u8 hosu_read( )
else
{
u16 temp;
// 16ビットで記録してあるのでばらして送る todo: もっと楽する方法があるんじゃ
// 16ビットで記録してあるのでばらして送る /// もっと楽する方法があるんじゃ
temp = pool.vreg_c_ext.pedo_log[ p_record_buffer ];
if( !pedolog_read_msb )
{

18
branches/sim/pm.c
View File

@ -46,6 +46,8 @@ static bt_param_* p_bt_param;
static err send_cmd_mgic_2B( u8 reg, u16 dat );
static err read_mgic_2B( u8 reg, u8* dat );
u8 pm_reg_bit_vddlcd;
// ========================================================
static void BT_model_detect();
@ -366,6 +368,17 @@ void BT_model_detect()
system_status.model = MODEL_JIKKI; // バッテリ無しの時は↓で上書きする
}
// TSのhomeボタン、実機は未接続なので要端子処理 /// gndにしとけばよかった…
if( system_status.model == MODEL_TS_BOARD )
{
PM_SW_HOME_n_TSBOARD = 1;
}
else
{
PM_SW_HOME_n_TSBOARD = 0;
SW_HOME_n_TSBOARD = 0; /// どっちでもいいんだけど
}
// 電池メーカーの識別 //
{
u8 i;
@ -763,6 +776,7 @@ err PM_LCD_on( )
if( system_status.family == FAMILY_SPFL )
{
SPFL_LCD_AMOL_HV_CONT = 1;
// todo 要ウェイトか情報待ち
}
wait_ms( DELAY_PM_TSS_50B_AND_TCOM );
@ -812,14 +826,14 @@ void PM_LCD_off()
// 液晶電源切る //
SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでも弊害ないし
SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでもL縛りなので弊害なし
// 50msとか待つし、確認しましょうかね…
if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 )
{
if( system_status.family == FAMILY_SPFL )
{
wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。数字は暫定
wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。todo 数字は暫定
}
PM_TCOM_off();

19
branches/sim/pm.h
View File

@ -104,7 +104,8 @@ enum NTR_PM_BT_STATUS{
#define PM_REG_BIT_VDD50A ( 1 << 4 )
// 0x02 pw cnt2
#define PM_REG_BIT_VDDLCD 0x07
#define PM_REG_BIT_VDDLCD_CGS 0x07
#define PM_REG_BIT_VDDLCD_AMO 0x05
#define PM_REG_BIT_LCD_VCS ( 0x01 << 4 )
#define PM_REG_BIT_LCD_TCOM ( 0x01 << 3 )
@ -137,6 +138,8 @@ extern bit bt_force_update;
extern u8 pmic_version;
extern u8 mgic_version[];
extern u8 pm_reg_bit_vddlcd; // アモルファス対応(電源シーケンスが違う)
//=========================================================
err PM_sys_pow_on( );
@ -156,7 +159,6 @@ void pm_chk_adapter();
void codec_reg_init();
task_status_immed tski_BT_temp_update( );
task_status_immed tski_vcom_set( );
task_status_immed tski_PM_LCD_on();
@ -169,8 +171,6 @@ u8 read_pmic( u8 reg );
#define PM_Chg_Stop() { BT_TEMP_P = 0; BT_CHG_DISABLE(); LED_CHARGE = 0; bt_authorized = false; }
// 　これを呼ぶ前に、現在温度を教えておく必要があります。
#define PM_reset() ( send_cmd_pmic( PM_REG_ADRS_CONT, 0x00 ) )
@ -187,10 +187,11 @@ u8 read_pmic( u8 reg );
#define PM_VDD_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_SYS, PM_REG_BIT_VDD ))
#define PM_VDD50A_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_SYS, ( PM_REG_BIT_VDD | PM_REG_BIT_VDD50A )))
#define PM_VDD_off() ( send_cmd_pmic( PM_REG_ADRS_VDD_SYS, 0 ))
#define PM_off() ( send_cmd_pmic( PM_REG_ADRS_VDD_SYS, 0 ))
#define PM_off() PM_VDD_off()
#define PM_VDD_normMode() ( send_cmd_pmic( PM_REG_ADRS_POW_SAVE, PM_REG_BIT_VDD1P_1R15 | PM_REG_BIT_VDD_PWM ))
#define PM_VDD_ecoMode() ( send_cmd_pmic( PM_REG_ADRS_POW_SAVE, PM_REG_BIT_VDD1P_0R90 | PM_REG_BIT_VDD_AUTO ))
// todo Yでコア電圧が変わるかもしれない
// ほか //
#define PM_reset_neg() ( send_cmd_pmic( PM_REG_ADRS_CONT, ( PM_REG_BIT_LDSW | PM_REG_BIT_nRST1 )))
@ -199,10 +200,10 @@ u8 read_pmic( u8 reg );
// ↑ 0 だと異常
// 液晶系電源 //
#define PM_VDDLCD_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_LCD, PM_REG_BIT_VDDLCD ))
#define PM_TCOM_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_LCD, ( PM_REG_BIT_VDDLCD | PM_REG_BIT_LCD_TCOM )))
#define PM_VCS_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_LCD, ( PM_REG_BIT_VDDLCD | PM_REG_BIT_LCD_VCS | PM_REG_BIT_LCD_TCOM )))
#define PM_TCOM_off() ( send_cmd_pmic( PM_REG_ADRS_VDD_LCD, ( PM_REG_BIT_VDDLCD | PM_REG_BIT_LCD_VCS )))
#define PM_VDDLCD_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_LCD, pm_reg_bit_vddlcd ))
#define PM_TCOM_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_LCD, ( pm_reg_bit_vddlcd | PM_REG_BIT_LCD_TCOM )))
#define PM_VCS_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_LCD, ( pm_reg_bit_vddlcd | PM_REG_BIT_LCD_VCS | PM_REG_BIT_LCD_TCOM )))
#define PM_TCOM_off() ( send_cmd_pmic( PM_REG_ADRS_VDD_LCD, ( pm_reg_bit_vddlcd | PM_REG_BIT_LCD_VCS )))
#define PM_TCOM_VCS_off() PM_VDDLCD_on()
#define PM_VDDLCD_off() ( send_cmd_pmic( PM_REG_ADRS_VDD_LCD, 0 ) )

2
branches/sim/renge/renge.c
View File

@ -99,7 +99,7 @@ err renge_task_interval_run(){
// インターバル起動
DI();
if(( renge_flg_interval != 0 ) ||
( renge_task_interval_run_force )) // todo “<><E2809C>‡
( renge_task_interval_run_force )) /// 統合したかったな…
{
renge_task_interval_in_force = renge_task_interval_run_force;
renge_task_interval_run_force = false; // 今から起動するタスク、割り込むタスクでフラグが立つかもなので

5
branches/sim/self_flash.c
View File

@ -205,7 +205,7 @@ void firm_update( )
// 1ブロック書き込み完了。内部ベリファイを行う
if( FSL_IVerify( target_block ) != FSL_OK ){
alert(2);
// 再度消去→書き込み ベリファイを繰り返すだけじゃダメでした... todo…？
// 再度消去→書き込み ベリファイを繰り返すだけじゃダメでした... /// 再書き込みすべき？
// リストア
firm_duplicate( ALTERNATE_FIRMTOP, FIRM_TOP );
FSL_ForceReset(); // リセット
@ -379,8 +379,7 @@ void firm_restore( )
}
DBG_LED_off;
// todo
// 　リストア失敗したら、LEDちかちかとかさせて、サービス送りにしてもらう？
// todo リストア失敗したら、LEDちかちかとかさせて、サービス送りにしてもらう？
/*
// リブート

8
branches/sim/sim/sfrAlias.h
View File

@ -105,13 +105,19 @@
#define SW_HOME_n_JIKKI mcuRegP[ _P20_4 ]
#define PM_SW_HOME_n_JIKKI mcuRegPM[ _P20_4 ]
#define PU_SW_HOME_n_JIKKI mcuRegPU[ _P20_4 ]
// INTP22
#define SW_HOME_n_TSBOARD mcuRegP[ _P2_0 ]
#define PM_SW_HOME_n_TSBOARD mcuRegPM[ _P2_0 ]
// WiFi
#define WL_TX mcuRegP[ _P20_3 ] // INTP21
#define PM_WL_TX mcuRegPM[ _P20_3 ] // INTP21
// RBR制御
#define RBR_RESET_n mcuRegP[ _P2_1 ]
#define RBR_FLIGHT_n mcuRegP[ _P2_2 ]
//#define LED_CAM mcuRegP[ _P1_0 ] // TO02
//#define LED_WIFI mcuRegP[ _P1_1 ] // TO03
//#define LED_NOTIFY mcuRegP[ _P1_3 ] // TO05
@ -159,7 +165,7 @@
#define ACC_VALID mcuRegP[ _P20_5 ]
#define PM_ACC_VALID mcuRegPM[ _P20_5 ]
#define ACCEL_INT1 mcuRegP[ _P2_5 ]
#define ACCEL_INT1 mcuRegP[ _P2_5 ] // todo P2.5を別目的で使わなきゃな時に(AIN5)きれいにする
#define PM_ACCEL_INT1 mcuRegPM[ _P2_5 ]
#define KR_SW_POW ( 1 << 3 )

2
branches/sim/task_misc.c
View File

@ -283,7 +283,7 @@ u8 extinfo_read()
if( iic_burst_state > KOUMOKU )
{
return( 0x73 );
return( 0xFF );
}
// static でとるほどのものでないので毎回スタックからとってくる

10
branches/sim/user_define.h
View File

@ -14,13 +14,14 @@
// ŽÀ‹@ŠÂ‹«
#ifdef _debug_led_
/*spfl対応以降、ncでなくなるので使えません
# define DBG_LED_on { PM2.1 = 0; P2.1 = 1; }
# define DBG_LED_off { P2.1 = 0; }
# define DBG_LED_toggle ( P2.1 ^= 1 )
# define DBG_LED2_on { PM2.2 = 0; P2.2 = 1; }
# define DBG_LED2_off { P2.2 = 0; }
# define DBG_LED2_toggle ( P2.2 ^= 1 )
*/
#else
# define DBG_LED_on ;
# define DBG_LED_off ;
@ -117,12 +118,17 @@
#define PU_SW_HOME_n_JIKKI PU20.4
// INTP22
#define SW_HOME_n_TSBOARD P2.0
#define SW_HOME_n_TSBOARD P2.0 // TSマザー上でpull up(P2は内蔵p.u.無い)
#define PM_SW_HOME_n_TSBOARD PM2.0
// WiFi
#define WL_TX P20.3 // INTP21
#define PM_WL_TX PM20.3 // INTP21
// RBR制御
#define RBR_RESET_n P2.1
#define RBR_FLIGHT_n P2.2
//#define LED_CAM P1.0 // TO02
//#define LED_WIFI P1.1 // TO03
//#define LED_NOTIFY P1.3 // TO05

16
branches/sim/vreg_ctr.c
View File

@ -326,6 +326,13 @@ void vreg_ctr_write( u8 adrs, u8 data )
vreg_ctr[ VREG_C_COMMAND3 ] = data;
break;
case ( VREG_C_VOL_RBR_CONTROL ):
RBR_RESET_n = ( data & REG_BIT_RESET ) ? 1: 0;
RBR_FLIGHT_n = ( data & REG_BIT_FLIGHT ) ? 1: 0;
vreg_ctr[ VREG_C_VOL_RBR_CONTROL ] = data;
break;
case ( VREG_C_VOL_OPTION ):
if(( vreg_ctr[ VREG_C_VOL_OPTION ] ^ data ) & ( REG_BIT_VOL_UPDATE_TO_SLIDER ))
{
@ -359,6 +366,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
break;
//debug//
// 使ってないよね？
case ( VREG_C_VOL_DIGITAL ):
NOP();
// no break //
@ -448,14 +456,12 @@ u8 vreg_ctr_read( u8 adrs )
return( pedolog_overflow? 0x10: 0 );
}
#if 0
if( adrs >= VREG_C_ENDMARK_ )
{
// VREG_C_INFO > VREG_C_ENDMARK_ なので
// いじるときは注意
return( 0xEE );
// VREG_C_INFO > VREG_C_ENDMARK_ ↑で先に返してる
// いじるときはそれなりに注意
return( 0xFF );
}
#endif
return ( vreg_ctr[adrs] );
}

11
branches/sim/vreg_ctr.h
View File

@ -125,10 +125,13 @@
#define REG_BIT_TWL_REQ_RESET ( 1 << 0 )
// VREG_C_LED_NOTIFY_FLAG
#define REG_BIT_IN_LOOP ( 1 << 0 )
// RBR control (0x57)
#define REG_BIT_FLIGHT ( 1 << 1 )
#define REG_BIT_RESET ( 1 << 0 )
/*
テンプレ
@ -189,9 +192,9 @@ enum VREG_C_ADRS
VREG_C_COMMAND3, // 'r' でマイコンリセット、 'w' でWDTリセット
VREG_C_OFF_DELAY = 0x24,
VREG_C_VOL_DIGITAL = 0x25,
VREG_C_VOL_DIGITAL = 0x25, // todo 消すよ
VREG_C_VOL_OPTION,
VREG_C_VOL_ADC_RAW,
VREG_C_VOL_ADC_RAW = 0x27,
VREG_C_LED_BRIGHT = 0x28,
VREG_C_LED_POW,
@ -242,6 +245,8 @@ enum VREG_C_ADRS
VREG_C_ACC_HOSU_HOUR_BOUNDARY = 0x50,
VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC,
VREG_C_VOL_RBR_CONTROL = 0x57,
VREG_C_VOL_CAL_MIN = 0x58,
VREG_C_VOL_CAL_MAX,

25
branches/sim/yav_mcu_bsr.plg
View File

@ -1,19 +1,22 @@
C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no loader.c
loader.c(139) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(140) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(172) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(141) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(142) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(174) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 3 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\loader.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no pm.c
pm.c(466) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(804) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(891) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(900) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1103) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1105) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 6 warning(s) found.
pm.c(479) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(784) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(788) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(818) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(839) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(905) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(914) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1117) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1119) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 9 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pm.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_ctr.c
@ -158,4 +161,4 @@ intel-HEX to bsr bin converter
file converted!
Build Total error(s) : 0 Total warning(s) : 53
Build Total error(s) : 0 Total warning(s) : 56