删除了doc文件夹下的论文,因为其中有些不符合实际;
完善了debug和release这两种工程配置; 添加了之前头文件中遗漏的防止重复编译的预编译器指令。
This commit is contained in:
parent
bd1902939a
commit
90351402d8
12 changed files with 3806 additions and 1791 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,5 +1,4 @@
|
|||
/plan_manage_main/out
|
||||
/plan_manage_main/Debug
|
||||
|
||||
|
||||
*.swp
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
|
@ -17,15 +17,15 @@
|
|||
<debug>1</debug>
|
||||
<option>
|
||||
<name>ExePath</name>
|
||||
<state>..\Debug\Exe</state>
|
||||
<state>..\out\Debug\Exe</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>ObjPath</name>
|
||||
<state>..\Debug\Obj</state>
|
||||
<state>..\out\Debug\Obj</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>ListPath</name>
|
||||
<state>..\Debug\List</state>
|
||||
<state>..\out\Debug\List</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>Variant</name>
|
||||
|
|
@ -968,20 +968,20 @@
|
|||
<debug>0</debug>
|
||||
<option>
|
||||
<name>ExePath</name>
|
||||
<state>Release\Exe</state>
|
||||
<state>..\out\Release\Exe</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>ObjPath</name>
|
||||
<state>Release\Obj</state>
|
||||
<state>..\out\Release\Obj</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>ListPath</name>
|
||||
<state>Release\List</state>
|
||||
<state>..\out\Release\List</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>Variant</name>
|
||||
<version>20</version>
|
||||
<state>0</state>
|
||||
<state>35</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>GEndianMode</name>
|
||||
|
|
@ -994,7 +994,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>Input description</name>
|
||||
<state></state>
|
||||
<state>Automatic choice of formatter.</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>Output variant</name>
|
||||
|
|
@ -1003,7 +1003,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>Output description</name>
|
||||
<state></state>
|
||||
<state>Automatic choice of formatter.</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>GOutputBinary</name>
|
||||
|
|
@ -1016,7 +1016,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>OGCoreOrChip</name>
|
||||
<state>0</state>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>GRuntimeLibSelect</name>
|
||||
|
|
@ -1030,7 +1030,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>RTDescription</name>
|
||||
<state></state>
|
||||
<state>Use the normal configuration of the C/C++ runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OGProductVersion</name>
|
||||
|
|
@ -1038,7 +1038,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>OGLastSavedByProductVersion</name>
|
||||
<state></state>
|
||||
<state>7.20.2.7418</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>GeneralEnableMisra</name>
|
||||
|
|
@ -1050,7 +1050,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>OGChipSelectEditMenu</name>
|
||||
<state></state>
|
||||
<state>MKL25Z128xxx4 Freescale MKL25Z128xxx4</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>GenLowLevelInterface</name>
|
||||
|
|
@ -1058,7 +1058,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>GEndianModeBE</name>
|
||||
<state>0</state>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OGBufferedTerminalOutput</name>
|
||||
|
|
@ -1084,17 +1084,17 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>RTConfigPath2</name>
|
||||
<state></state>
|
||||
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>GFPUCoreSlave</name>
|
||||
<version>20</version>
|
||||
<state>1</state>
|
||||
<state>35</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>GBECoreSlave</name>
|
||||
<version>20</version>
|
||||
<state>1</state>
|
||||
<state>35</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OGUseCmsis</name>
|
||||
|
|
@ -1119,7 +1119,10 @@
|
|||
<debug>0</debug>
|
||||
<option>
|
||||
<name>CCDefines</name>
|
||||
<state>NDEBUG</state>
|
||||
<state>NODEBUG</state>
|
||||
<state>IAR</state>
|
||||
<state>MKL25Z4</state>
|
||||
<state>TWR_KL25Z48M</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCPreprocFile</name>
|
||||
|
|
@ -1232,7 +1235,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>OutputFile</name>
|
||||
<state></state>
|
||||
<state>$FILE_BNAME$.o</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCLibConfigHeader</name>
|
||||
|
|
@ -1248,7 +1251,13 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>CCIncludePath2</name>
|
||||
<state></state>
|
||||
<state>$PROJ_DIR$\..\src\app\include</state>
|
||||
<state>$PROJ_DIR$\..\src\include\common</state>
|
||||
<state>$PROJ_DIR$\..\src\include\cpu</state>
|
||||
<state>$PROJ_DIR$\..\src\include\drivers</state>
|
||||
<state>$PROJ_DIR$\..\src\include\drivers\FTFx</state>
|
||||
<state>$PROJ_DIR$\..\src\include\platforms</state>
|
||||
<state>$TOOLKIT_DIR$\inc</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CCStdIncCheck</name>
|
||||
|
|
@ -1277,7 +1286,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>CCOptLevelSlave</name>
|
||||
<state>1</state>
|
||||
<state>3</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>CompilerMisraRules98</name>
|
||||
|
|
@ -1490,7 +1499,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>AOutputFile</name>
|
||||
<state></state>
|
||||
<state>$FILE_BNAME$.o</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>AMultibyteSupport</name>
|
||||
|
|
@ -1598,7 +1607,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>IlinkOutputFile</name>
|
||||
<state>###Unitialized###</state>
|
||||
<state>plan_manage_main.out</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkDebugInfoEnable</name>
|
||||
|
|
@ -1658,11 +1667,11 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>IlinkIcfOverride</name>
|
||||
<state>0</state>
|
||||
<state>1</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkIcfFile</name>
|
||||
<state>lnk0t.icf</state>
|
||||
<state>F:\work_space\graduation_pro\plan_manage\plan_manage_main\config_files\128KB_Pflash.icf</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkIcfFileSlave</name>
|
||||
|
|
@ -1722,7 +1731,7 @@
|
|||
</option>
|
||||
<option>
|
||||
<name>IlinkProgramEntryLabel</name>
|
||||
<state></state>
|
||||
<state>__iar_program_start</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>DoFill</name>
|
||||
|
|
@ -1933,9 +1942,6 @@
|
|||
<file>
|
||||
<name>$PROJ_DIR$\..\src\app\include\pm_time.h</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\src\app\include\setup.h</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\src\app\include\simulat_timer.h</name>
|
||||
</file>
|
||||
|
|
|
|||
|
|
@ -209,9 +209,6 @@
|
|||
<file>
|
||||
<name>$PROJ_DIR$\..\src\app\include\pm_time.h</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\src\app\include\setup.h</name>
|
||||
</file>
|
||||
<file>
|
||||
<name>$PROJ_DIR$\..\src\app\include\simulat_timer.h</name>
|
||||
</file>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
@REM This batch file has been generated by the IAR Embedded Workbench
|
||||
@REM C-SPY Debugger, as an aid to preparing a command line for running
|
||||
@REM the cspybat command line utility using the appropriate settings.
|
||||
@REM
|
||||
@REM Note that this file is generated every time a new debug session
|
||||
@REM is initialized, so you may want to move or rename the file before
|
||||
@REM making changes.
|
||||
@REM
|
||||
@REM You can launch cspybat by typing the name of this batch file followed
|
||||
@REM by the name of the debug file (usually an ELF/DWARF or UBROF file).
|
||||
@REM
|
||||
@REM Read about available command line parameters in the C-SPY Debugging
|
||||
@REM Guide. Hints about additional command line parameters that may be
|
||||
@REM useful in specific cases:
|
||||
@REM --download_only Downloads a code image without starting a debug
|
||||
@REM session afterwards.
|
||||
@REM --silent Omits the sign-on message.
|
||||
@REM --timeout Limits the maximum allowed execution time.
|
||||
@REM
|
||||
|
||||
|
||||
"D:\work_soft\iar\arm\common\bin\cspybat" "D:\work_soft\iar\arm\arm\bin\armproc.dll" "D:\work_soft\iar\arm\arm\bin\armsim2.dll" %1 --plugin "D:\work_soft\iar\arm\arm\bin\armbat.dll" --device_macro "D:\work_soft\iar\arm\arm\config\debugger\Freescale\Kinetis.dmac" --backend -B "--endian=little" "--cpu=Cortex-M0+" "--fpu=None" "-p" "D:\work_soft\iar\arm\arm\CONFIG\debugger\Freescale\MKL25Z128xxx4.ddf" "--semihosting=none" "--device=MKL25Z128xxx4" "--drv_mtb_regbase=0xF0000000" "--drv_mtb_dwtregbase=0xF0001000" "--drv_mtb_minramaddr=0x20000000" "--drv_mtb_maxramaddr=0x20002FFF" "--multicore_nr_of_cores=1"
|
||||
|
||||
|
||||
|
|
@ -19,17 +19,6 @@ StopOnThrow=_ 0
|
|||
ShowArgs=0
|
||||
[Disassembly]
|
||||
MixedMode=1
|
||||
[Interrupts]
|
||||
Enabled=1
|
||||
[MemConfig]
|
||||
Base=1
|
||||
Manual=0
|
||||
Ddf=1
|
||||
TypeViol=0
|
||||
Stop=1
|
||||
[Simulator]
|
||||
Freq=10000000
|
||||
MultiCoreRunAll=1
|
||||
[JLinkDriver]
|
||||
CStepIntDis=_ 0
|
||||
TraceBufferSize=0x00010000
|
||||
|
|
@ -70,12 +59,6 @@ Title_0=I0
|
|||
Symbol_0=0 4 1
|
||||
LiveEnabled=0
|
||||
LiveFile=PowerLogLive.log
|
||||
[DataLog]
|
||||
LogEnabled=0
|
||||
SumEnabled=0
|
||||
GraphEnabled=0
|
||||
ShowTimeLog=1
|
||||
ShowTimeSum=1
|
||||
[EventLog]
|
||||
LogEnabled=0
|
||||
SumEnabled=0
|
||||
|
|
@ -83,13 +66,6 @@ GraphEnabled=0
|
|||
ShowTimeLog=1
|
||||
ShowTimeSum=1
|
||||
SumSortOrder=0
|
||||
[InterruptLog]
|
||||
LogEnabled=0
|
||||
SumEnabled=0
|
||||
GraphEnabled=0
|
||||
ShowTimeLog=1
|
||||
ShowTimeSum=1
|
||||
SumSortOrder=0
|
||||
[Log file]
|
||||
LoggingEnabled=_ 0
|
||||
LogFile=_ ""
|
||||
|
|
@ -109,6 +85,30 @@ Mode=1
|
|||
Graph=0
|
||||
Symbiont=0
|
||||
Exclusions=
|
||||
[InterruptLog]
|
||||
LogEnabled=0
|
||||
SumEnabled=0
|
||||
GraphEnabled=0
|
||||
ShowTimeLog=1
|
||||
ShowTimeSum=1
|
||||
SumSortOrder=0
|
||||
[DataLog]
|
||||
LogEnabled=0
|
||||
SumEnabled=0
|
||||
GraphEnabled=0
|
||||
ShowTimeLog=1
|
||||
ShowTimeSum=1
|
||||
[Interrupts]
|
||||
Enabled=1
|
||||
[MemConfig]
|
||||
Base=1
|
||||
Manual=0
|
||||
Ddf=1
|
||||
TypeViol=0
|
||||
Stop=1
|
||||
[Simulator]
|
||||
Freq=10000000
|
||||
MultiCoreRunAll=1
|
||||
[Disassemble mode]
|
||||
mode=0
|
||||
[Breakpoints2]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
* plan_handle.h - 计划处理
|
||||
*/
|
||||
|
||||
|
||||
#ifndef PLAN_HANDLE_H
|
||||
#define PLAN_HANDLE_H
|
||||
|
||||
|
||||
|
||||
|
|
@ -13,3 +14,6 @@ void plan_handle(void);
|
|||
|
||||
void key_func(void);
|
||||
|
||||
|
||||
|
||||
#endif /* PLAN_HANDLE_H */
|
||||
|
|
@ -3,7 +3,17 @@
|
|||
*/
|
||||
|
||||
|
||||
#ifndef PM_INIT_H
|
||||
#define PM_INIT_H
|
||||
|
||||
/*
|
||||
* pm_init() - ³õʼ»¯
|
||||
*/
|
||||
void pm_init(void);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif /* PM_INIT_H */
|
||||
|
|
@ -2,6 +2,10 @@
|
|||
* time.h - 时间处理
|
||||
*/
|
||||
|
||||
#ifndef TIME_H
|
||||
#define TIME_H
|
||||
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
|
||||
|
|
@ -32,3 +36,6 @@ void maintain_system_time(void);
|
|||
calendar_info get_system_time(void);
|
||||
uint32_t calendar_to_sec(calendar_info *cal);
|
||||
calendar_info sec_to_calendar(uint32_t sec);
|
||||
|
||||
|
||||
#endif /* TIME_H */
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@
|
|||
* 这个文件只应包含在tft和plan_handle模块
|
||||
*/
|
||||
|
||||
#ifndef TFT_PLAN_INTERNAL_H
|
||||
#define TFT_PLAN_INTERNAL_H
|
||||
|
||||
|
||||
#include "include/pm_time.h"
|
||||
|
||||
/*
|
||||
|
|
@ -46,3 +50,6 @@ extern kv_pair kvp_obj_set[][PLAN_DATA_NUM];
|
|||
|
||||
|
||||
void tft_to_plan_input(uint8_t objn);
|
||||
|
||||
|
||||
#endif /* TFT_PLAN_INTERNAL_H */
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue