diff options
| -rw-r--r-- | .vscode/settings.json | 3 | ||||
| -rw-r--r-- | readme.md | 3 | ||||
| -rw-r--r-- | scripts/compiledb-full-path-mingw.sh | 13 | ||||
| -rwxr-xr-x | scripts/install-packages-arch.sh | 5 | ||||
| -rw-r--r-- | scripts/install-packages-brew.sh | 1 | ||||
| -rwxr-xr-x | scripts/install-packages-mingw.sh | 5 | ||||
| -rw-r--r-- | scripts/readme.md | 1 | ||||
| -rw-r--r-- | stm32f091/makefile | 2 |
8 files changed, 25 insertions, 8 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index 0dadf29..d027762 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,5 +7,6 @@ "icon": "terminal-bash" } }, - "cmake.configureOnOpen": false + "cmake.configureOnOpen": false, + "files.eol": "\n" } @@ -20,9 +20,8 @@ listed below. toolchain installation scripts can be found in the |STM32 makefile compilation|yes|yes|?| |STM32 makefile upload|yes|yes|?| |STM32 debugging (vscode)|yes|yes|?| -|STM32 editor autocomplete|yes|?|?| +|STM32 editor autocomplete|yes|yes|?| |QT client compilation (qmake)|yes|?|?| |QT client running|yes|?|?| |QT client debugging (vscode)|yes|?|?| |QT client editor autocomplete|yes|?|?| - diff --git a/scripts/compiledb-full-path-mingw.sh b/scripts/compiledb-full-path-mingw.sh new file mode 100644 index 0000000..8f95756 --- /dev/null +++ b/scripts/compiledb-full-path-mingw.sh @@ -0,0 +1,13 @@ +#!/bin/sh +[ `uname -o` != "Msys" ] && exit + +COMPILEDB_FILE="$1" + +fixpath () { + NEW="C:/msys64`which $1`.exe" + sed "s#\"$1\",#\"$NEW\",#g" -i "$COMPILEDB_FILE" +} + +fixpath arm-none-eabi-gcc +fixpath arm-none-eabi-objcopy +sed "s#\"/c/#\"C:/#g" -i "$COMPILEDB_FILE" diff --git a/scripts/install-packages-arch.sh b/scripts/install-packages-arch.sh index 6200f11..480e42d 100755 --- a/scripts/install-packages-arch.sh +++ b/scripts/install-packages-arch.sh @@ -5,4 +5,7 @@ pacman --noconfirm --needed -Sy \ arm-none-eabi-gdb \ arm-none-eabi-newlib \ arm-none-eabi-binutils \ - stlink + stlink \ + python python-pip + +pip3 install compiledb diff --git a/scripts/install-packages-brew.sh b/scripts/install-packages-brew.sh index f402048..7180b95 100644 --- a/scripts/install-packages-brew.sh +++ b/scripts/install-packages-brew.sh @@ -9,4 +9,3 @@ brew install --cask \ make git \ gcc-arm-embedded \ stlink - diff --git a/scripts/install-packages-mingw.sh b/scripts/install-packages-mingw.sh index 112b96c..9acb392 100755 --- a/scripts/install-packages-mingw.sh +++ b/scripts/install-packages-mingw.sh @@ -6,6 +6,9 @@ pacman --noconfirm --needed -Sy \ mingw-w64-x86_64-arm-none-eabi-newlib \ mingw-w64-x86_64-arm-none-eabi-binutils \ mingw-w64-x86_64-stlink \ - mingw-w64-x86_64-gdb-multiarch + mingw-w64-x86_64-gdb-multiarch \ + python python-pip + +pip3 install compiledb printf "\n\n\ninstalling packages done!" diff --git a/scripts/readme.md b/scripts/readme.md index 4e568c0..d7b6fb2 100644 --- a/scripts/readme.md +++ b/scripts/readme.md @@ -26,4 +26,3 @@ code tasks, so you don't have to be a terminal ninja. [zadig](https://zadig.akeo.ie/) to update the usb driver. - make sure to use the 64-bit version of msys2 (titled "MSYS2 MINGW64" in your start menu) - diff --git a/stm32f091/makefile b/stm32f091/makefile index a359853..b5cf22f 100644 --- a/stm32f091/makefile +++ b/stm32f091/makefile @@ -72,7 +72,7 @@ flash: $(TARGET).bin compile_commands: clean compiledb make + ../scripts/compiledb-full-path-mingw.sh compile_commands.json clean: $(RM) $(TARGET).bin $(TARGET).elf $(OBJS) - |