diff --git a/.eide/eide.yml b/.eide/eide.yml index 1a6f299..7933ec1 100644 --- a/.eide/eide.yml +++ b/.eide/eide.yml @@ -72,6 +72,74 @@ miscInfo: uid: d92a06a9fb4c340402d39197c79d1252 targets: Debug: + cppPreprocessAttrs: + defineList: + - USE_STDPERIPH_DRIVER + - STM32F10X_HD + - DEBUG + incList: + - App/Inc + - Board + - VoiletBspStm32F10x/Bsp/Inc + - VoiletBspStm32F10x/StdLib/Inc + - VoiletBspStm32F10x/System/Cmsis/Inc + - VoiletBspStm32F10x/System + - VoiletBspStm32F10x/ThirdParty/LetterShellV3/Inc + libList: [] + excludeList: [] + settings: + debugger: cortex-debug + toolchain: GCC + toolchainConfigMap: + GCC: + archExtensions: "" + cpuType: Cortex-M3 + floatingPointHardware: none + options: + version: 5 + afterBuildTasks: [] + asm-compiler: + ASM_FLAGS: "" + beforeBuildTasks: [] + c/cpp-compiler: + CXX_FLAGS: "" + C_FLAGS: "" + language-c: c11 + language-cpp: c++11 + one-elf-section-per-data: true + one-elf-section-per-function: true + optimization: level-debug + warnings: all-warnings + global: + $float-abi-type: hard + misc-control: "" + not-use-syscalls: true + output-debug-info: enable + use-newlib-nano: true + linker: + $outputTaskExcludes: + - .bin + LD_FLAGS: "" + LIB_FLAGS: -lm + output-format: elf + remove-unused-input-sections: true + scatterFilePath: VoiletBspStm32F10x/System/LinkScripts/Gcc/stm32_flash_ze.ld + storageLayout: + RAM: [] + ROM: [] + useCustomScatterFile: true + uploadConfigMap: + JLink: + baseAddr: "" + bin: "" + cpuInfo: + cpuName: STM32F103ZE + vendor: ST + otherCmds: "" + proType: 1 + speed: 8000 + uploader: JLink + Release: cppPreprocessAttrs: defineList: - USE_STDPERIPH_DRIVER diff --git a/.eide/files.options.yml b/.eide/files.options.yml index 269f4d6..52b7793 100644 --- a/.eide/files.options.yml +++ b/.eide/files.options.yml @@ -18,3 +18,6 @@ options: Debug: files: {} virtualPathFiles: {} + Release: + files: {} + virtualPathFiles: {} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..3874a73 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,17 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "cwd": "${workspaceRoot}", + "type": "cortex-debug", + "request": "launch", + "name": "Debug: JLINK", + "servertype": "jlink", + "interface": "swd", + "executable": "Output/Debug/Stm32F10xTmp.elf", + "runToEntryPoint": "main", + "device": "STM32F103ZE", + "toolchainPrefix": "arm-none-eabi" + } + ] +} \ No newline at end of file diff --git a/App/Src/main.c b/App/Src/main.c index 0812bfc..bc5c81d 100755 --- a/App/Src/main.c +++ b/App/Src/main.c @@ -8,6 +8,8 @@ #include "Bsp.h" #include "main.h" +int8_t DiTbl[DI_NUM]; + int main(void) { @@ -15,9 +17,14 @@ int main(void) while (1) { + for (uint8_t i = 0; i < DI_NUM; i++) + { + DiTbl[i] = DiGet(i); + } + LedToggle(LED0); DelayMs(100); } - return 0; + EXIT_APP } \ No newline at end of file diff --git a/Board/Board.h b/Board/Board.h index ddf41d2..7a2d451 100755 --- a/Board/Board.h +++ b/Board/Board.h @@ -11,21 +11,23 @@ /* Chip Library Enable */ /* Extra Library Enable */ -#define TTY_COM COM1 +#define TTY_COM COM1 #define TTY_BAUD 115200 -#define LED_NUM 2 //LED灯数量 +#define LED_NUM 2 // LED灯数量 enum { LED0 = 0, - LED1 + LED1, }; -#define DI_NUM 0 //数字信号输入通道数量 -// enum { -// -// }; +#define DI_NUM 3 // 数字信号输入通道数量 +enum { + KEY_WK_UP = 0, + KEY_0, + KEY_1, +}; -#define DO_NUM 0 //数字信号输出通道数量 +#define DO_NUM 0 // 数字信号输出通道数量 // enum { // // }; diff --git a/Doc/普中STM32-F103-凤凰开发板原理图.pdf b/Doc/普中STM32-F103-凤凰开发板原理图.pdf new file mode 100755 index 0000000..65a81d5 Binary files /dev/null and b/Doc/普中STM32-F103-凤凰开发板原理图.pdf differ