Updated avr script and added notes to Vagrantfile

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

diff --git a/avr_setup.sh b/avr_setup.sh
index 15f3118c05e4d5aa37bff6a1ff42d31c847dd6ab..4b252808520684500eaade6bf2f717f6aad6c336 100644 (file)
--- 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