Problem with Z-Probing

Background:

I have a Mega + RAMPS 1.4 on a custom-built corexy robot. I use 2 Z steppers and since one has greater unpowered holding, they get *slightly* out of alignment (< 1mm) I was using automatic bed leveling - and it was working extremely well. I was running Repetier 92.5 and had everything sorted out, with a single problem: The system would enable "Dry Run" randomly and simply stop extruding. I could pause the print (if I noticed in time), disable dry run from the LCD, and resume, and the print would continue. I saw some discussion of this, but no solution, so I checked for updates and downloaded/installed 92.6.

Now my Z-Probe (G32) doesn't work properly. I have a servo-mounted switch, and use this script for probing:

G28 X Y; home x and y
G1 Z30 F400; move the bed out of the way.
M340 P0 S580; activate probe
G32; probe
G1 X0 Y0 F12000
M340 P0 S1500; put away probe
G1 Z0 F400; bring Z to 0 setting.

This was working flawlessly on 92.5, but now it probes the very first point; then the carriage moves to the second point, but the Z moves *away* from the switch ~5mm, then back 5mm, and it records a switch activation of 12.70 *every time*:

RECEIVED: Info:Autoleveling disabled
RECEIVED: Z-probe:17.94 X:40.00 Y:40.00
RECEIVED: Z-probe:12.70 X:250.00 Y:40.00
RECEIVED: Z-probe:12.70 X:150.00 Y:250.00
RECEIVED: Transformation matrix: 0.999689 -0.000297 0.024956 0.000000 0.999929 0.011888 -0.024957 -0.011884 0.999618
RECEIVED: Info:Autoleveling enabled
RECEIVED: X:150.36 Y:250.21 Z:12.693 E:0.0000

I'm using Simplify3d, but the same behavior occurs with Repetier-Host; if I use G1 Z30, it does that at every step (moves away from the switch 5mm, moves back 5mm, and records a measurement of 12.70).

Here's my Z-Probing configuration:

#define Z_PROBE_Z_OFFSET 0
#define Z_PROBE_Z_OFFSET_MODE 0
#define UI_BED_COATING 1
#define FEATURE_Z_PROBE 1
#define Z_PROBE_BED_DISTANCE 10
#define Z_PROBE_PIN 63
#define Z_PROBE_PULLUP 0
#define Z_PROBE_ON_HIGH 0
#define Z_PROBE_X_OFFSET -20
#define Z_PROBE_Y_OFFSET 10
#define Z_PROBE_WAIT_BEFORE_TEST 0
#define Z_PROBE_SPEED 5
#define Z_PROBE_XY_SPEED 150
#define Z_PROBE_SWITCHING_DISTANCE 5
#define Z_PROBE_REPETITIONS 2
#define Z_PROBE_HEIGHT 15.2
#define Z_PROBE_START_SCRIPT ""
#define Z_PROBE_FINISHED_SCRIPT ""
#define FEATURE_AUTOLEVEL 1
#define Z_PROBE_X1 40
#define Z_PROBE_Y1 40
#define Z_PROBE_X2 250
#define Z_PROBE_Y2 40
#define Z_PROBE_X3 150
#define Z_PROBE_Y3 250
#define BENDING_CORRECTION_A 0
#define BENDING_CORRECTION_B 0
#define BENDING_CORRECTION_C 0
#define FEATURE_AXISCOMP 0
#define AXISCOMP_TANXY 0
#define AXISCOMP_TANYZ 0
#define AXISCOMP_TANXZ 0

Any help would be highly appreciated!

I figured it out.

#define Z_PROBE_PULLUP 0

should have been

#define Z_PROBE_PULLUP 1

And somehow I got

#define Z_PROBE_WAIT_BEFORE_TEST 1

into my configuration.

I changed them both and uploaded again, and now it works as advertised. Sorry if I wasted anyone's time!