From 6c0bbb83f6fcf379a328dff2d24f03ac07877d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20=27MaxMax=27=20M=C3=B6nikes?= Date: Thu, 29 Jun 2023 23:17:41 +0200 Subject: [PATCH] My own algo Branch with Blackjack and Hookers --- .gitignore | 1 + .gitmodules | 2 +- STM32Make.make | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 16a6d60..8d86a33 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /.cache/ .clangd TouchGFX/build +.gitmodules diff --git a/.gitmodules b/.gitmodules index 7473532..5410e71 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "Core/Lib/can-halal"] path = Core/Lib/can-halal - url = ssh://git@git.fasttube.de:313/FaSTTUBe/can-halal.git + url = https://git.fasttube.de/FaSTTUBe/can-halal.git diff --git a/STM32Make.make b/STM32Make.make index 9e78481..d454393 100644 --- a/STM32Make.make +++ b/STM32Make.make @@ -85,7 +85,7 @@ PREFIX = arm-none-eabi- POSTFIX = " # The gcc compiler bin path can be either defined in make command via GCC_PATH variable (> make GCC_PATH=xxx) # either it can be added to the PATH environment variable. -GCC_PATH="/home/jasper/.config/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/arm-none-eabi-gcc/11.3.1-1.1.2/.content/bin +GCC_PATH="c:/Users/max/AppData/Roaming/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/arm-none-eabi-gcc/11.2.1-1.2.2/.content/bin ifdef GCC_PATH CXX = $(GCC_PATH)/$(PREFIX)g++$(POSTFIX) CC = $(GCC_PATH)/$(PREFIX)gcc$(POSTFIX) @@ -241,19 +241,19 @@ $(BUILD_DIR): # flash ####################################### flash: $(BUILD_DIR)/$(TARGET).elf - "/home/jasper/.config/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/openocd/0.11.0-5.1/.content/bin/openocd" -f ./openocd.cfg -c "program $(BUILD_DIR)/$(TARGET).elf verify reset exit" + "C:/USERS/MAX/APPDATA/ROAMING/CODE/USER/GLOBALSTORAGE/BMD.STM32-FOR-VSCODE/@XPACK-DEV-TOOLS/OPENOCD/0.11.0-4.1/.CONTENT/BIN/OPENOCD.EXE" -f ./openocd.cfg -c "program $(BUILD_DIR)/$(TARGET).elf verify reset exit" ####################################### # erase ####################################### erase: $(BUILD_DIR)/$(TARGET).elf - "/home/jasper/.config/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/openocd/0.11.0-5.1/.content/bin/openocd" -f ./openocd.cfg -c "init; reset halt; stm32f3x mass_erase 0; exit" + "C:/USERS/MAX/APPDATA/ROAMING/CODE/USER/GLOBALSTORAGE/BMD.STM32-FOR-VSCODE/@XPACK-DEV-TOOLS/OPENOCD/0.11.0-4.1/.CONTENT/BIN/OPENOCD.EXE" -f ./openocd.cfg -c "init; reset halt; stm32f3x mass_erase 0; exit" ####################################### # clean up ####################################### clean: - -rm -fR $(BUILD_DIR) + cmd /c rd /s /q $(BUILD_DIR) ####################################### # custom makefile rules