X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/be2a7d45989f5f57b326589350a6ce5bbc835b5c..fb0e6597b611731e31b5d1285e52fc81a5ffd559:/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c index ab98411b7..cab978a85 100644 --- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c +++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c @@ -53,13 +53,13 @@ TMC_Capabilities_t Capabilities = }; /** Current TMC control request that is being processed */ -uint8_t RequestInProgess = 0; +uint8_t RequestInProgress = 0; /** Stream callback abort flag for bulk IN data */ -bool IsTMCBulkINReset = false; +bool IsTMCBulkINReset = false; /** Stream callback abort flag for bulk OUT data */ -bool IsTMCBulkOUTReset = false; +bool IsTMCBulkOUTReset = false; /** Last used tag value for data transfers */ uint8_t CurrentTransferTag = 0; @@ -153,7 +153,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void) Endpoint_ClearSETUP(); /* Check that no split transaction is already in progress and the data transfer tag is valid */ - if (RequestInProgess != 0) + if (RequestInProgress != 0) { TMCRequestStatus = TMC_STATUS_SPLIT_IN_PROGRESS; } @@ -167,7 +167,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void) IsTMCBulkOUTReset = true; /* Save the split request for later checking when a new request is received */ - RequestInProgess = Req_InitiateAbortBulkOut; + RequestInProgress = Req_InitiateAbortBulkOut; } /* Write the request response byte */ @@ -184,12 +184,12 @@ void EVENT_USB_Device_UnhandledControlRequest(void) Endpoint_ClearSETUP(); /* Check that an ABORT BULK OUT transaction has been requested and that the request has completed */ - if (RequestInProgess != Req_InitiateAbortBulkOut) + if (RequestInProgress != Req_InitiateAbortBulkOut) TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; else if (IsTMCBulkOUTReset) TMCRequestStatus = TMC_STATUS_PENDING; else - RequestInProgess = 0; + RequestInProgress = 0; /* Write the request response bytes */ Endpoint_Write_Byte(TMCRequestStatus); @@ -207,7 +207,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void) Endpoint_ClearSETUP(); /* Check that no split transaction is already in progress and the data transfer tag is valid */ - if (RequestInProgess != 0) + if (RequestInProgress != 0) { TMCRequestStatus = TMC_STATUS_SPLIT_IN_PROGRESS; } @@ -221,7 +221,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void) IsTMCBulkINReset = true; /* Save the split request for later checking when a new request is received */ - RequestInProgess = Req_InitiateAbortBulkIn; + RequestInProgress = Req_InitiateAbortBulkIn; } /* Write the request response bytes */ @@ -239,12 +239,12 @@ void EVENT_USB_Device_UnhandledControlRequest(void) Endpoint_ClearSETUP(); /* Check that an ABORT BULK IN transaction has been requested and that the request has completed */ - if (RequestInProgess != Req_InitiateAbortBulkIn) + if (RequestInProgress != Req_InitiateAbortBulkIn) TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; else if (IsTMCBulkINReset) TMCRequestStatus = TMC_STATUS_PENDING; else - RequestInProgess = 0; + RequestInProgress = 0; /* Write the request response bytes */ Endpoint_Write_Byte(TMCRequestStatus); @@ -262,7 +262,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void) Endpoint_ClearSETUP(); /* Check that no split transaction is already in progress */ - if (RequestInProgess != 0) + if (RequestInProgress != 0) { Endpoint_Write_Byte(TMC_STATUS_SPLIT_IN_PROGRESS); } @@ -273,7 +273,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void) IsTMCBulkOUTReset = true; /* Save the split request for later checking when a new request is received */ - RequestInProgess = Req_InitiateClear; + RequestInProgress = Req_InitiateClear; } /* Write the request response byte */ @@ -290,12 +290,12 @@ void EVENT_USB_Device_UnhandledControlRequest(void) Endpoint_ClearSETUP(); /* Check that a CLEAR transaction has been requested and that the request has completed */ - if (RequestInProgess != Req_InitiateClear) + if (RequestInProgress != Req_InitiateClear) TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; else if (IsTMCBulkINReset || IsTMCBulkOUTReset) TMCRequestStatus = TMC_STATUS_PENDING; else - RequestInProgess = 0; + RequestInProgress = 0; /* Write the request response bytes */ Endpoint_Write_Byte(TMCRequestStatus); @@ -329,36 +329,36 @@ void TMC_Task(void) /* Device must be connected and configured for the task to run */ if (USB_DeviceState != DEVICE_STATE_Configured) return; - - Endpoint_SelectEndpoint(TMC_OUT_EPNUM); - if (Endpoint_IsOUTReceived()) + TMC_MessageHeader_t MessageHeader; + + /* Check if a TMC packet has been received */ + if (ReadTMCHeader(&MessageHeader)) { - TMC_MessageHeader_t MessageHeader; - - Endpoint_Read_Stream_LE(&MessageHeader, sizeof(MessageHeader), StreamCallback_AbortOUTOnRequest); - CurrentTransferTag = MessageHeader.Tag; + /* Indicate busy */ + LEDs_SetAllLEDs(LEDMASK_USB_BUSY); switch (MessageHeader.MessageID) { case TMC_MESSAGEID_DEV_DEP_MSG_OUT: - + Endpoint_Discard_Stream(MessageHeader.TransferSize, StreamCallback_AbortOUTOnRequest); + Endpoint_ClearOUT(); break; case TMC_MESSAGEID_DEV_DEP_MSG_IN: + Endpoint_ClearOUT(); - break; - case TMC_MESSAGEID_DEV_VENDOR_OUT: - - break; - case TMC_MESSAGEID_DEV_VENDOR_IN: + MessageHeader.TransferSize = 3; + WriteTMCHeader(&MessageHeader); + Endpoint_Write_Stream_LE("TMC", 3, StreamCallback_AbortINOnRequest); + Endpoint_ClearIN(); break; default: Endpoint_StallTransaction(); break; } - - Endpoint_ClearOUT(); + + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /* All pending data has been processed - reset the data abort flags */ @@ -366,6 +366,45 @@ void TMC_Task(void) IsTMCBulkOUTReset = false; } +bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader) +{ + /* Select the Data Out endpoint */ + Endpoint_SelectEndpoint(TMC_OUT_EPNUM); + + /* Abort if no command has been sent from the host */ + if (!(Endpoint_IsOUTReceived())) + return false; + + /* Read in the header of the command from the host */ + Endpoint_Read_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), StreamCallback_AbortOUTOnRequest); + + /* Store the new command tag value for later use */ + CurrentTransferTag = MessageHeader->Tag; + + /* Indicate if the command has been aborted or not */ + return !IsTMCBulkOUTReset; +} + +bool WriteTMCHeader(TMC_MessageHeader_t* const MessageHeader) +{ + /* Compute the next transfer tag value, must be between 1 and 254 */ + if (++CurrentTransferTag == 0xFF) + CurrentTransferTag = 1; + + /* Set the message tag of the command header */ + MessageHeader->Tag = CurrentTransferTag; + MessageHeader->InverseTag = ~CurrentTransferTag; + + /* Select the Data In endpoint */ + Endpoint_SelectEndpoint(TMC_IN_EPNUM); + + /* Send the command header to the host */ + Endpoint_Write_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), StreamCallback_AbortINOnRequest); + + /* Indicate if the command has been aborted or not */ + return !IsTMCBulkINReset; +} + /** Stream callback function for the Endpoint stream write functions. This callback will abort the current stream transfer * if a TMC Abort Bulk IN request has been issued to the control endpoint. */