diff --git a/Common/IcomController.cpp b/Common/IcomController.cpp index 125ff4b..f258a1d 100644 --- a/Common/IcomController.cpp +++ b/Common/IcomController.cpp @@ -117,7 +117,8 @@ void* CIcomController::Entry() return NULL; case RTI_HEADER: { - // CUtils::dump(wxT("RTI_HEADER"), buffer, length); + CUtils::dump(wxT("RTI_HEADER"), buffer, length); + wxMutexLocker locker(m_mutex); unsigned char data[2U]; @@ -133,7 +134,8 @@ void* CIcomController::Entry() break; case RTI_DATA: { - // CUtils::dump(wxT("RTI_DATA"), buffer, length); + CUtils::dump(wxT("RTI_DATA"), buffer, length); + wxMutexLocker locker(m_mutex); unsigned char data[2U]; @@ -149,7 +151,8 @@ void* CIcomController::Entry() break; case RTI_EOT: { - // wxLogMessage(wxT("RTI_EOT")); + wxLogMessage(wxT("RTI_EOT")); + wxMutexLocker locker(m_mutex); unsigned char data[2U]; @@ -172,14 +175,14 @@ void* CIcomController::Entry() case RTI_HEADER_ACK: if (buffer[2U] == 0x00U) { - // wxLogMessage(wxT("RTI_HEADER_ACK")); + wxLogMessage(wxT("RTI_HEADER_ACK")); if (state == SI_HEADER) { storeLength = 0U; retryTimer.stop(); txSpace = true; } } else { - // wxLogMessage(wxT("RTI_HEADER_NAK")); + wxLogMessage(wxT("RTI_HEADER_NAK")); } lostTimer.start(); @@ -187,14 +190,14 @@ void* CIcomController::Entry() case RTI_DATA_ACK: if (buffer[3U] == 0x00U) { - // wxLogMessage(wxT("RTI_DATA_ACK - %02X"), buffer[2U]); + wxLogMessage(wxT("RTI_DATA_ACK - %02X"), buffer[2U]); if (state == SI_DATA && seqNo == buffer[2U]) { storeLength = 0U; retryTimer.stop(); txSpace = true; } } else { - // wxLogMessage(wxT("RTI_DATA_NAK - %02X"), buffer[2U]); + wxLogMessage(wxT("RTI_DATA_NAK - %02X"), buffer[2U]); } lostTimer.start(); @@ -209,7 +212,7 @@ void* CIcomController::Entry() if (retryTimer.isRunning() && retryTimer.hasExpired() && connected) { assert(storeLength > 0U); - // CUtils::dump(wxT("Re-Sending"), storeData, storeLength + 1U); + CUtils::dump(wxT("Re-Sending"), storeData, storeLength + 1U); int ret = m_serial.write(storeData, storeLength + 1U); if (ret != int(storeLength + 1U)) @@ -225,7 +228,7 @@ void* CIcomController::Entry() storeLength = storeData[0U]; m_txData.getData(storeData + 1U, storeLength); - // CUtils::dump(wxT("Sending"), storeData, storeLength + 1U); + CUtils::dump(wxT("Sending"), storeData, storeLength + 1U); if (storeData[1U] == 0x20U) { state = SI_HEADER;