Merge pull request #10 from Paciente8159/1.0.0-rc

1.0.0-rc

CHANGELOG.md

@@ -5,6 +5,20 @@
 
 # Changelog
 
+## [1.0.0-rc] - 2020-07-11
+
+### Added
+  - added possibility of changing values og G28 and G30 commands via G10 L2 P28 and G10 L2 P30.
+  - added configuration for using software pulling input limit/control pins
+
+### Changed
+  - configuration now simplified (choose board only and the mcu is selected to match the board)
+
+### Fixed
+  - fixed code without probe
+  - fixed code without spindle
+  - compliance to strict-prototype functions
+
 ## [1.0.0-beta.2] - 2020-02-09
 
 ### Added
@@ -110,5 +124,6 @@
 
 ### Initial release
 
+[1.0.0-rc]: https://github.com/Paciente8159/uCNC/releases/tag/v1.0.0-rc
 [1.0.0-beta.2]: https://github.com/Paciente8159/uCNC/releases/tag/v1.0.0-beta.2
 [1.0.0-beta]: https://github.com/Paciente8159/uCNC/releases/tag/v1.0.0-beta

uCNC/boarddefs.h

@@ -2,51 +2,57 @@
 	Name: boarddefs.h
 	Description: Defines the available board types.
 
-	Copyright: Copyright (c) João Martins
-	Author: João Martins
+	Copyright: Copyright (c) João Martins
+	Author: João Martins
 	Date: 07/02/2020
 
-	µCNC is free software: you can redistribute it and/or modify
+	µCNC is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version. Please see <http://www.gnu.org/licenses/>
 
-	µCNC is distributed WITHOUT ANY WARRANTY;
+	µCNC is distributed WITHOUT ANY WARRANTY;
 	Also without the implied warranty of	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	See the	GNU General Public License for more details.
 */
 
 #ifndef BOARDDEFS_H
 #define BOARDDEFS_H
 
+#include "mcus.h"
 #include "boards.h"
 
 /*
 	MCU port map
 */
-#if(BOARD != 0)
+#if (BOARD != 0)
 #else
 #error Invalid board configuration
 #endif
 
-#if(BOARD == BOARD_GRBL)
+#if (BOARD == BOARD_GRBL)
+#define MCU MCU_AVR
 #include "mcus\avr\boardmap_grbl.h"
 #endif
 
-#if(BOARD == BOARD_RAMBO14)
+#if (BOARD == BOARD_RAMBO14)
+#define MCU MCU_AVR
 #include "mcus\avr\boardmap_rambo14.h"
 #endif
 
-#if(BOARD == BOARD_RAMPS14)
+#if (BOARD == BOARD_RAMPS14)
+#define MCU MCU_AVR
 #include "mcus\avr\boardmap_ramps14.h"
 #endif
 
-#if(BOARD == BOARD_VIRTUAL)
+#if (BOARD == BOARD_VIRTUAL)
 
 #endif
 
 #ifndef BOARD
 #error Undefined board
 #endif
 
+#include "mcudefs.h" //configures the mcu based on the board pin configuration
+
 #endif

uCNC/build.h

@@ -20,7 +20,7 @@
 #define BUILD_H
 
 #define MAJOR_MINOR_VERSION "1.0."
-#define PATCH_VERSION "0-beta.2"
+#define PATCH_VERSION "0-rc"
 
 #define VERSION MAJOR_MINOR_VERSION PATCH_VERSION