Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-02-06 11:11:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix accidentally broken pwm json group

Browse Source
This commit is contained in:
Rob Giseburt
2020-01-22 15:44:00 -06:00
parent e7f20ba237
commit c439af38ce
2 changed files with 81 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
g2core/spindle.cpp
View File

@@ -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); }

2
g2core/spindle.h
View File

@@ -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