X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=arducontrol%2Fmfx.c;fp=arducontrol%2Fmfx.c;h=8c46fc3123cf40d16ac3fc9f56c74eff7989d70e;hb=5d6f425971266accc2e3d1c6de96a0ba031adb8d;hp=293765fba9d7c8933106e48c6cdbc5ab4923cfa2;hpb=57bb90d8019098a9b8fe63093498862ce6551017;p=model-railway-devices.git diff --git a/arducontrol/mfx.c b/arducontrol/mfx.c index 293765f..8c46fc3 100644 --- a/arducontrol/mfx.c +++ b/arducontrol/mfx.c @@ -235,7 +235,7 @@ static void mfx_finish_packet_feedback(OutputPacket *packet, MfxEncodingState *s packet->final_delay = 128; } -static void mfx_receive_feedback() +static void mfx_receive_feedback(uint8_t type) { /* The decoder should activate a 52.6 kHz carrier to indicate positive acknowledgement, but so far I've been unable to build a circuit that detects @@ -255,7 +255,7 @@ static void mfx_receive_feedback() } uint8_t reply[2]; - reply[0] = MFX_FEEDBACK; + reply[0] = type; if(current[1]>feedback_threshold) { current[1] -= feedback_threshold; @@ -391,7 +391,7 @@ uint8_t mfx_command(const uint8_t *cmd, uint8_t length) mask_bits <<= 16; mask_bits |= (uint16_t)(cmd[3]<<8)|cmd[4]; mfx_search_packet(mask_bits, mask_size); - mfx_receive_feedback(); + mfx_receive_feedback(MFX_SEARCH_FEEDBACK); } else if(cmd[0]==MFX_ASSIGN_ADDRESS || cmd[0]==MFX_PING) { @@ -410,7 +410,7 @@ uint8_t mfx_command(const uint8_t *cmd, uint8_t length) else { mfx_ping_packet(addr, id); - mfx_receive_feedback(); + mfx_receive_feedback(MFX_PING_FEEDBACK); } } else if(cmd[0]==MFX_SPEED || cmd[0]==MFX_SPEED_FUNCS8 || cmd[0]==MFX_SPEED_FUNCS16)