From 20f2071cea99bedfed14e200b318a9d1141e45fb Mon Sep 17 00:00:00 2001 From: kbracher Date: Tue, 25 Mar 2025 19:29:53 +0100 Subject: [PATCH] git cleanup --- AMS_Master_Code/.gitignore | 3 +- AMS_Master_Code/.vscode/launch.json | 116 ++++++++++++++-------------- AMS_Master_Code/Makefile | 4 +- 3 files changed, 62 insertions(+), 61 deletions(-) diff --git a/AMS_Master_Code/.gitignore b/AMS_Master_Code/.gitignore index c2c4572..2179bb0 100644 --- a/AMS_Master_Code/.gitignore +++ b/AMS_Master_Code/.gitignore @@ -8,4 +8,5 @@ compile_commands.json STM32Make.make openocd.cfg .stm32env -!/.vscode/launch.json \ No newline at end of file +!/.vscode/launch.json +/.metadata/ \ No newline at end of file diff --git a/AMS_Master_Code/.vscode/launch.json b/AMS_Master_Code/.vscode/launch.json index 8dd8e26..986584c 100644 --- a/AMS_Master_Code/.vscode/launch.json +++ b/AMS_Master_Code/.vscode/launch.json @@ -1,60 +1,60 @@ { - "configurations": [ - { - "showDevDebugOutput": "none", - "cwd": "${workspaceRoot}", - "executable": "./build/debug/AMS_Master_Nucleo.elf", - "name": "Debug STM32", - "request": "launch", - "type": "cortex-debug", - "servertype": "openocd", - "preLaunchTask": "Build STM", - "device": "stm32h7a3xxq.s", - "configFiles": [ - "openocd.cfg" - ], - "swoConfig": { - "enabled": true, - "source": "probe", - "swoFrequency": 10666666, - "cpuFrequency": 64000000, - "decoders": [ - { - "port": 0, - "type": "console", - "label": "SWO LOG", - "encoding": "ascii" - } - ] - } - }, - { - "showDevDebugOutput": "none", - "cwd": "${workspaceRoot}", - "executable": "./build/debug/AMS_Master_Nucleo.elf", - "name": "Attach STM32", - "request": "attach", - "type": "cortex-debug", - "servertype": "openocd", - "preLaunchTask": "Build STM", - "device": "stm32h7a3xxq.s", - "configFiles": [ - "openocd.cfg" - ], - "swoConfig": { - "enabled": true, - "source": "probe", - "swoFrequency": 10666666, - "cpuFrequency": 64000000, - "decoders": [ - { - "port": 0, - "type": "console", - "label": "SWO LOG", - "encoding": "ascii" - } - ] - } - } - ] + "configurations": [ + { + "showDevDebugOutput": "none", + "cwd": "${workspaceRoot}", + "executable": "./build/debug/AMS_Master_Nucleo.elf", + "name": "Debug STM32", + "request": "launch", + "type": "cortex-debug", + "servertype": "openocd", + "preLaunchTask": "Build STM", + "device": "stm32h7a3xxq.s", + "configFiles": [ + "openocd.cfg" + ], + "swoConfig": { + "enabled": true, + "source": "probe", + "swoFrequency": 10666666, + "cpuFrequency": 64000000, + "decoders": [ + { + "port": 0, + "type": "console", + "label": "SWO LOG", + "encoding": "ascii" + } + ] + } + }, + { + "showDevDebugOutput": "none", + "cwd": "${workspaceRoot}", + "executable": "./build/debug/AMS_Master_Nucleo.elf", + "name": "Attach STM32", + "request": "attach", + "type": "cortex-debug", + "servertype": "openocd", + "preLaunchTask": "Build STM", + "device": "stm32h7a3xxq.s", + "configFiles": [ + "openocd.cfg" + ], + "swoConfig": { + "enabled": true, + "source": "probe", + "swoFrequency": 10666666, + "cpuFrequency": 64000000, + "decoders": [ + { + "port": 0, + "type": "console", + "label": "SWO LOG", + "encoding": "ascii" + } + ] + } + } + ] } \ No newline at end of file diff --git a/AMS_Master_Code/Makefile b/AMS_Master_Code/Makefile index 6d582ed..d89dbc1 100644 --- a/AMS_Master_Code/Makefile +++ b/AMS_Master_Code/Makefile @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [4.5.0-RC5] date: [Thu Feb 20 01:39:39 CET 2025] +# File automatically-generated by tool: [projectgenerator] version: [4.6.0-B36] date: [Tue Mar 18 20:15:25 CET 2025] ########################################################################################################################## # ------------------------------------------------ @@ -145,7 +145,7 @@ CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)" # LDFLAGS ####################################### # link script -LDSCRIPT = stm32h7a3zitxq_flash.ld +LDSCRIPT = STM32H7A3XX_FLASH.ld # libraries LIBS = -lc -lm -lnosys