From fb20eeb1eaec9d09d6d03fa83a79755f537f5c36 Mon Sep 17 00:00:00 2001
From: Claudio Prezzi <cprezzi@comsulting.ch>
Date: Wed, 26 Dec 2018 13:51:33 +0100
Subject: [PATCH] Added config option to have PWM on P1.23 for MKS SBase

---
 grbl/config.h   | 12 ++++++-----
 grbl/cpu_map.h  | 16 ++++++++++-----
 grbl/defaults.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/grbl/config.h b/grbl/config.h
index 9208a29..a40df2a 100644
--- a/grbl/config.h
+++ b/grbl/config.h
@@ -38,13 +38,15 @@
 //#define CPU_MAP_MKS_SBASE       // MKS SBASE Board (NXP LPC1768 MCU)
 //#define CPU_MAP_AZTEEG_X5       // Azteeg X5 Board (NXP LPC1769 MCU)
 
-// Force Spincle PWM Pin 2.4 (default is P2.5)
+// Force other Spindle PWM Pin (default is P2.5)
+//#define SPINDLE_PWM_PIN_1_23
 //#define SPINDLE_PWM_PIN_2_4
 
 // Define machine type for machine specific defaults
 //#define DEFAULTS_GENERIC
 #define DEFAULTS_K40
 //#define DEFAULTS_FABKIT
+//#define DEFAULTS_JONAS
 
 // Serial baud rate
 // #define BAUD_RATE 230400
@@ -111,16 +113,16 @@
 // on separate pin, but homed in one cycle. Also, it should be noted that the function of hard limits
 // will not be affected by pin sharing.
 // NOTE: Defaults are set for a traditional 3-axis CNC machine. Z-axis first to clear, followed by X & Y.
-//#define HOMING_CYCLE_0 (1<<Z_AXIS)                // REQUIRED: First move Z to clear workspace.
-//#define HOMING_CYCLE_1 ((1<<X_AXIS)|(1<<Y_AXIS))  // OPTIONAL: Then move X,Y at the same time.
+// NOTE: Homing cycle pattern is defined in Machine defaults!!!
+// #define HOMING_CYCLE_0 (1<<Z_AXIS)                // REQUIRED: First move Z to clear workspace.
+// #define HOMING_CYCLE_1 ((1<<X_AXIS)|(1<<Y_AXIS))  // OPTIONAL: Then move X,Y at the same time.
 // #define HOMING_CYCLE_2                         // OPTIONAL: Uncomment and add axes mask to enable
 
 // NOTE: The following are two examples to setup homing for 2-axis machines.
-//#define HOMING_CYCLE_0 ((1<<X_AXIS)|(1<<Y_AXIS))  // NOT COMPATIBLE WITH COREXY: Homes both X-Y in one cycle. 
+// #define HOMING_CYCLE_0 ((1<<X_AXIS)|(1<<Y_AXIS))  // NOT COMPATIBLE WITH COREXY: Homes both X-Y in one cycle. 
 
 // #define HOMING_CYCLE_0 (1<<X_AXIS)  // COREXY COMPATIBLE: First home X
 // #define HOMING_CYCLE_1 (1<<Y_AXIS)  // COREXY COMPATIBLE: Then home Y
-// Homing cycle pattern is defined in Machine defaults!!!
 
 // Number of homing cycles performed after when the machine initially jogs to limit switches.
 // This help in preventing overshoot and should improve repeatability. This value should be one or
diff --git a/grbl/cpu_map.h b/grbl/cpu_map.h
index 4b48c53..838105f 100644
--- a/grbl/cpu_map.h
+++ b/grbl/cpu_map.h
@@ -545,13 +545,19 @@
   // PWM Channel      PWM1_CH1  PWM1_CH2  PWM1_CH3  PWM1_CH4  PWM1_CH5  PWM1_CH6
   // Primary pin      P1.18     P1.20     P1.21     P1.23     P1.24     P1.26
   // Secondary pin    P2.0      P2.1      P2.2      P2.3      P2.4      P2.5
-  #ifdef SPINDLE_PWM_PIN_2_4
-    #define SPINDLE_PWM_CHANNEL         PWM1_CH5    // MOSFET3 (P2.4)
-  #else
-    #define SPINDLE_PWM_CHANNEL         PWM1_CH6    // BED MOSFET (P2.5)
-  #endif
+  #define SPINDLE_PWM_CHANNEL           PWM1_CH6    // BED MOSFET (P2.5)
   #define SPINDLE_PWM_USE_PRIMARY_PIN   false
   #define SPINDLE_PWM_USE_SECONDARY_PIN true
+  #ifdef SPINDLE_PWM_PIN_1_23
+    #define SPINDLE_PWM_CHANNEL           PWM1_CH4    // MOSFET3 (P1.23)
+    #define SPINDLE_PWM_USE_PRIMARY_PIN   true
+    #define SPINDLE_PWM_USE_SECONDARY_PIN false
+  #endif
+  #ifdef SPINDLE_PWM_PIN_2_4
+    #define SPINDLE_PWM_CHANNEL           PWM1_CH5    // MOSFET3 (P1.23)
+    #define SPINDLE_PWM_USE_PRIMARY_PIN   false
+    #define SPINDLE_PWM_USE_SECONDARY_PIN true
+  #endif
 
   // Stepper current control
   #define CURRENT_I2C Driver_I2C1       // I2C driver for current control. Comment out to disable (for C3d boards!)
diff --git a/grbl/defaults.h b/grbl/defaults.h
index f58d000..6f52f22 100644
--- a/grbl/defaults.h
+++ b/grbl/defaults.h
@@ -577,4 +577,57 @@
   #define DEFAULT_HOMING_PULLOFF 1.0 // mm
 #endif
 
+#ifdef DEFAULTS_JONAS
+  // Description: K40 Lasercutter (typical chinese 40W CO2 laser cutter/engraver)
+  #define DEFAULT_X_STEPS_PER_MM 160.0      // 200 stepps/rev. * 32 microstepps / 40mm/rev
+  #define DEFAULT_Y_STEPS_PER_MM 160.0
+  #define DEFAULT_Z_STEPS_PER_MM 160.0
+  #define DEFAULT_A_STEPS_PER_MM 160.0
+  #define DEFAULT_X_MAX_RATE 24000.0        // mm/min
+  #define DEFAULT_Y_MAX_RATE 24000.0        // mm/min
+  #define DEFAULT_Z_MAX_RATE 24000.0        // mm/min
+  #define DEFAULT_A_MAX_RATE 24000.0        // mm/min
+  #define DEFAULT_X_ACCELERATION (2500.0*60*60) // 2500*60*60 mm/min^2 = 2500 mm/sec^2
+  #define DEFAULT_Y_ACCELERATION (2500.0*60*60) // 2500*60*60 mm/min^2 = 2500 mm/sec^2
+  #define DEFAULT_Z_ACCELERATION (2500.0*60*60) // 2500*60*60 mm/min^2 = 2500 mm/sec^2
+  #define DEFAULT_A_ACCELERATION (2500.0*60*60) // 2500*60*60 mm/min^2 = 2500 mm/sec^2
+  #define DEFAULT_X_CURRENT 0.6             // amps
+  #define DEFAULT_Y_CURRENT 0.6             // amps
+  #define DEFAULT_Z_CURRENT 0.0             // amps
+  #define DEFAULT_A_CURRENT 0.0             // amps
+  #define DEFAULT_X_MAX_TRAVEL 300.0        // mm NOTE: Must be a positive value.
+  #define DEFAULT_Y_MAX_TRAVEL 200.0        // mm NOTE: Must be a positive value.
+  #define DEFAULT_Z_MAX_TRAVEL 50.0         // mm NOTE: Must be a positive value.
+  #define DEFAULT_A_MAX_TRAVEL 100.0        // mm NOTE: Must be a positive value.
+  #define DEFAULT_SPINDLE_PWM_FREQ 5000     // Hz (2000 - 20000)
+  #define DEFAULT_SPINDLE_PWM_OFF_VALUE 0   // %
+  #define DEFAULT_SPINDLE_PWM_MIN_VALUE 1   // %
+  #define DEFAULT_SPINDLE_PWM_MAX_VALUE 100 // %
+  #define DEFAULT_SPINDLE_RPM_MAX 1000.0    // rpm (S-value)
+  #define DEFAULT_SPINDLE_RPM_MIN 0.0       // rpm (S-value)
+  #define DEFAULT_STEP_PULSE_MICROSECONDS 10
+  #define DEFAULT_STEPPING_INVERT_MASK 0
+  #define DEFAULT_DIRECTION_INVERT_MASK 3   // 3 = invert X+Y
+  #define DEFAULT_STEPPER_IDLE_LOCK_TIME 255// msec (0-254, 255 keeps steppers enabled)
+  #define DEFAULT_STATUS_REPORT_MASK 0      // WPos enabled
+  #define DEFAULT_JUNCTION_DEVIATION 0.01   // mm
+  #define DEFAULT_ARC_TOLERANCE 0.002       // mm
+  #define DEFAULT_REPORT_INCHES 0           // false
+  #define DEFAULT_INVERT_ST_ENABLE 0        // false
+  #define DEFAULT_INVERT_LIMIT_PINS 1       // true for microswitches / false for optical sensors
+  #define DEFAULT_SOFT_LIMIT_ENABLE 1       // true
+  #define DEFAULT_HARD_LIMIT_ENABLE 0       // false
+  #define DEFAULT_INVERT_PROBE_PIN 0        // false
+  #define DEFAULT_LASER_MODE 1              // true
+  #define DEFAULT_HOMING_ENABLE 1           // true
+  #define DEFAULT_HOMING_DIR_MASK 1         // move top/left
+  #define DEFAULT_HOMING_FEED_RATE 50.0     // mm/min
+  #define DEFAULT_HOMING_SEEK_RATE 6000.0   // mm/min
+  #define DEFAULT_HOMING_DEBOUNCE_DELAY 250 // msec (0-65k)
+  #define DEFAULT_HOMING_PULLOFF 2.0        // mm
+  #define HOMING_CYCLE_0 (1<<Z_AXIS)  // First home Z to clear workspace
+  #define HOMING_CYCLE_1 (1<<X_AXIS)  // Then home X
+  #define HOMING_CYCLE_2 (1<<Y_AXIS)  // Then home Y
+#endif
+
 #endif