Skip to content

Commit 0cd0011

Browse files
committed
Changed to use rapid rate for THC cutter motion.
1 parent 356a066 commit 0cd0011

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

thc.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,16 @@ static void state_thc_pid (void)
250250
if(arc_voltage < arc_voltage_low || arc_voltage > arc_voltage_high) {
251251
float err = pidf(&pid, arc_vref, arc_voltage, 1.0f);
252252
if(!st2_motor_running(z_motor)) {
253-
253+
/*
254254
char buf[50];
255255
strcpy(buf, ftoa(arc_vref, 1));
256256
strcat(buf, ",");
257257
strcat(buf, ftoa(arc_voltage, 1));
258258
strcat(buf, ",");
259259
strcat(buf, ftoa(err, 1));
260260
report_message(buf, Message_Info);
261-
262-
st2_motor_move(z_motor, -err / plasma.arc_height_per_volt, 1000.0f, Stepper2_mm);
261+
*/
262+
st2_motor_move(z_motor, -err / plasma.arc_height_per_volt, settings.axis[Z_AXIS].max_rate, Stepper2_mm);
263263
}
264264
}
265265
}
@@ -276,7 +276,7 @@ static void state_thc_pid (void)
276276

277277
/* end THC state machine */
278278

279-
void onExecuteRealtime (uint_fast16_t state)
279+
static void onExecuteRealtime (uint_fast16_t state)
280280
{
281281
static uint32_t last_ms;
282282

@@ -361,10 +361,10 @@ static void arcSetState (spindle_state_t state, float rpm)
361361

362362
static void stepperPulseStart (stepper_t *stepper)
363363
{
364-
static volatile bool get_rates = false;
364+
// static volatile bool get_rates = false;
365365

366366
if(stepper->new_block) {
367-
get_rates = true;
367+
// get_rates = true;
368368
fr_pgm = stepper->exec_block->programmed_rate * 0.01f * sys.override.feed_rate;
369369
fr_thr_99 = fr_pgm * 0.99f;
370370
fr_thr_vad = fr_pgm * 0.01f * (float)plasma.vad_threshold;
@@ -693,7 +693,7 @@ static void plasma_report_options (bool newopt)
693693
on_report_options(newopt);
694694

695695
if(!newopt)
696-
hal.stream.write("[PLUGIN:PLASMA v0.07]" ASCII_EOL);
696+
hal.stream.write("[PLUGIN:PLASMA v0.08]" ASCII_EOL);
697697
else if(driver_reset) // non-null when successfully enabled
698698
hal.stream.write(",THC");
699699
}

0 commit comments

Comments
 (0)