diff options
| author | Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> | 2018-05-09 18:14:30 +0200 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-05-09 09:14:30 -0700 |
| commit | 00596d55e34c003d55a530366bedfb2ea467bedc (patch) | |
| tree | 95e02d77026987b9c34da8b7740f6d8dea5ba840 /util | |
| parent | 749916e6e233f66b554925f120c29e2ce353e90e (diff) | |
Added propper support for Lets split vitamins (#2559)
* Added support for the upcomming Lets_split vitamins included * Updated readme * Corrected header of readme * Enabled RGB * Broke everything * broke some more shit * Revert "broke some more shit" This reverts commit 6ad68e6269cc0d04c16564ce9598dfd3db1e23c1. * Revert "Broke everything" This reverts commit feeee4e40db15a726f2292b6a9406ef45c1e54a7. * Fixed USB detection, and RGB on slave * started modifying readme, to use msys2 * Added support for the upcomming Lets_split vitamins included * Updated readme * Corrected header of readme * Enabled RGB * Broke everything * broke some more shit * Revert "broke some more shit" This reverts commit 6ad68e6269cc0d04c16564ce9598dfd3db1e23c1. * Revert "Broke everything" This reverts commit feeee4e40db15a726f2292b6a9406ef45c1e54a7. * Fixed USB detection, and RGB on slave * started modifying readme, to use msys2 * Updated readme to reflect use of msys2 Added avrdude to msys path * added avrdude option to msys installer * Removed extra installation of avrdude * Renamed to vitamins_included and implemented drashnas changes * Fixed include guard * Fixed some includes, and added avrdude target to docs. * Fixed default keyboard
Diffstat (limited to 'util')
| -rw-r--r-- | util/activate_msys2.sh | 1 | ||||
| -rw-r--r-- | util/msys2_install.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/util/activate_msys2.sh b/util/activate_msys2.sh index 8874d8325f..1ddffbaad7 100644 --- a/util/activate_msys2.sh +++ b/util/activate_msys2.sh @@ -8,6 +8,7 @@ function export_variables { export PATH=$PATH:$util_dir/flip/bin export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin + export PATH=$PATH:/mingw64/bin } export_variables diff --git a/util/msys2_install.sh b/util/msys2_install.sh index c646857541..d9459580c7 100644 --- a/util/msys2_install.sh +++ b/util/msys2_install.sh @@ -67,7 +67,7 @@ if [ ! -d "$armtools" ]; then while true; do echo echo "The ARM toolchain is not installed." - echo "This is needed for building ARM based keboards." + echo "This is needed for building ARM based keyboards." read -p "Do you want to install it? (Y/N) " res case $res in [Yy]* ) install_arm; break;; |