check return codes of open and close on systec reconnect

small cleanups

Author: jsouter

src/main/CanVendorSystec.cpp

@@ -28,12 +28,12 @@ CanReturnCode CanVendorSystec::init_can_port() {
 
   unsigned int baud_rate = USBCAN_BAUD_125kBit;
   switch (args().config.bitrate.value_or(0)) {
-    case 50000: baud_rate = USBCAN_BAUD_50kBit; break;
-    case 100000: baud_rate = USBCAN_BAUD_100kBit; break;
-    case 125000: baud_rate = USBCAN_BAUD_125kBit; break;
-    case 250000: baud_rate = USBCAN_BAUD_250kBit; break;
-    case 500000: baud_rate = USBCAN_BAUD_500kBit; break;
-    case 1000000: baud_rate = USBCAN_BAUD_1MBit; break;
+    case 50000:   baud_rate = USBCAN_BAUD_50kBit;  break;
+    case 100000:  baud_rate = USBCAN_BAUD_100kBit; break;
+    case 125000:  baud_rate = USBCAN_BAUD_125kBit; break;
+    case 250000:  baud_rate = USBCAN_BAUD_250kBit; break;
+    case 500000:  baud_rate = USBCAN_BAUD_500kBit; break;
+    case 1000000: baud_rate = USBCAN_BAUD_1MBit;   break;
     default: {
       LOG(Log::WRN, CanLogIt::h()) << "baud rate illegal, taking default 125000 [" << baud_rate << "]";
     }
@@ -51,7 +51,7 @@ CanReturnCode CanVendorSystec::init_can_port() {
   initialization_parameters.m_wNrOfRxBufferEntries = USBCAN_DEFAULT_BUFFER_ENTRIES;
   initialization_parameters.m_wNrOfTxBufferEntries = USBCAN_DEFAULT_BUFFER_ENTRIES;
 
-  // check if USB-CANmodul already is initialized
+  // check if USB-CANmodul is already initialized
   std::lock_guard<std::mutex> guard(CanVendorSystec::m_handles_lock);
   auto pos = m_handle_map.find(m_module_number);
   if (pos == m_handle_map.end()) { // module not in use
@@ -84,30 +84,26 @@ CanReturnCode CanVendorSystec::vendor_open() noexcept {
   auto returnCode = init_can_port();
   if (returnCode != CanReturnCode::success) return returnCode;
 
-  // TODO set time since opened equivalent...
-  // m_statistics.setTimeSinceOpened();
-
-  // After the canboard is configured and started, we start the scan control thread
-  m_receive_thread_flag = true;
-  m_SystecRxThread = std::thread(&CanVendorSystec::SystecRxThread, this);
-
-  // todo reintroduce check here...
-  // if (NULL == m_receive_thread_handle) {
-  //   LOG(Log::ERR, CanLogIt::h()) << "Error creating the canScanControl thread.";
-  // 	return CanReturnCode::internal_api_error;
-  // }
+  try {
+    m_receive_thread_flag = true;
+    m_SystecRxThread = std::thread(&CanVendorSystec::SystecRxThread, this);
+  } catch(...) {
+    returnCode = CanReturnCode::internal_api_error;
+  }
 
   return returnCode;
 }
 
 CanReturnCode CanVendorSystec::vendor_close() noexcept {
-  // TODO what if the return code is not success?
-  std::lock_guard<std::mutex> guard(CanVendorSystec::m_handles_lock);
-  erase_module_handle(m_module_number);
-  m_receive_thread_flag = false;
-  if (m_SystecRxThread.joinable()) m_SystecRxThread.join();
-  UcanDeinitCanEx (m_UcanHandle, (BYTE) m_channel_number);
-  LOG(Log::DBG, CanLogIt::h()) << __FUNCTION__ << " closed successfully";
+  try {
+    m_receive_thread_flag = false;
+    std::lock_guard<std::mutex> guard(CanVendorSystec::m_handles_lock);
+    erase_module_handle(m_module_number);
+    if (m_SystecRxThread.joinable()) m_SystecRxThread.join();
+    UcanDeinitCanEx (m_UcanHandle, (BYTE) m_channel_number);
+  } catch (...) {
+    return CanReturnCode::unknown_close_error;
+  }
   return CanReturnCode::success;
 };
 
@@ -146,9 +142,11 @@ CanReturnCode CanVendorSystec::vendor_send(const CanFrame& frame) noexcept {
       << UsbCanGetErrorText(Status);
 
     // for now, just always reconnect on a failed send.
-    vendor_close(); // TODO maybe we just call close instead of vendor_close
-    // see how CanVendorSocketCanSystec does reconnects, it intercepts the receiver function and wraps it
-    vendor_open();
+    auto close_code = close();
+    if (close_code != CanReturnCode::success) return close_code;
+
+    auto open_code = open();
+    if (open_code != CanReturnCode::success) return open_code;
 
     switch (Status) {
       case USBCAN_ERR_MAXINSTANCES: return CanReturnCode::too_many_connections;
@@ -162,15 +160,12 @@ CanReturnCode CanVendorSystec::vendor_send(const CanFrame& frame) noexcept {
       case USBCAN_WARN_FW_TXOVERRUN:  [[ fallthrough ]];
       default: return CanReturnCode::unknown_send_error;
     }
-    // m_statistics.onTransmit( can_msg_to_send.m_bDLC );
-    // m_statistics.setTimeSinceTransmitted();
   }
   return CanReturnCode::success;
 };
 
 CanDiagnostics CanVendorSystec::vendor_diagnostics() noexcept {
 
-  // TODO we can read the operating mode, either kUcanModeNormal, ListenOnly or TxEcho
   CanDiagnostics diagnostics{};
   tStatusStruct status;
   // TODO check return code of these functions...