From d04e5e704bacb272dba75777ea1f115a70095cce Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jul 2022 14:18:07 +0200 Subject: [PATCH] Update vscode settings Update README and version --- .vscode/cmake-kits.json | 2 +- .vscode/settings.json | 12 ++++++------ README.md | 20 +++++--------------- version.txt | 2 +- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/.vscode/cmake-kits.json b/.vscode/cmake-kits.json index c6999cf..82462e2 100644 --- a/.vscode/cmake-kits.json +++ b/.vscode/cmake-kits.json @@ -3,7 +3,7 @@ "name": "Local_gcc-avr-none-eabi", "toolchainFile": "${workspaceFolder}/cmake/AnyAvrGcc.cmake", "cmakeSettings": { - "CMAKE_MAKE_PROGRAM": "${workspaceFolder}/.dependencies/ninja-1.9.0/ninja" + "CMAKE_MAKE_PROGRAM": "${workspaceFolder}/.dependencies/ninja-1.10.2/ninja" } } ] diff --git a/.vscode/settings.json b/.vscode/settings.json index 760cc8d..04d6261 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,14 +6,14 @@ "-fno-ms-compatibility", "-nostdinc", "-nostdinc++", - "-isystem${workspaceFolder}/.dependencies/avr8-gnu-toolchain-5.4.0/avr/include", - "-isystem${workspaceFolder}/.dependencies/avr8-gnu-toolchain-5.4.0/avr/include/avr", - "-isystem${workspaceFolder}/.dependencies/avr8-gnu-toolchain-5.4.0/avr/include/compat, - "-isystem${workspaceFolder}/.dependencies/avr8-gnu-toolchain-5.4.0/avr/include/sys", - "-isystem${workspaceFolder}/.dependencies/avr8-gnu-toolchain-5.4.0/avr/include/util", + "-isystem${workspaceFolder}/.dependencies/gcc-avr-7.3.0/avr/include", + "-isystem${workspaceFolder}/.dependencies/gcc-avr-7.3.0/avr/include/avr", + "-isystem${workspaceFolder}/.dependencies/gcc-avr-7.3.0/avr/include/compat", + "-isystem${workspaceFolder}/.dependencies/gcc-avr-7.3.0/avr/include/sys", + "-isystem${workspaceFolder}/.dependencies/gcc-avr-7.3.0/avr/include/util", ], "cmake.buildDirectory": "${workspaceFolder}/build-vscode/${buildKit}", - "cmake.cmakePath": "${workspaceFolder}/.dependencies/cmake-3.15.5/bin/cmake", + "cmake.cmakePath": "${workspaceFolder}/.dependencies/cmake-3.21.3/bin/cmake", "cmake.generator": "Ninja", "files.insertFinalNewline": true, } diff --git a/README.md b/README.md index fcbc507..89b1a88 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,15 @@ # Prusa-Firmware-MMU-Private ## How to prepare build env and tools -As the first step extract the AVR-GCC to some dir, e.g. `/home/user/AVRToolchainMMU/avr8-gnu-toolchain-5.4.0` -Add `/home/user/AVRToolchainMMU/avr8-gnu-toolchain-5.4.0/bin` to your `PATH`. +run `./utils/bootstrap.py` -``` -mkdir .dependencies -cd .dependencies -mkdir gcc-avr-5.4.0 -cd .. -utils/bootstrap.py -``` `bootstrap.py` will now download all the "missing" dependencies into the `.dependencies` folder: - clang-format-9.0.0-noext -- cmake-3.15.5 -- ninja-1.9.0 - -Note: bootstrap.py will not try to download the AVR-GCC as there is already a directory called -`gcc-avr-5.4.0`. This will be fixed when we find out where to download the correct packages reliably. +- cmake-3.21.3 +- ninja-1.10.2 +- gcc-avr-7.3.0 ## How to build the preliminary project so far: Now the process is the same as in the Buddy Firmware: @@ -37,4 +27,4 @@ cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE=../cmake/AnyAvrGcc.cmake ninja ``` -Should produce a firmware.hex file as well. +Should produce a MM-control-01.hex file as well. diff --git a/version.txt b/version.txt index 227cea2..ed2af5c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.0 +2.0.19