Marlin 1.1.6 z-probe connected to Z-MAX as endstop not working (1 reply)

I have been using Marlin 1.1.0 RC-8 for a while without big problems, but thought I would upgrade to 1.1.6 for some of the new bed-leveling and auto-reporting features. I have an Arduino mega and the RAMPS 1.4 driver board.

I have a Z-probe which is used as a Z-min endstop, and is connected to the Z_MAX pin as I blew my Z_MIN pin. No matter how I configure marlin 1.1.6 I cannot get it to use my Z-probe for homing.

I have enabled :
#define Z_MIN_PROBE_ENDSTOP
and disabled:
//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN

Which seems to be the correct configuration for a Z_probe connected to Z_MAX_ENDSTOP.

However I always get the same respons for the Z_probe no matter if it is triggered or not:

SENDING:M119
Reporting endstop status
x_min: open
y_min: TRIGGERED
z_min: open
z_probe: open

I tried adding
#define Z_MIN_PROBE_PIN 19
which makes the z_probe work:

SENDING:M119
Reporting endstop status
x_min: open
y_min: TRIGGERED
z_min: open
z_probe: TRIGGERED

However PrintRun does not respect the Z_probe when homing and It seems as if Marlin still thinks theres BOTH a Z_min endstop AND a Z_probe.

If I revert to 1.1.0 RC8 I get the expected output:

SENDING:M119
Reporting endstop status
x_min: open
y_min: TRIGGERED
z_min: TRIGGERED

I have attached my configurations for 1.1.6 (configuration_1.1.6.h) and 1.1.0 RC8 (configuration.1.1.h).