Skip to content

Commit 4dae491

Browse files
authored
Merge pull request #14 from cdagneta/feature/arcVoffset
Apply arc voltage offset to ADC readings
2 parents 9681df0 + 6ab734f commit 4dae491

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

thc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static void set_target_voltage (float v)
187187

188188
static void state_idle (void)
189189
{
190-
arc_voltage = (float)port.wait_on_input(Port_Analog, port_arc_voltage, WaitMode_Immediate, 0.0f) * plasma.arc_voltage_scale;
190+
arc_voltage = ((float)port.wait_on_input(Port_Analog, port_arc_voltage, WaitMode_Immediate, 0.0f) * plasma.arc_voltage_scale) - plasma.arc_voltage_offset;
191191
}
192192

193193
static void state_thc_delay (void)
@@ -198,7 +198,7 @@ static void state_thc_delay (void)
198198
stateHandler = state_thc_adjust;
199199
else {
200200
pidf_reset(&pid);
201-
set_target_voltage((float)port.wait_on_input(Port_Analog, port_arc_voltage, WaitMode_Immediate, 0.0f) * plasma.arc_voltage_scale);
201+
set_target_voltage(((float)port.wait_on_input(Port_Analog, port_arc_voltage, WaitMode_Immediate, 0.0f) * plasma.arc_voltage_scale) - plasma.arc_voltage_offset);
202202
stateHandler = state_vad_lock;
203203
stateHandler();
204204
}
@@ -220,7 +220,7 @@ static void state_thc_adjust (void)
220220

221221
static void state_vad_lock (void)
222222
{
223-
arc_voltage = (float)port.wait_on_input(Port_Analog, port_arc_voltage, WaitMode_Immediate, 0.0f) * plasma.arc_voltage_scale;
223+
arc_voltage = ((float)port.wait_on_input(Port_Analog, port_arc_voltage, WaitMode_Immediate, 0.0f) * plasma.arc_voltage_scale) - plasma.arc_voltage_offset;
224224

225225
if((thc.active = fr_actual >= fr_thr_99))
226226
stateHandler = state_thc_pid;
@@ -240,7 +240,7 @@ static void state_thc_pid (void)
240240
if(v_count == 0)
241241
v = 0.0f;
242242

243-
arc_voltage = (float)port.wait_on_input(Port_Analog, port_arc_voltage, WaitMode_Immediate, 0.0f) * plasma.arc_voltage_scale;
243+
arc_voltage = ((float)port.wait_on_input(Port_Analog, port_arc_voltage, WaitMode_Immediate, 0.0f) * plasma.arc_voltage_scale) - plasma.arc_voltage_offset;
244244
v += arc_voltage;
245245
if(++v_count == THC_SAMPLE_AVG) {
246246

0 commit comments

Comments
 (0)