Merge branch 'Beta' into Alpha

lukasb1b · Jun 21, 2018 · 58b03d0 · 58b03d0
2 parents 110bc53 + f900354
commit 58b03d0
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 8 deletions.
diff --git a/Astro.ino b/Astro.ino
@@ -707,5 +707,3 @@ void soundClick() {
     #endif
   }
 }
-
-
diff --git a/Command.ino b/Command.ino
@@ -1984,4 +1984,3 @@ bool cmdReply(char *s) {
   strcpy(s,_replyX); _replyX[0]=0;
   return true;
 }
-
diff --git a/Config.Mega2560Alt.h b/Config.Mega2560Alt.h
@@ -200,4 +200,3 @@
 #define FileVersionConfig 2
 #include "src/pinmaps/Pins.Mega2560Alt.h"
 #endif
-
diff --git a/Goto.ino b/Goto.ino
@@ -497,4 +497,3 @@ GotoErrors goTo(long thisTargetAxis1, long thisTargetAxis2, long altTargetAxis1,
 
   return GOTO_ERR_NONE;
 }
-
diff --git a/Guide.ino b/Guide.ino
@@ -359,4 +359,3 @@ void ST4() {
 #endif
 #endif
 }
-
diff --git a/OnStep.ino b/OnStep.ino
@@ -40,9 +40,11 @@
 // firmware info, these are returned by the ":GV?#" commands
 #define FirmwareDate          __DATE__
 #define FirmwareVersionMajor  1
+
 #define FirmwareVersionMinor  8
 #define FirmwareVersionPatch  "l"     // for example major.minor patch: 1.3c
 #define FirmwareVersionConfig 2       // internal, for tracking configuration file changes
+
 #define FirmwareName          "On-Step"
 #define FirmwareTime          __TIME__
 

diff --git a/Pins.MiniPCB.h b/Pins.MiniPCB.h
@@ -3,4 +3,3 @@
 
 #warning "Pin-maps in OnStep have moved to the src/pinmaps/ directory, your configuration file's second to last line should be updated."
 #include "src/pinmaps/Pins.MiniPCB.h"
-
diff --git a/README.md b/README.md
@@ -1,7 +1,8 @@
 OnStep Telescope Controller
 ===========================
 # Important Note
-THIS IS THE ALPHA BRANCH, THE MOST ADVANCED ONSTEP VERSION BUT ALSO THE LEAST WELL TESTED!
+
+THIS IS THE BETA BRANCH, IT'S FAIRLY WELL TESTED BUT STILL FREQUENTLY GETS UPDATED WITH NEW FEATURES.
 
 THE BETA BRANCH IS RECOMMENDED FOR MOST USERS.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1984,4 +1984,3 @@ bool cmdReply(char *s) {
		strcpy(s,_replyX); _replyX[0]=0;
		return true;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -200,4 +200,3 @@
		#define FileVersionConfig 2
		#include "src/pinmaps/Pins.Mega2560Alt.h"
		#endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -497,4 +497,3 @@ GotoErrors goTo(long thisTargetAxis1, long thisTargetAxis2, long altTargetAxis1,

		return GOTO_ERR_NONE;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@

		#warning "Pin-maps in OnStep have moved to the src/pinmaps/ directory, your configuration file's second to last line should be updated."
		#include "src/pinmaps/Pins.MiniPCB.h"