diff --git a/g2core/spindle.cpp b/g2core/spindle.cpp
index 4afe5c18..1383f70c 100644
--- a/g2core/spindle.cpp
+++ b/g2core/spindle.cpp
@@ -269,80 +269,140 @@ stat_t sp_set_sps(nvObj_t *nv) { return(spindle_set_speed(nv->value_flt)); }
  */
 
 stat_t pwm_get_p1frq(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_frequency(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_frequency();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1frq(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_frequency(nv->value_flt); }
     return (STAT_OK);
 }
 stat_t pwm_get_p1csl(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_cw_speed_lo(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_cw_speed_lo();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1csl(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_cw_speed_lo(nv->value_flt); }
     return (STAT_OK);
 }
 stat_t pwm_get_p1csh(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_cw_speed_hi(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_cw_speed_hi();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1csh(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_cw_speed_hi(nv->value_flt); }
     return (STAT_OK);
 }
 stat_t pwm_get_p1cpl(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_cw_phase_lo(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_cw_phase_lo();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1cpl(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_cw_phase_lo(nv->value_flt); }
     return (STAT_OK);
 }
 stat_t pwm_get_p1cph(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_cw_phase_hi(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_cw_phase_hi();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1cph(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_cw_phase_hi(nv->value_flt); }
     return (STAT_OK);
 }
 stat_t pwm_get_p1wsl(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_ccw_speed_lo(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_ccw_speed_lo();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1wsl(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_ccw_speed_lo(nv->value_flt); }
     return (STAT_OK);
 }
 stat_t pwm_get_p1wsh(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_ccw_speed_hi(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_ccw_speed_hi();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1wsh(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_ccw_speed_hi(nv->value_flt); }
     return (STAT_OK);
 }
 stat_t pwm_get_p1wpl(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_ccw_phase_lo(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_ccw_phase_lo();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1wpl(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_ccw_phase_lo(nv->value_flt); }
     return (STAT_OK);
 }
 stat_t pwm_get_p1wph(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_ccw_phase_hi(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_ccw_phase_hi();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1wph(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_ccw_phase_hi(nv->value_flt); }
     return (STAT_OK);
 }
 stat_t pwm_get_p1pof(nvObj_t *nv) {
-    if (active_toolhead) { return active_toolhead->get_phase_off(); }
-    else { return (STAT_OK); }
+    if (active_toolhead) {
+        nv->value_flt = active_toolhead->get_phase_off();
+        nv->valuetype = TYPE_FLOAT;
+    }
+    else {
+        nv->valuetype = TYPE_NULL;
+    }
+    return (STAT_OK);
 }
 stat_t pwm_set_p1pof(nvObj_t *nv) {
     if (active_toolhead) { active_toolhead->set_phase_off(nv->value_flt); }
diff --git a/g2core/spindle.h b/g2core/spindle.h
index b468a683..314329f7 100644
--- a/g2core/spindle.h
+++ b/g2core/spindle.h
@@ -144,7 +144,7 @@ stat_t spindle_override_control(const float P_word, const bool P_flag);  // M51
 void spindle_start_override(const float ramp_time, const float override_factor);
 void spindle_end_override(const float ramp_time);
 
-const configSubtable * const getSpindleConfig_1();
+const configSubtable *const getSpindleConfig_1();
 const configSubtable *const getP1Config_1();
 
 #endif  // End of include guard: SPINDLE_H_ONCE