Merge branch 'groundstation-gui-roughEdits' of...

Merge branch 'groundstation-gui-roughEdits' of https://git.ece.iastate.edu/danc/MicroCART into groundstation-gui-roughEdits

crazyflie_groundstation/inc/CTOC.h

@@ -82,7 +82,7 @@ class CTOC {
   int m_nRadioChannel;
   CCrazyRadio *m_crRadio;
   CCrazyflie *m_crazyflie;
-  int m_nItemCount;
+  uint16_t m_nItemCount;
   std::list<struct TOCElement> m_lstTOCElements;
   std::list<struct LoggingBlock> m_lstLoggingBlocks;
   std::vector<std::string> m_lstActiveLogging;

crazyflie_groundstation/src/CTOC.cpp

@@ -90,7 +90,10 @@ bool CTOC::requestMetaData() {
 	// 	bReturnvalue = true;
 	// }
 	if(crtpReceived->data()[0] == 0x03) {
-		m_nItemCount = (uint8_t) crtpReceived->data()[1];
+		char amount[2];
+		amount[0] = crtpReceived->data()[1];
+		amount[1] = crtpReceived->data()[2];
+		memcpy(&m_nItemCount, amount, sizeof(uint16_t));
 		bReturnvalue = true;
 	}
 

crazyflie_groundstation/src/ccrazyradio/CCrazyRadio_loopFuncs.cpp

@@ -23,7 +23,7 @@ void CCrazyRadio::mainLoop() {
 			(*it)->writeLogData();
 		}
 
-		//usleep(100);
+		usleep(500);
 
 		// Check if the thread has been told to terminate
 		if (this->m_exitThread) {

crazyflie_groundstation/src/crazyflieGroundStation.cpp

@@ -494,8 +494,9 @@ void closeoutProgram() {
 		cout << "\tBattery" << ": " << crazyflie_info[i].cflieCopter->batteryLevel() << endl;
 		crazyflie_info[i].cflieCopter->cycle();
 		crazyflie_info[i].cflieCopter->resetLoggingBlocks();
-		crazyflie_info[i].cflieCopter->test_stand->close();
-
+		if(crazyflie_info[i].cflieCopter->test_stand != NULL) {
+			crazyflie_info[i].cflieCopter->test_stand->close();
+		}
 		delete crazyflie_info[i].cflieCopter;
 	}