summaryrefslogtreecommitdiffstats
path: root/pressure_control/firmware
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2009-06-14 14:11:50 +0200
committerMichael Buesch <mb@bu3sch.de>2009-06-14 14:11:50 +0200
commitde67aab07c60f73a00318ab493e61fc1bdb87ec5 (patch)
tree50b31fa48013420988a9c1c112e19ed7659c1fd1 /pressure_control/firmware
parent6837da6decb9b7202029d04aaf0345f1aafdb9e5 (diff)
downloadcnc-de67aab07c60f73a00318ab493e61fc1bdb87ec5.tar.xz
cnc-de67aab07c60f73a00318ab493e61fc1bdb87ec5.zip
pressure-control: swap xy and z valves
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Diffstat (limited to 'pressure_control/firmware')
-rw-r--r--pressure_control/firmware/main.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/pressure_control/firmware/main.c b/pressure_control/firmware/main.c
index 0534231..365ded8 100644
--- a/pressure_control/firmware/main.c
+++ b/pressure_control/firmware/main.c
@@ -45,10 +45,10 @@ struct pressure_state state;
/* The 1000Hz jiffies counter */
static jiffies_t jiffies_counter;
-DEFINE_VALVE(xy_control_valves, VALVES_2MAG, D, 6, 7, 4, 5);
-DEFINE_VALVE(z_control_valves, VALVES_1MAG, C, 2, -1, 3, -1);
-static DEFINE_SENSOR(xy_control_sensor, 0, 245, 4400, 10000);
-static DEFINE_SENSOR(z_control_sensor, (1<<MUX0), 245, 4400, 10000);
+DEFINE_VALVE(z_control_valves, VALVES_2MAG, D, 6, 7, 4, 5);
+DEFINE_VALVE(xy_control_valves, VALVES_1MAG, C, 2, -1, 3, -1);
+static DEFINE_SENSOR(z_control_sensor, 0, 245, 4400, 10000);
+static DEFINE_SENSOR(xy_control_sensor, (1<<MUX0), 245, 4400, 10000);
static uint8_t sensor_cycle;
@@ -56,13 +56,13 @@ static uint8_t sensor_cycle;
/* EEPROM contents */
static struct eeprom_data EEMEM eeprom = {
.cfg_xy = {
- .desired = 2500, /* Millibar */
- .hysteresis = 150, /* Millibar */
+ .desired = 2700, /* Millibar */
+ .hysteresis = 100, /* Millibar */
.autoadjust_enable = 1,
},
.cfg_z = {
.desired = 1500, /* Millibar */
- .hysteresis = 150, /* Millibar */
+ .hysteresis = 100, /* Millibar */
.autoadjust_enable = 1,
},
};
@@ -202,7 +202,7 @@ static void do_check_pressure(struct valves *valves,
valves_disarm_auto_idle(valves);
}
}
- if (abs((int32_t)mbar - (int32_t)(*reported_mbar)) >= 100)
+ if (abs((int32_t)mbar - (int32_t)(*reported_mbar)) >= 40)
report_change = 1;
if (report_change) {
remote_pressure_change_notification(state.measured_mbar_xy,
bues.ch cgit interface