EBB firmware updater for Mac, v 2.6.0

EBB_firmware/EBBUpdaterMac/UpdateEBB

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-echo -e "Welcome to the EiBotBoard (EBB) Firmware Updater, version 2.5.4"
+echo -e "Welcome to the EiBotBoard (EBB) Firmware Updater, version 2.6.0"
+echo -e "\nIn case of unexpected results, please make sure that you have"
+echo -e "exactly one EBB connected to your computer via USB."
 
 base='/dev/'
 result=`ls /dev | grep -m 1 usbmodem`
@@ -14,15 +16,21 @@ then
   echo -e "BL" > $portName
   sleep 2s
   #echo -e "Calling mphidflash to update firmware"
-  ./mphidflash -w app.X.production.hex -r
-  printf "\n\nFirmware update complete. Preparing to test."
+  ./mphidflash -w EBF_v260_BL.unified.hex -r
+  printf "\n\nFirmware update complete."
   sleep 2s
+  
+  printf "\n\nLooking for EBB."
+  
+  result=`ls /dev | grep -m 1 usbmodem`
+  portName=$base$result
+
   printf "\nAsking the EBB for its firmware version:"
   echo -e "V" > $portName
   result2=`head -n 1 < $portName`
   printf "\n$result2"
 
-  if [[ $result2 == *"2.5.4"* ]]
+  if [[ $result2 == *"2.6.0"* ]]
   then
     printf "\n\nFirmware updated successfully."
   else
@@ -32,7 +40,7 @@ then
 else
   printf "\nChecking to see if we have a device in bootloader mode."
 
-  ./mphidflash -w app.X.production.hex -r
+  ./mphidflash -w EBF_v260_BL.unified.hex -r
   sleep 2s
   base='/dev/'
   result=`ls /dev | grep -m 1 usbmodem`
@@ -48,7 +56,7 @@ if [ "$result" ]
   result2=`head -n 1 < $portName`
   printf "\n$result2"
 
-  if [[ $result2 == *"2.5.4"* ]]
+  if [[ $result2 == *"2.6.0"* ]]
   then
     printf "\n\nFirmware updated successfully."
   else

EBB_firmware/EBBUpdaterMac/UpdateEBB.app/Contents/Resources/script

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-echo -e "Welcome to the EiBotBoard (EBB) Firmware Updater, version 2.5.4"
+echo -e "Welcome to the EiBotBoard (EBB) Firmware Updater, version 2.6.0"
+echo -e "\nIn case of unexpected results, please make sure that you have"
+echo -e "exactly one EBB connected to your computer via USB."
 
 base='/dev/'
 result=`ls /dev | grep -m 1 usbmodem`
@@ -14,15 +16,21 @@ then
   echo -e "BL" > $portName
   sleep 2s
   #echo -e "Calling mphidflash to update firmware"
-  ./mphidflash -w app.X.production.hex -r
-  printf "\n\nFirmware update complete. Preparing to test."
+  ./mphidflash -w EBF_v260_BL.unified.hex -r
+  printf "\n\nFirmware update complete."
   sleep 2s
+  
+  printf "\n\nLooking for EBB."
+  
+  result=`ls /dev | grep -m 1 usbmodem`
+  portName=$base$result
+
   printf "\nAsking the EBB for its firmware version:"
   echo -e "V" > $portName
   result2=`head -n 1 < $portName`
   printf "\n$result2"
 
-  if [[ $result2 == *"2.5.4"* ]]
+  if [[ $result2 == *"2.6.0"* ]]
   then
     printf "\n\nFirmware updated successfully."
   else
@@ -32,7 +40,7 @@ then
 else
   printf "\nChecking to see if we have a device in bootloader mode."
 
-  ./mphidflash -w app.X.production.hex -r
+  ./mphidflash -w EBF_v260_BL.unified.hex -r
   sleep 2s
   base='/dev/'
   result=`ls /dev | grep -m 1 usbmodem`
@@ -48,7 +56,7 @@ if [ "$result" ]
   result2=`head -n 1 < $portName`
   printf "\n$result2"
 
-  if [[ $result2 == *"2.5.4"* ]]
+  if [[ $result2 == *"2.6.0"* ]]
   then
     printf "\n\nFirmware updated successfully."
   else

EBB_firmware/EBBUpdaterMac/UpdateEBB.app/Contents/_CodeSignature/CodeResources

@@ -8,25 +8,25 @@
 		<data>
 		Few2LBNciX42IkdrBnAq3ary+Uc=
 		</data>
+		<key>Resources/EBF_v260_BL.unified.hex</key>
+		<data>
+		s9cKhmyEnUvrmv5ynpB6CYdTWm8=
+		</data>
 		<key>Resources/MainMenu.nib</key>
 		<data>
 		NewvWHjsdhvS62VxKoSkxe8dNhs=
 		</data>
-		<key>Resources/app.X.production.hex</key>
-		<data>
-		Rtp/DeAIZewnjZObEiiC3K6Uf2Q=
-		</data>
 		<key>Resources/appIcon.icns</key>
 		<data>
 		HBDI8vivcy+joKCWSHorAjo37UE=
 		</data>
 		<key>Resources/mphidflash</key>
 		<data>
-		zpPZ6EhoVMxXyV+n/+XDPdo38nQ=
+		3KdBqjTE7qyfv7Etq2F8YRWZT/Q=
 		</data>
 		<key>Resources/script</key>
 		<data>
-		Oumt9l7FEe5QpY8fCgPsTdooKN4=
+		cATecCXkCvA2MpyQRL4vN2r8IyQ=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -42,6 +42,17 @@
 			tvdQEx9EBjtU1x4RLoGR03RNnIgh8fDhKyjlMlv1TqY=
 			</data>
 		</dict>
+		<key>Resources/EBF_v260_BL.unified.hex</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			s9cKhmyEnUvrmv5ynpB6CYdTWm8=
+			</data>
+			<key>hash2</key>
+			<data>
+			go8YqxUTnYmsJalAkCdRcNNYj0xGwIeLgmtLlcLa1mE=
+			</data>
+		</dict>
 		<key>Resources/MainMenu.nib</key>
 		<dict>
 			<key>hash</key>
@@ -53,17 +64,6 @@
 			qzWV1mtMEaQ+rRLjlHVn30rpOa7zWu+teJbf1ayCG7Y=
 			</data>
 		</dict>
-		<key>Resources/app.X.production.hex</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			Rtp/DeAIZewnjZObEiiC3K6Uf2Q=
-			</data>
-			<key>hash2</key>
-			<data>
-			4pUYCbGlre1Ax9R79m4ucw2NkXyHCAqUlDt1BtBh7CA=
-			</data>
-		</dict>
 		<key>Resources/appIcon.icns</key>
 		<dict>
 			<key>hash</key>
@@ -79,22 +79,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			zpPZ6EhoVMxXyV+n/+XDPdo38nQ=
+			3KdBqjTE7qyfv7Etq2F8YRWZT/Q=
 			</data>
 			<key>hash2</key>
 			<data>
-			YJAlTAwSh7ymAXfTFDASbKRoOLqPpyjPzKO3VFamk5I=
+			XwJ81XvQTzcdKyoQ9I3UpTskPSTZnIKQZ068YUbP704=
 			</data>
 		</dict>
 		<key>Resources/script</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			Oumt9l7FEe5QpY8fCgPsTdooKN4=
+			cATecCXkCvA2MpyQRL4vN2r8IyQ=
 			</data>
 			<key>hash2</key>
 			<data>
-			uKj8fp3Lx4Q9xU57USmVWOssIeD5S6P8w7I6gCkPSN0=
+			zOofptU6bp2TSE4FxV2JhzBfkPxhD8O5TWrko9WJNLM=
 			</data>
 		</dict>
 	</dict>