Add servo mode support for spindle PWM control

- Implemented USE_SPINDLE_SERVO_MODE configuration option
- Changed Timer2 prescaler from 1/8 to 1/1024 for ~50Hz servo frequency
- Added configurable servo pulse width range (SPINDLE_SERVO_MIN_PULSE/MAX_PULSE)
- M3 S0-S1000 now controls servo position (0-180 degrees)
- M5 positions servo to maximum position (pen up) instead of disabling PWM
- Default configuration supports pen plotter with reversed pulse values (MIN=31, MAX=16)
- Only supports ATmega328p (Arduino Uno) processors

Based on: https://www.buildlog.net/blog/2017/08/using-grbls-spindle-pwm-to-control-a-servo/

.gitignore

@@ -3,5 +3,6 @@
 *.elf
 *.DS_Store
 *.d
-
+.pio/
+.vscode/
 README.md

README.md

@@ -1,5 +1,8 @@
-![GitHub Logo](/doc/media/Grbl Logo 250px.png)
+![GitHub Logo](https://github.com/gnea/gnea-Media/blob/master/Grbl%20Logo/Grbl%20Logo%20250px.png?raw=true)
+***
 
+### Grbl v1.1 has been released [here](https://github.com/gnea/grbl/releases)!
+### Notice: This site will be phased out and moved to the new one!
 
 ***
 
@@ -22,7 +25,7 @@ Grbl includes full acceleration management with look ahead. That means the contr
 ***
 
 ### Official Supporters of the Grbl CNC Project
-![Official Supporters](https://dl.dropboxusercontent.com/u/2221997/Contributors.png)
+![Official Supporters](https://github.com/gnea/gnea-Media/blob/master/Contributors.png?raw=true)
 
 ***
 
@@ -46,12 +49,12 @@ _**Archives:**_
 
 ***
 
-##Update Summary for v0.9j
+## Update Summary for v0.9j
   - **Restore EEPROM feature:** A new set of restore EEPROM features to help OEMs and users reset their Grbl installation to the build defaults. See Configuring Grbl Wiki for details.
   - **More configuration options for input pins**
   - **Bug fixes including:** Soft limit error handling, disable spindle when S0, g-code reporting of G38.x.
   
-##Update Summary for v0.9i
+## Update Summary for v0.9i
   - **IMPORTANT:**
     - **Homing cycle updated. Locates based on trigger point, rather than release point.**
     - **System tweaks: $14 cycle auto-start has been removed. No more QUEUE state.**
@@ -61,7 +64,7 @@ _**Archives:**_
   - **Full Limit and Control Pin Configurability**
   - **Additional Compile-Time Feature Options**
 
-##Update Summary for v0.9h from v0.8
+## Update Summary for v0.9h from v0.8
   - **IMPORTANT:**
     - **Default serial baudrate is now 115200! (Up from 9600)**
     - **Z-limit(D12) and spindle enable(D11) pins have switched to support variable spindle!**
@@ -102,8 +105,3 @@ List of Supported G-Codes in Grbl v0.9 Master:
   - Spindle Control: M3, M4, M5
   - Valid Non-Command Words: F, I, J, K, L, N, P, R, S, T, X, Y, Z
 ```
-
--------------
-Grbl is an open-source project and fueled by the free-time of our intrepid administrators and altruistic users. If you'd like to donate, all proceeds will be used to help fund supporting hardware and testing equipment. Thank you!
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=CUGXJHXA36BYW)

debug.md

@@ -0,0 +1,51 @@
+this is my curennt grbl state
+
+when homing the first limit switch encoutnered always retrun from homing. 
+it can be either the x or y
+how to fix
+```
+*** Connecting to jserialcomm://ttyUSB0:115200
+*** Fetching device status
+>>> ?
+<Alarm,MPos:0.000,0.000,0.000,WPos:1.002,-209.000,0.000>
+*** Fetching device version
+*** Fetching device settings
+>>> $$
+$0 = 10    (step pulse, usec)
+$1 = 25    (step idle delay, msec)
+$2 = 0    (step port invert mask:00000000)
+$3 = 2    (dir port invert mask:00000010)
+$4 = 0    (step enable invert, bool)
+$5 = 0    (limit pins invert, bool)
+$6 = 0    (probe pin invert, bool)
+$10 = 3    (status report mask:00000011)
+$11 = 0.010    (junction deviation, mm)
+$12 = 0.002    (arc tolerance, mm)
+$13 = 0    (report inches, bool)
+$20 = 1    (soft limits, bool)
+$21 = 0    (hard limits, bool)
+$22 = 1    (homing cycle, bool)
+$23 = 6    (homing dir invert mask:00000110)
+$24 = 25.000    (homing feed, mm/min)
+$25 = 500.000    (homing seek, mm/min)
+$26 = 250    (homing debounce, msec)
+$27 = 1.000    (homing pull-off, mm)
+$100 = 113.821    (x, step/mm)
+$101 = 100.000    (y, step/mm)
+$102 = 100.000    (z, step/mm)
+$110 = 8000.000    (x max rate, mm/min)
+$111 = 8000.000    (y max rate, mm/min)
+$112 = 8000.000    (z max rate, mm/min)
+$120 = 1200.000    (x accel, mm/sec^2)
+$121 = 1200.000    (y accel, mm/sec^2)
+$122 = 3800.000    (z accel, mm/sec^2)
+$130 = 310.000    (x max travel, mm)
+$131 = 210.000    (y max travel, mm)
+$132 = 100.000    (z max travel, mm)
+ok
+*** Fetching device state
+*** Connected to GRBL 0.9i
+>>> $G
+[G0 G54 G17 G21 G90 G94 M0 M5 M9 T0 F0. S0.]
+ok
+```

doc/log/commit_log_v0.9j.txt

@@ -1,3 +1,43 @@
+----------------
+Date: 2016-07-26
+Author: chamnit
+Subject: Fixed homing on CoreXY machines only.
+
+- The homing routine for CoreXY/H-Bot CNC machines has been fixed.
+
+- Version date bumped, but this update does NOT effect any normal
+users. Only CoreXY users.
+
+
+----------------
+Date: 2016-07-26
+Author: chamnit
+Subject: Merge branch 'master-corexy'
+
+
+----------------
+Date: 2016-07-25
+Author: chamnit
+Subject: CoreXY homing bug fix attempt 2.
+
+
+----------------
+Date: 2016-07-25
+Author: chamnit
+Subject: CoreXY homing fix attempt.
+
+
+----------------
+Date: 2016-03-17
+Author: Sonny Jeon
+Subject: No variable spindle and spindle speed fix.
+
+- When VARIABLE_SPINDLE output is disabled in config.h, the last commit
+would keep the spindle enable pin disabled when spindle speed is not
+defined (S0). This is now ignored and will enable with S0, as spindle
+speed is ignored in this mode.
+
+
 ----------------
 Date: 2016-03-16
 Author: Sonny Jeon

doc/media/COPYING

@@ -1,2 +0,0 @@
-
-Copyright (c) 2015 Gnea Research LLC. All Rights Reserved.

doc/media/Grbl Logo.svg

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.094488189"
-   height="1052.36220472"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Grbl Logo.svg">
-  <metadata
-     id="metadata97">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1000"
-     inkscape:window-height="751"
-     id="namedview95"
-     showgrid="false"
-     inkscape:zoom="0.89702957"
-     inkscape:cx="393.978"
-     inkscape:cy="560.38231"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g21" />
-  <desc
-     id="desc4">/Users/chamnit/Dropbox/documents/OHS/Logo/Grbl.DXF - scale = 58.043118, origin = (0.000000, 0.000000), auto = True</desc>
-  <defs
-     id="defs6">
-    <marker
-       id="DistanceX"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 3,-3 L -3,3 M 0,-5 L  0,5"
-         style="stroke:#000000; stroke-width:0.5"
-         id="path9" />
-    </marker>
-    <pattern
-       height="8"
-       id="Hatch"
-       patternUnits="userSpaceOnUse"
-       width="8"
-       x="0"
-       y="0">
-      <path
-         d="M8 4 l-4,4"
-         linecap="square"
-         stroke="#000000"
-         stroke-width="0.25"
-         id="path12" />
-      <path
-         d="M6 2 l-4,4"
-         linecap="square"
-         stroke="#000000"
-         stroke-width="0.25"
-         id="path14" />
-      <path
-         d="M4 0 l-4,4"
-         linecap="square"
-         stroke="#000000"
-         stroke-width="0.25"
-         id="path16" />
-    </pattern>
-    <symbol
-       id="*Model_Space" />
-    <symbol
-       id="*Paper_Space" />
-    <symbol
-       id="*Paper_Space0" />
-  </defs>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="0"
-     id="g21">
-    <g
-       id="g3562"
-       transform="matrix(0.74854703,0,0,0.74854703,93.578346,130.5299)">
-      <path
-         sodipodi:nodetypes="ccscccccc"
-         inkscape:connector-curvature="0"
-         id="path45"
-         style="fill:#000000;stroke:#000000;stroke-linecap:round"
-         d="m 666.97027,519.20619 0,-204.22494 c 0,-14.19819 -11.5099,-25.70806 -25.70807,-25.70806 -14.19818,0 -25.70808,11.50987 -25.70808,25.70806 l 0,204.22494 c 0,56.79271 46.03958,102.83229 102.83229,102.8323 l 25.70808,-25.70808 -25.70808,-25.70807 c -28.39635,0 -51.41614,-23.0198 -51.41614,-51.41615 z" />
-      <path
-         sodipodi:nodetypes="ccsccccccc"
-         inkscape:connector-curvature="0"
-         id="path61"
-         style="fill:#000000;stroke:#000000;stroke-linecap:round"
-         d="m 230.65284,519.20619 0,77.12422 c 0,14.19819 11.5099,25.70806 25.70807,25.70806 14.19818,0 25.70808,-11.50987 25.70808,-25.70806 l 0,-77.12422 c 0,-28.39635 23.01979,-51.41615 51.41614,-51.41615 l 38.92203,0 0,-51.41614 -38.92203,0 c -56.7927,1e-5 -102.83228,46.03959 -102.83229,102.83229" />
-      <path
-         sodipodi:nodetypes="ccccssscccccsssc"
-         inkscape:connector-curvature="0"
-         id="path73"
-         style="fill:#000000;stroke:#000000;stroke-linecap:round"
-         d="m 487.73358,416.3739 -38.92203,0 0,51.41614 38.92203,0 c 20.79587,0 39.54419,12.52721 47.50197,31.73975 7.95777,19.21249 3.55772,41.32642 -11.14711,56.03126 -14.70484,14.70483 -36.81877,19.10488 -56.03126,11.14711 -19.21254,-7.95778 -31.73975,-26.7061 -31.73975,-47.50197 l 0,-204.22494 -25.70808,-25.70807 -25.70807,25.70807 0,204.22494 c 0,41.59174 25.05442,79.08838 63.47948,95.00395 38.42499,15.91554 82.65286,7.11546 112.06254,-22.29421 29.40967,-29.40968 38.20976,-73.63755 22.29423,-112.06254 -15.91557,-38.42506 -53.41221,-63.47949 -95.00395,-63.47949" />
-      <path
-         sodipodi:nodetypes="cssscccscccsssccccc"
-         inkscape:connector-curvature="0"
-         id="path81"
-         style="fill:#000000;stroke:#000000;stroke-linecap:round"
-         d="m 102.8323,570.62234 c -20.795869,0 -39.544189,-12.52721 -47.501976,-31.73974 -7.95777,-19.21249 -3.557731,-41.32643 11.147104,-56.03126 14.704835,-14.70484 36.818772,-19.10489 56.031262,-11.14712 19.21254,7.95778 31.73975,26.7061 31.73975,47.50197 l 0,127.10072 c 0,28.39635 -23.01979,51.41615 -51.41614,51.41615 -14.192584,0.008 -25.693722,11.51549 -25.693722,25.70807 0,14.19258 11.501138,25.70007 25.693722,25.70807 56.7927,-10e-6 102.83228,-46.03959 102.83229,-102.83229 l 0,-127.10072 c 0,-41.59174 -25.05443,-79.08838 -63.47949,-95.00395 C 103.76011,408.28671 59.532236,417.0868 30.122564,446.49647 0.712891,475.90615 -8.0871904,520.13402 7.8283485,558.55901 23.74392,596.98407 61.240561,622.03849 102.8323,622.03849 l 25.70807,0 25.70807,-25.70808 -25.70807,-25.70807 -25.70807,0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path91"
-         style="fill:none;stroke:#000000;stroke-linecap:round"
-         d="m 744.09449,596.33041 -25.70808,25.70808" />
-    </g>
-  </g>
-</svg>

grbl/config.h

@@ -72,9 +72,11 @@
 // 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<<X_AXIS)                // REQUIRED: First move Z to clear workspace.
+#define HOMING_CYCLE_0 (1<<Z_AXIS)                // REQUIRED: First move Z to clear workspace.
-#define HOMING_CYCLE_1 (1<<Y_AXIS)  // OPTIONAL: Then move X,Y at the same time.
+// #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
+#define HOMING_CYCLE_0 (1<<X_AXIS)
+#define HOMING_CYCLE_1 (1<<Y_AXIS)
 
 // 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 
@@ -147,7 +149,7 @@
 // #define HOMING_CYCLE_0 (1<<X_AXIS) and #define HOMING_CYCLE_1 (1<<Y_AXIS)
 // NOTE: This configuration option alters the motion of the X and Y axes to principle of operation
 // defined at (http://corexy.com/theory.html). Motors are assumed to positioned and wired exactly as
-// described, if not, motions may move in strange directions. Grbl assumes the CoreXY A and B motors
+// described, if not, motions may move in strange directions. Grbl requires the CoreXY A and B motors
 // have the same steps per mm internally.
 #define COREXY // Default disabled. Uncomment to enable.
 
@@ -251,7 +253,7 @@
 // equally divided voltage bins between the maximum and minimum spindle speeds. So for a 5V pin, 1000
 // max rpm, and 250 min rpm, the spindle output voltage would be set for the following "S" commands: 
 // "S1000" @ 5V, "S250" @ 0.02V, and "S625" @ 2.5V (mid-range). The pin outputs 0V when disabled.
-#define SPINDLE_MAX_RPM 1000.0 // Max spindle RPM. This value is equal to 100% duty cycle on the PWM.
+#define SPINDLE_MAX_RPM 1200.0 // Max spindle RPM. This value is equal to 100% duty cycle on the PWM.
 #define SPINDLE_MIN_RPM 0.0    // Min spindle RPM. This value is equal to (1/256) duty cycle on the PWM.
 
 // Used by variable spindle output only. This forces the PWM output to a minimum duty cycle when enabled.
@@ -260,6 +262,23 @@
 // spindle RPM output lower than this value will be set to this value.
 // #define MINIMUM_SPINDLE_PWM 5 // Default disabled. Uncomment to enable. Integer (0-255)
 
+// Enable servo mode for spindle PWM output. This changes the PWM frequency from ~1kHz to ~50Hz
+// and adjusts the duty cycle range to control hobby servos (1-2ms pulses). When enabled, the
+// spindle RPM values are mapped to servo positions (S0-S180 or configured min/max).
+// This is useful for pen plotters, drag knives, or other applications requiring servo control.
+// Based on: https://www.buildlog.net/blog/2017/08/using-grbls-spindle-pwm-to-control-a-servo/
+// NOTE: Only works with VARIABLE_SPINDLE enabled and ATmega328p (Uno) processors.
+// NOTE: This changes Timer2 prescaler from 1/8 to 1/1024, resulting in ~61Hz PWM frequency.
+// NOTE: Connect servo signal wire to Arduino Pin D11 (same as spindle PWM output).
+//       Servo power (5V) and ground must be connected to appropriate power source.
+#define USE_SPINDLE_SERVO_MODE // Default disabled. Uncomment to enable.
+
+// Servo pulse width range (in timer ticks). Only used with USE_SPINDLE_SERVO_MODE enabled.
+// At 1/1024 prescaler on 16MHz, each tick = 64μs. Default values: 16 ticks = 1.024ms, 31 ticks = 1.984ms
+// Adjust these if your servo requires different pulse widths for 0° and 180° positions.
+#define SPINDLE_SERVO_MIN_PULSE 31  // Servo position at minimum RPM (S0) - pen DOWN - ~2ms pulse
+#define SPINDLE_SERVO_MAX_PULSE 16  // Servo position at maximum RPM (S1000/M5) - pen UP - ~1ms pulse
+
 // By default on a 328p(Uno), Grbl combines the variable spindle PWM and the enable into one pin to help
 // preserve I/O pins. For certain setups, these may need to be separate pins. This configure option uses
 // the spindle direction pin(D13) as a separate spindle enable pin along with spindle speed PWM on pin D11.
@@ -407,6 +426,18 @@
   #error "USE_SPINDLE_DIR_AS_ENABLE_PIN may only be used with a 328p processor"
 #endif
 
+#if defined(USE_SPINDLE_SERVO_MODE) && !defined(VARIABLE_SPINDLE)
+  #error "USE_SPINDLE_SERVO_MODE may only be used with VARIABLE_SPINDLE enabled"
+#endif
+
+#if defined(USE_SPINDLE_SERVO_MODE) && !defined(CPU_MAP_ATMEGA328P)
+  #error "USE_SPINDLE_SERVO_MODE may only be used with a 328p processor"
+#endif
+
+#if defined(USE_SPINDLE_SERVO_MODE) && (SPINDLE_SERVO_MIN_PULSE == SPINDLE_SERVO_MAX_PULSE)
+  #error "SPINDLE_SERVO_MIN_PULSE and SPINDLE_SERVO_MAX_PULSE cannot be equal"
+#endif
+
 // ---------------------------------------------------------------------------------------
 
 

grbl/grbl.h

@@ -23,7 +23,7 @@
 
 // Grbl versioning system
 #define GRBL_VERSION "0.9j"
-#define GRBL_VERSION_BUILD "20160317"
+#define GRBL_VERSION_BUILD "20160726"
 
 // Define standard libraries used by Grbl.
 #include <avr/io.h>

grbl/spindle_control.c

@@ -45,7 +45,22 @@ void spindle_init()
 
 void spindle_stop()
 {
-  // On the Uno, spindle enable and PWM are shared. Other CPUs have seperate enable pin.
+  #ifdef USE_SPINDLE_SERVO_MODE
+    // Servo mode: M5 moves servo to maximum position (e.g., pen up) instead of disabling PWM
+    // This keeps the servo powered and in position
+    TCCRA_REGISTER = (1<<COMB_BIT) | (1<<WAVE1_REGISTER) | (1<<WAVE0_REGISTER);
+    TCCRB_REGISTER = (TCCRB_REGISTER & 0b11111000) | 0x07; // 1/1024 prescaler
+    OCR_REGISTER = SPINDLE_SERVO_MAX_PULSE; // Set to maximum position
+    
+    #if defined(CPU_MAP_ATMEGA2560) || defined(USE_SPINDLE_DIR_AS_ENABLE_PIN)
+      #ifdef INVERT_SPINDLE_ENABLE_PIN
+        SPINDLE_ENABLE_PORT &= ~(1<<SPINDLE_ENABLE_BIT);
+      #else
+        SPINDLE_ENABLE_PORT |= (1<<SPINDLE_ENABLE_BIT);
+      #endif
+    #endif
+  #else
+    // Standard spindle mode: Disable PWM output
     #ifdef VARIABLE_SPINDLE
       TCCRA_REGISTER &= ~(1<<COMB_BIT); // Disable PWM. Output voltage is zero.
       #if defined(CPU_MAP_ATMEGA2560) || defined(USE_SPINDLE_DIR_AS_ENABLE_PIN)
@@ -62,6 +77,7 @@ void spindle_stop()
         SPINDLE_ENABLE_PORT &= ~(1<<SPINDLE_ENABLE_BIT); // Set pin to low
       #endif
     #endif
+  #endif
 }
 
 
@@ -83,7 +99,6 @@ void spindle_set_state(uint8_t state, float rpm)
     #endif
 
     #ifdef VARIABLE_SPINDLE
-      // TODO: Install the optional capability for frequency-based output for servos.
       #ifdef CPU_MAP_ATMEGA2560
       	TCCRA_REGISTER = (1<<COMB_BIT) | (1<<WAVE1_REGISTER) | (1<<WAVE0_REGISTER);
         TCCRB_REGISTER = (TCCRB_REGISTER & 0b11111000) | 0x02 | (1<<WAVE2_REGISTER) | (1<<WAVE3_REGISTER); // set to 1/8 Prescaler
@@ -91,12 +106,47 @@ void spindle_set_state(uint8_t state, float rpm)
         uint16_t current_pwm;
       #else
         TCCRA_REGISTER = (1<<COMB_BIT) | (1<<WAVE1_REGISTER) | (1<<WAVE0_REGISTER);
-        TCCRB_REGISTER = (TCCRB_REGISTER & 0b11111000) | 0x02; // set to 1/8 Prescaler
+        #ifdef USE_SPINDLE_SERVO_MODE
+          // Servo mode: Set to 1/1024 prescaler for ~50Hz frequency (actually ~61Hz on 16MHz)
+          // Timer formula: Freq = F_CPU / (Prescaler * 256) = 16MHz / (1024 * 256) = 61.04Hz
+          // This provides the ~20ms period needed for servo control (50Hz ideal, 61Hz acceptable)
+          TCCRB_REGISTER = (TCCRB_REGISTER & 0b11111000) | 0x07; // CS22=1, CS21=1, CS20=1 = 1/1024 prescaler
+        #else
+          // Standard spindle mode: Set to 1/8 prescaler for ~7.8kHz frequency
+          TCCRB_REGISTER = (TCCRB_REGISTER & 0b11111000) | 0x02; // CS21=1 = 1/8 prescaler
+        #endif
         uint8_t current_pwm;
       #endif
 
-      if (rpm <= 0.0) { spindle_stop(); } // RPM should never be negative, but check anyway.
+      #ifdef USE_SPINDLE_SERVO_MODE
+        // Servo mode: Allow rpm=0 as valid position (0 degrees), only stop on negative
+        if (rpm < 0.0) { spindle_stop(); }
         else {
+          // Servo mode: Map RPM range to servo pulse width (16-31 ticks = ~1-2ms pulses)
+          // Each tick at 1/1024 prescaler = 64μs, so 16 ticks ≈ 1.024ms, 31 ticks ≈ 1.984ms
+          #define SPINDLE_SERVO_RANGE (SPINDLE_SERVO_MAX_PULSE - SPINDLE_SERVO_MIN_PULSE)
+          #define SPINDLE_RPM_RANGE (SPINDLE_MAX_RPM-SPINDLE_MIN_RPM)
+          if ( rpm < SPINDLE_MIN_RPM ) { rpm = SPINDLE_MIN_RPM; }
+          if ( rpm > SPINDLE_MAX_RPM ) { rpm = SPINDLE_MAX_RPM; }
+          rpm -= SPINDLE_MIN_RPM;
+          // Map RPM to servo pulse range
+          current_pwm = floor( rpm * (SPINDLE_SERVO_RANGE / SPINDLE_RPM_RANGE) + SPINDLE_SERVO_MIN_PULSE + 0.5);
+          OCR_REGISTER = current_pwm; // Set PWM pin output
+    
+          // On the Uno, spindle enable and PWM are shared, unless otherwise specified.
+          #if defined(CPU_MAP_ATMEGA2560) || defined(USE_SPINDLE_DIR_AS_ENABLE_PIN)
+            #ifdef INVERT_SPINDLE_ENABLE_PIN
+              SPINDLE_ENABLE_PORT &= ~(1<<SPINDLE_ENABLE_BIT);
+            #else
+              SPINDLE_ENABLE_PORT |= (1<<SPINDLE_ENABLE_BIT);
+            #endif
+          #endif
+        }
+      #else
+        // Standard spindle mode: Stop on zero or negative RPM
+        if (rpm <= 0.0) { spindle_stop(); }
+        else {
+          // Standard spindle mode: Map RPM range to full PWM range (0-255)
           #define SPINDLE_RPM_RANGE (SPINDLE_MAX_RPM-SPINDLE_MIN_RPM)
           if ( rpm < SPINDLE_MIN_RPM ) { rpm = 0; }
           else {
@@ -118,6 +168,7 @@ void spindle_set_state(uint8_t state, float rpm)
             #endif
           #endif
         }
+      #endif
       
     #else
       // NOTE: Without variable spindle, the enable bit should just turn on or off, regardless

grbl/system.c

@@ -265,9 +265,9 @@ float system_convert_axis_steps_to_mpos(int32_t *steps, uint8_t idx)
   float pos;
   #ifdef COREXY
     if (idx==X_AXIS) { 
-      pos = (float)system_convert_corexy_to_x_axis_steps(steps) / settings.steps_per_mm[idx];
+      pos = (float)system_convert_corexy_to_x_axis_steps(steps) / settings.steps_per_mm[A_MOTOR];
     } else if (idx==Y_AXIS) {
-      pos = (float)system_convert_corexy_to_y_axis_steps(steps) / settings.steps_per_mm[idx];
+      pos = (float)system_convert_corexy_to_y_axis_steps(steps) / settings.steps_per_mm[B_MOTOR];
     } else {
       pos = steps[idx]/settings.steps_per_mm[idx];
     }
@@ -289,12 +289,14 @@ void system_convert_array_steps_to_mpos(float *position, int32_t *steps)
 
 
 // CoreXY calculation only. Returns x or y-axis "steps" based on CoreXY motor steps.
-int32_t system_convert_corexy_to_x_axis_steps(int32_t *steps)
+#ifdef COREXY
-{
+  int32_t system_convert_corexy_to_x_axis_steps(int32_t *steps)
+  {
     return( (steps[A_MOTOR] + steps[B_MOTOR])/2 );
-}
+  }
-int32_t system_convert_corexy_to_y_axis_steps(int32_t *steps)
+  int32_t system_convert_corexy_to_y_axis_steps(int32_t *steps)
-{
+  {
     return( (steps[A_MOTOR] - steps[B_MOTOR])/2 );
-}
+  }
+#endif
 

grbl/system.h

@@ -107,7 +107,9 @@ float system_convert_axis_steps_to_mpos(int32_t *steps, uint8_t idx);
 void system_convert_array_steps_to_mpos(float *position, int32_t *steps);
 
 // CoreXY calculation only. Returns x or y-axis "steps" based on CoreXY motor steps.
-int32_t system_convert_corexy_to_x_axis_steps(int32_t *steps);
+#ifdef COREXY
-int32_t system_convert_corexy_to_y_axis_steps(int32_t *steps);
+  int32_t system_convert_corexy_to_x_axis_steps(int32_t *steps);
+  int32_t system_convert_corexy_to_y_axis_steps(int32_t *steps);
+#endif
 
 #endif

platformio.ini

@@ -0,0 +1,41 @@
+; PlatformIO Project Configuration File for Grbl
+;
+; This configuration builds Grbl v0.9j for Arduino Uno (ATmega328P)
+; Based on the original Makefile settings
+;
+; Please visit documentation for options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[platformio]
+src_dir = src
+lib_dir = .
+include_dir = grbl
+
+[env:uno]
+platform = atmelavr
+board = uno
+framework = arduino
+
+; Build configuration matching Makefile
+build_flags =
+    -DF_CPU=16000000L
+    -DBAUD_RATE=115200
+    -Wall
+    -Os
+    -ffunction-sections
+    -fdata-sections
+    -Wl,--gc-sections
+    -lm
+    -Igrbl
+    -Igrbl/cpu_map
+    -Igrbl/defaults
+
+; Add Grbl source files to build
+build_src_filter =
+    +<*>
+    +<../grbl/*.c>
+    -<../grbl/examples/>
+
+; Upload configuration
+upload_speed = 115200
+monitor_speed = 115200