tianjialong
/
p_boditech_vidas_a8000_Incubator_control_system_copy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
zhaohe 2 years ago
parent
727d6c765a
commit
cbe1294228
11 changed files with 1963 additions and 138 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .clang-format
  2. 3
      .vscode/settings.json
  3. 9
      app/MDK-ARM/EventRecorderStub.scvd
  4. 39
      app/MDK-ARM/JLinkSettings.ini
  5. 1885
      app/MDK-ARM/app.uvguix.h_zha
  6. 50
      app/MDK-ARM/app.uvoptx
  7. 2
      app/MDK-ARM/app.uvprojx
  8. 96
      app/MDK-ARM/startup_stm32f407xx.lst
  9. 2
      dep/libiflytop_micro
  10. 4
      src/port.h
  11. 9
      src/umain.c

2
.clang-format
View File

@ -2,4 +2,4 @@
# http://clang.llvm.org/docs/ClangFormatStyleOptions.html # http://clang.llvm.org/docs/ClangFormatStyleOptions.html
Language: Cpp Language: Cpp
BasedOnStyle: Google BasedOnStyle: Google
ColumnLimit: 120
ColumnLimit: 160

3
.vscode/settings.json
View File

@ -7,6 +7,7 @@
"stdio.h": "c", "stdio.h": "c",
"stm32_header.h": "c", "stm32_header.h": "c",
"stm32f4xx_hal_tim.h": "c", "stm32f4xx_hal_tim.h": "c",
"project_board.h": "c"
"project_board.h": "c",
"port.h": "c"
} }
} }

9
app/MDK-ARM/EventRecorderStub.scvd
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd">
<component name="EventRecorderStub" version="1.0.0"/> <!--name and version of the component-->
<events>
</events>
</component_viewer>

39
app/MDK-ARM/JLinkSettings.ini
View File

@ -0,0 +1,39 @@
[BREAKPOINTS]
ForceImpTypeAny = 0
ShowInfoWin = 1
EnableFlashBP = 2
BPDuringExecution = 0
[CFI]
CFISize = 0x00
CFIAddr = 0x00
[CPU]
MonModeVTableAddr = 0xFFFFFFFF
MonModeDebug = 0
MaxNumAPs = 0
LowPowerHandlingMode = 0
OverrideMemMap = 0
AllowSimulation = 1
ScriptFile=""
[FLASH]
CacheExcludeSize = 0x00
CacheExcludeAddr = 0x00
MinNumBytesFlashDL = 0
SkipProgOnCRCMatch = 1
VerifyDownload = 1
AllowCaching = 1
EnableFlashDL = 2
Override = 0
Device="ARM7"
[GENERAL]
WorkRAMSize = 0x00
WorkRAMAddr = 0x00
RAMUsageLimit = 0x00
[SWO]
SWOLogFile=""
[MEM]
RdOverrideOrMask = 0x00
RdOverrideAndMask = 0xFFFFFFFF
RdOverrideAddr = 0xFFFFFFFF
WrOverrideOrMask = 0x00
WrOverrideAndMask = 0xFFFFFFFF
WrOverrideAddr = 0xFFFFFFFF

1885
app/MDK-ARM/app.uvguix.h_zha
File diff suppressed because it is too large
View File

50
app/MDK-ARM/app.uvoptx
View File

@ -103,7 +103,7 @@
<bEvRecOn>1</bEvRecOn> <bEvRecOn>1</bEvRecOn>
<bSchkAxf>0</bSchkAxf> <bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf> <bTchkAxf>0</bTchkAxf>
<nTsel>6</nTsel>
<nTsel>4</nTsel>
<sDll></sDll> <sDll></sDll>
<sDllPa></sDllPa> <sDllPa></sDllPa>
<sDlgDll></sDlgDll> <sDlgDll></sDlgDll>
@ -114,11 +114,36 @@
<tDlgDll></tDlgDll> <tDlgDll></tDlgDll>
<tDlgPa></tDlgPa> <tDlgPa></tDlgPa>
<tIfile></tIfile> <tIfile></tIfile>
<pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
<pMon>Segger\JL2CM3.dll</pMon>
</DebugOpt> </DebugOpt>
<TargetDriverDllRegistry> <TargetDriverDllRegistry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>ARMRTXEVENTFLAGS</Key>
<Name>-L70 -Z18 -C0 -M0 -T1</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGTARM</Key>
<Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>ARMDBGFLAGS</Key>
<Name></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
<Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>JL2CM3</Key>
<Name>-U23520538 -O78 -S4 -ZTIFSpeedSel2000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F407VETx$CMSIS\Flash\STM32F4xx_512.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>UL2CM3</Key> <Key>UL2CM3</Key>
<Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_512 -FS08000000 -FL080000 -FP0($$Device:STM32F407VETx$CMSIS\Flash\STM32F4xx_512.FLM))</Name> <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_512 -FS08000000 -FL080000 -FP0($$Device:STM32F407VETx$CMSIS\Flash\STM32F4xx_512.FLM))</Name>
</SetRegEntry> </SetRegEntry>
@ -128,7 +153,24 @@
<Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F407VETx$CMSIS\Flash\STM32F4xx_512.FLM)</Name> <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F407VETx$CMSIS\Flash\STM32F4xx_512.FLM)</Name>
</SetRegEntry> </SetRegEntry>
</TargetDriverDllRegistry> </TargetDriverDllRegistry>
<Breakpoint/>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>76</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134230374</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>../Core/Src/main.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\app\../Core/Src/main.c\76</Expression>
</Bp>
</Breakpoint>
<Tracepoint> <Tracepoint>
<THDelay>0</THDelay> <THDelay>0</THDelay>
</Tracepoint> </Tracepoint>
@ -173,7 +215,7 @@
<pMultCmdsp></pMultCmdsp> <pMultCmdsp></pMultCmdsp>
<DebugDescription> <DebugDescription>
<Enable>1</Enable> <Enable>1</Enable>
<EnableFlashSeq>1</EnableFlashSeq>
<EnableFlashSeq>0</EnableFlashSeq>
<EnableLog>0</EnableLog> <EnableLog>0</EnableLog>
<Protocol>2</Protocol> <Protocol>2</Protocol>
<DbgClock>10000000</DbgClock> <DbgClock>10000000</DbgClock>

2
app/MDK-ARM/app.uvprojx
View File

@ -189,7 +189,7 @@
<hadIRAM2>1</hadIRAM2> <hadIRAM2>1</hadIRAM2>
<hadIROM2>0</hadIROM2> <hadIROM2>0</hadIROM2>
<StupSel>8</StupSel> <StupSel>8</StupSel>
<useUlib>0</useUlib>
<useUlib>1</useUlib>
<EndSel>0</EndSel> <EndSel>0</EndSel>
<uLtcg>0</uLtcg> <uLtcg>0</uLtcg>
<nSecure>0</nSecure> <nSecure>0</nSecure>

96
app/MDK-ARM/startup_stm32f407xx.lst
View File

@ -464,9 +464,9 @@ ARM Macro Assembler Page 8
171 00000000 IMPORT SystemInit 171 00000000 IMPORT SystemInit
172 00000000 IMPORT __main 172 00000000 IMPORT __main
173 00000000 173 00000000
174 00000000 4809 LDR R0, =SystemInit
174 00000000 4806 LDR R0, =SystemInit
175 00000002 4780 BLX R0 175 00000002 4780 BLX R0
176 00000004 4809 LDR R0, =__main
176 00000004 4806 LDR R0, =__main
177 00000006 4700 BX R0 177 00000006 4700 BX R0
178 00000008 ENDP 178 00000008 ENDP
179 00000008 179 00000008
@ -818,42 +818,25 @@ ARM Macro Assembler Page 13
398 0000001C ;******************************************************* 398 0000001C ;*******************************************************
************************ ************************
399 0000001C IF :DEF:__MICROLIB 399 0000001C IF :DEF:__MICROLIB
406 0000001C
407 0000001C IMPORT __use_two_region_memory
408 0000001C EXPORT __user_initial_stackheap
409 0000001C
410 0000001C __user_initial_stackheap
411 0000001C
412 0000001C 4804 LDR R0, = Heap_Mem
413 0000001E 4905 LDR R1, =(Stack_Mem + Stack_Size)
414 00000020 4A05 LDR R2, = (Heap_Mem + Heap_Size)
415 00000022 4B06 LDR R3, = Stack_Mem
416 00000024 4770 BX LR
417 00000026
418 00000026 00 00 ALIGN
419 00000028
420 00000028 ENDIF
421 00000028
422 00000028 END
400 0000001C
401 0000001C EXPORT __initial_sp
402 0000001C EXPORT __heap_base
403 0000001C EXPORT __heap_limit
404 0000001C
405 0000001C ELSE
420 ENDIF
421 0000001C
422 0000001C END
00000000 00000000
00000000 00000000
00000000
00000400
00000400
00000000
Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp.sp --apcs= Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M4.fp.sp --apcs=
interwork --depend=app\startup_stm32f407xx.d -oapp\startup_stm32f407xx.o -I.\RT interwork --depend=app\startup_stm32f407xx.d -oapp\startup_stm32f407xx.o -I.\RT
ARM Macro Assembler Page 14
E\_app -IC:\Users\h_zha\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Incl E\_app -IC:\Users\h_zha\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Incl
ude -IC:\Users\h_zha\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.16.0\Drivers\ ude -IC:\Users\h_zha\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.16.0\Drivers\
CMSIS\Device\ST\STM32F4xx\Include --predefine="__UVISION_VERSION SETA 535" --pr
edefine="_RTE_ SETA 1" --predefine="STM32F407xx SETA 1" --predefine="_RTE_ SETA
1" --list=startup_stm32f407xx.lst startup_stm32f407xx.s
CMSIS\Device\ST\STM32F4xx\Include --predefine="__MICROLIB SETA 1" --predefine="
__UVISION_VERSION SETA 535" --predefine="_RTE_ SETA 1" --predefine="STM32F407xx
SETA 1" --predefine="_RTE_ SETA 1" --list=startup_stm32f407xx.lst startup_stm3
2f407xx.s
@ -874,9 +857,8 @@ Symbol: Stack_Mem
Definitions Definitions
At line 35 in file startup_stm32f407xx.s At line 35 in file startup_stm32f407xx.s
Uses Uses
At line 413 in file startup_stm32f407xx.s
At line 415 in file startup_stm32f407xx.s
None
Comment: Stack_Mem unused
__initial_sp 00000400 __initial_sp 00000400
Symbol: __initial_sp Symbol: __initial_sp
@ -884,7 +866,8 @@ Symbol: __initial_sp
At line 36 in file startup_stm32f407xx.s At line 36 in file startup_stm32f407xx.s
Uses Uses
At line 60 in file startup_stm32f407xx.s At line 60 in file startup_stm32f407xx.s
Comment: __initial_sp used once
At line 401 in file startup_stm32f407xx.s
3 symbols 3 symbols
@ -906,25 +889,24 @@ Symbol: Heap_Mem
Definitions Definitions
At line 47 in file startup_stm32f407xx.s At line 47 in file startup_stm32f407xx.s
Uses Uses
At line 412 in file startup_stm32f407xx.s
At line 414 in file startup_stm32f407xx.s
None
Comment: Heap_Mem unused
__heap_base 00000000 __heap_base 00000000
Symbol: __heap_base Symbol: __heap_base
Definitions Definitions
At line 46 in file startup_stm32f407xx.s At line 46 in file startup_stm32f407xx.s
Uses Uses
None
Comment: __heap_base unused
At line 402 in file startup_stm32f407xx.s
Comment: __heap_base used once
__heap_limit 00000400 __heap_limit 00000400
Symbol: __heap_limit Symbol: __heap_limit
Definitions Definitions
At line 48 in file startup_stm32f407xx.s At line 48 in file startup_stm32f407xx.s
Uses Uses
None
Comment: __heap_limit unused
At line 403 in file startup_stm32f407xx.s
Comment: __heap_limit used once
4 symbols 4 symbols
@ -1884,15 +1866,7 @@ Symbol: WWDG_IRQHandler
At line 78 in file startup_stm32f407xx.s At line 78 in file startup_stm32f407xx.s
At line 226 in file startup_stm32f407xx.s At line 226 in file startup_stm32f407xx.s
__user_initial_stackheap 0000001C
Symbol: __user_initial_stackheap
Definitions
At line 410 in file startup_stm32f407xx.s
Uses
At line 408 in file startup_stm32f407xx.s
Comment: __user_initial_stackheap used once
94 symbols
93 symbols
@ -1906,8 +1880,7 @@ Symbol: Heap_Size
At line 43 in file startup_stm32f407xx.s At line 43 in file startup_stm32f407xx.s
Uses Uses
At line 47 in file startup_stm32f407xx.s At line 47 in file startup_stm32f407xx.s
At line 414 in file startup_stm32f407xx.s
Comment: Heap_Size used once
Stack_Size 00000400 Stack_Size 00000400
Symbol: Stack_Size Symbol: Stack_Size
@ -1915,8 +1888,7 @@ Symbol: Stack_Size
At line 32 in file startup_stm32f407xx.s At line 32 in file startup_stm32f407xx.s
Uses Uses
At line 35 in file startup_stm32f407xx.s At line 35 in file startup_stm32f407xx.s
At line 413 in file startup_stm32f407xx.s
Comment: Stack_Size used once
__Vectors_Size 00000188 __Vectors_Size 00000188
Symbol: __Vectors_Size Symbol: __Vectors_Size
@ -1948,13 +1920,5 @@ Symbol: __main
Uses Uses
At line 176 in file startup_stm32f407xx.s At line 176 in file startup_stm32f407xx.s
Comment: __main used once Comment: __main used once
__use_two_region_memory 00000000
Symbol: __use_two_region_memory
Definitions
At line 407 in file startup_stm32f407xx.s
Uses
None
Comment: __use_two_region_memory unused
3 symbols
448 symbols in table
2 symbols
445 symbols in table

2
dep/libiflytop_micro

@ -1 +1 @@
Subproject commit c1e8178179fee28fe320025f09ecd0b81a19d4d3
Subproject commit 5ec980e5bf5fe73bfdd7c5d7f1072ceeeb8982b0

4
src/port.h
View File

@ -0,0 +1,4 @@
#include <stdint.h>
#include <stdio.h>
void port_do_debug_light_state();

9
src/umain.c
View File

@ -1,10 +1,17 @@
#include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include "libiflytop_micro\stm32\basic\basic.h" #include "libiflytop_micro\stm32\basic\basic.h"
#include "port.h"
#include "project_board.h" #include "project_board.h"
#define TAG "UMAIN"
#define TAG "main"
int umain(int argc, char const *argv[]) { int umain(int argc, char const *argv[]) {
sys_loggger_enable(true);
ZLOGI(TAG, "VERSION:%s", VERSION); ZLOGI(TAG, "VERSION:%s", VERSION);
while (true) {
port_do_debug_light_state();
}
return 0; return 0;
} }
Write Preview
Loading…
Cancel
Save