In RODefs.h -> please change RO_POST_STATES enum members to RO_POST_STATE_START.. etc., ( instead of POST_STATE_START). seeing conflict with TDDefs.h post states.
I reviewed DEN-15741 which is re: desire to stop DPi if user stopped with button. Everything I see changed in this module seems like a very complicated way to achieve that using properties that I don't think were intended for this. I think all we needed to do was check if user stop alarm is active and, in that special case, stop DPi instead of recirculating dialysate like it usually does in the recirc stop state.