localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

Updated avr script and added notes to Vagrantfile

This commit is contained in:
dragon788 2016-01-16 11:44:27 -06:00
parent 71ee3eb2e7
commit 987ac16afd
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Vagrantfile vendored
View File

@ -13,6 +13,9 @@ Vagrant.configure(2) do |config|
# VMware/Virtualbox 64 bit # VMware/Virtualbox 64 bit
# config.vm.box = "puphpet/centos65-x64" # config.vm.box = "puphpet/centos65-x64"
# #
# The opensuse boxes don't have dfu-util in their default repositories
#
# The virtualbox version has tools issues
# VMware/Virtualbox 64 bit # VMware/Virtualbox 64 bit
# config.vm.box = "bento/opensuse-13.2-x86_64" # config.vm.box = "bento/opensuse-13.2-x86_64"
# #
@ -35,7 +38,7 @@ Vagrant.configure(2) do |config|
# This section allows you to customize the VMware VM # This section allows you to customize the VMware VM
# settings, ie showing the GUI or upping the memory # settings, ie showing the GUI or upping the memory
# or cores if desired # or cores if desired
config.vm.provider "vmware" do |vmw| config.vm.provider "vmware_workstation" do |vmw|
# Hide the VMware GUI when booting the machine # Hide the VMware GUI when booting the machine
vmw.gui = false vmw.gui = false
@ -43,6 +46,14 @@ Vagrant.configure(2) do |config|
vmw.memory = "512" vmw.memory = "512"
end end
config.vm.provider "vmware_fusion" do |vmf|
# Hide the vmfare GUI when booting the machine
vmf.gui = false
# Customize the amount of memory on the VM:
vmf.memory = "512"
end
# This script ensures the required packages for AVR programming are installed # This script ensures the required packages for AVR programming are installed
# It also ensures the system always gets the latest updates when powered on # It also ensures the system always gets the latest updates when powered on
# If this causes issues you can run a 'vagrant destroy' and then # If this causes issues you can run a 'vagrant destroy' and then
@ -53,14 +64,14 @@ Vagrant.configure(2) do |config|
config.vm.post_up_message = """ config.vm.post_up_message = """
Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win) Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win)
or 'vagrant ssh-config' and Putty or another SSH tool or 'vagrant ssh-config' and Putty or Bitvise SSH or another SSH tool
Change directory to the keyboard you wish to program Change directory (cd) to the keyboard you wish to program
optionally and modify your layout, (Optionally) modify your layout,
then run 'make clean' then run 'make clean'
and then 'make' to compile the .eep and .hex files. and then 'make' to compile the .eep and .hex files.
Or you can copy and paste the line below. Or you can copy and paste the example line below.
cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make

4
avr_setup.sh
View File

@ -51,7 +51,7 @@ elif [[ -n "$(type -P yum)" ]]; then
elif [[ -n "$(type -P zypper)" ]]; then elif [[ -n "$(type -P zypper)" ]]; then
# openSUSE # openSUSE
zypper refresh --non-interactive && zypper update --non-interactive zypper --non-interactive refresh && zypper --non-interactive update
zypper --non-interactive install \ zypper --non-interactive install \
git \ git \
make \ make \
@ -59,6 +59,6 @@ elif [[ -n "$(type -P zypper)" ]]; then
kernel-devel \ kernel-devel \
patch \ patch \
wget \ wget \
dfu-util dfu-programmer
fi fi