From 00596d55e34c003d55a530366bedfb2ea467bedc Mon Sep 17 00:00:00 2001
From: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>
Date: Wed, 9 May 2018 18:14:30 +0200
Subject: 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
---
 util/activate_msys2.sh | 1 +
 util/msys2_install.sh  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'util')

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;;
-- 
cgit v1.2.1


From 5346cb2d20100f2bbf35e8c8107ae272404f2198 Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Wed, 9 May 2018 21:36:40 -0700
Subject: Support both AVR and ps2avrGB targets for new_project script (#2811)

* Stopping point at creating targets for new_project script

* Add second argument for target

* Add the ps2avrgb target

* consider the case where the firmware type target is not valid

* fix template files to be more generic

* Code cleanup

* Change variable name to be more descriptive

* make avr the default

* forgot to put the template files in

* Take out useless comments

* add usage info
---
 util/new_project.sh | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'util')

diff --git a/util/new_project.sh b/util/new_project.sh
index 0c28feb4ae..a85e833222 100755
--- a/util/new_project.sh
+++ b/util/new_project.sh
@@ -2,9 +2,21 @@
 # Script to make a new quantum project
 # Jack Humbert 2015
 
-if [ -z "$1" ]; then
-	echo "Usage: $0 <keyboard_name>"
-	exit 1
+KEYBOARD=$1
+KEYBOARD_TYPE=$2
+
+if [ -z "$KEYBOARD" ]; then
+    echo "Usage:   $0 <keyboard_name> <keyboard_type>"
+    echo "Example: $0 gh60 avr"
+    echo "Example: $0 bfake ps2avrgb"
+    exit 1
+elif [ -z "$KEYBOARD_TYPE" ]; then
+  KEYBOARD_TYPE=avr
+fi
+
+if [ $KEYBOARD_TYPE != "avr" -a $KEYBOARD_TYPE != "ps2avrgb" ]; then
+  echo "Invalid keyboard type target"
+  exit 1
 fi
 
 if [ -e "keyboards/$1" ]; then
@@ -14,12 +26,14 @@ fi
 
 cd "$(dirname "$0")/.."
 
-KEYBOARD=$1
 KEYBOARD_UPPERCASE=$(echo $1 | awk '{print toupper($0)}')
 KEYBOARD_NAME=$(basename $1)
 KEYBOARD_NAME_UPPERCASE=$(echo $KEYBOARD_NAME | awk '{print toupper($0)}')
 
-cp -r quantum/template keyboards/$KEYBOARD
+
+cp -r quantum/template/base keyboards/$KEYBOARD
+cp -r quantum/template/$KEYBOARD_TYPE/. keyboards/$KEYBOARD
+
 mv keyboards/${KEYBOARD}/template.c keyboards/${KEYBOARD}/${KEYBOARD_NAME}.c
 mv keyboards/${KEYBOARD}/template.h keyboards/${KEYBOARD}/${KEYBOARD_NAME}.h
 find keyboards/${KEYBOARD} -type f -exec sed -i '' -e "s;%KEYBOARD%;${KEYBOARD_NAME};g" {} \;
-- 
cgit v1.2.1