From 987ac16afde0539dca1f158c1f2186bcb3f26c76 Mon Sep 17 00:00:00 2001 From: dragon788 Date: Sat, 16 Jan 2016 11:44:27 -0600 Subject: [PATCH] Updated avr script and added notes to Vagrantfile --- Vagrantfile | 21 ++++++++++++++++----- avr_setup.sh | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 788e014de..a2059cb80 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -13,6 +13,9 @@ Vagrant.configure(2) do |config| # VMware/Virtualbox 64 bit # 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 # 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 # settings, ie showing the GUI or upping the memory # 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 vmw.gui = false @@ -43,6 +46,14 @@ Vagrant.configure(2) do |config| vmw.memory = "512" 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 # 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 @@ -53,14 +64,14 @@ Vagrant.configure(2) do |config| config.vm.post_up_message = """ 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 - optionally and modify your layout, + Change directory (cd) to the keyboard you wish to program + (Optionally) modify your layout, then run 'make clean' 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 diff --git a/avr_setup.sh b/avr_setup.sh index 15f3118c0..4b2528085 100644 --- a/avr_setup.sh +++ b/avr_setup.sh @@ -51,7 +51,7 @@ elif [[ -n "$(type -P yum)" ]]; then elif [[ -n "$(type -P zypper)" ]]; then # openSUSE - zypper refresh --non-interactive && zypper update --non-interactive + zypper --non-interactive refresh && zypper --non-interactive update zypper --non-interactive install \ git \ make \ @@ -59,6 +59,6 @@ elif [[ -n "$(type -P zypper)" ]]; then kernel-devel \ patch \ wget \ - dfu-util + dfu-programmer fi