diff --git a/firmware/axl-stepper/src/axl b/firmware/axl-stepper/src/axl index be9a5a919bc9c6324f4ce6dcdfccac6837b659df..d1e3aafd55d1fa784b6f05fce71ee70e5630b3d7 160000 --- a/firmware/axl-stepper/src/axl +++ b/firmware/axl-stepper/src/axl @@ -1 +1 @@ -Subproject commit be9a5a919bc9c6324f4ce6dcdfccac6837b659df +Subproject commit d1e3aafd55d1fa784b6f05fce71ee70e5630b3d7 diff --git a/firmware/axl-stepper/src/main.cpp b/firmware/axl-stepper/src/main.cpp index 3736b2c1cdd8c657ee7ba488e70ec6bbdaf14ca1..051524a0a65d5addd3c7a69387d0dc8db108d894 100644 --- a/firmware/axl-stepper/src/main.cpp +++ b/firmware/axl-stepper/src/main.cpp @@ -139,12 +139,13 @@ EP_ONDATA_RESPONSES onHaltInData(uint8_t* data, uint16_t len){ Endpoint haltInEP(&osap, "haltIn", onHaltInData); -// -------------------------------------------------------- 6, 7: Outputs +// -------------------------------------------------------- 6, 7, 8: Outputs -Endpoint queueAckOutEP(&osap, "queueAckOut"); Endpoint haltOutEP(&osap, "haltOut"); +Endpoint segmentAckOutEP(&osap, "segmentAckOut"); +Endpoint segmentCompleteOutEP(&osap, "segmentCompleteOut"); -// -------------------------------------------------------- 8: Motor Settings +// -------------------------------------------------------- 9: Motor Settings uint8_t axisPick = 0; boolean invert = false; @@ -205,10 +206,15 @@ void loop() { if(axlDataLen){ haltOutEP.write(axlData, axlDataLen); } - // check for on-queue-completion info... - axlDataLen = axl_getQueueAck(axlData); + // check for queueAck info... + axlDataLen = axl_getSegmentAckMsg(axlData); if(axlDataLen){ - queueAckOutEP.write(axlData, axlDataLen); + segmentAckOutEP.write(axlData, axlDataLen); + } + // check for queueMoveComplete + axlDataLen = axl_getSegmentCompleteMsg(axlData); + if(axlDataLen){ + segmentCompleteOutEP.write(axlData, axlDataLen); } // refresh stepper hw, stepper_hw->dacRefresh();