Fix CTRL_C in mainloop

tracker/code/main/GLOB.cpp

@@ -6,15 +6,15 @@ std::string GLOB::str() const
 {
     std::stringstream s;
 
-    s<<"callsign="<<cli.callsign<<"\n";
-    s<<"freqMHz="<<cli.freqMHz<<"\n";
-    s<<"baud="<<static_cast<int>(cli.baud)<<"\n";
-    s<<"ssdv_image="<<cli.ssdv_image<<"\n";
-    s<<"msg_num="<<cli.msg_num<<"\n";
-    s<<"port="<<cli.port<<"\n";
-    s<<"hw_pin_radio_on="<<cli.hw_pin_radio_on<<"\n";
-    s<<"hw_radio_serial="<<cli.hw_radio_serial<<"\n";
-    s<<"hw_ublox_device="<<cli.hw_ublox_device<<"\n";
+    s<<"\tcallsign="<<cli.callsign<<"\n";
+    s<<"\tfreqMHz="<<cli.freqMHz<<"\n";
+    s<<"\tbaud="<<static_cast<int>(cli.baud)<<"\n";
+    s<<"\tssdv_image="<<cli.ssdv_image<<"\n";
+    s<<"\tmsg_num="<<cli.msg_num<<"\n";
+    s<<"\tport="<<cli.port<<"\n";
+    s<<"\thw_pin_radio_on="<<cli.hw_pin_radio_on<<"\n";
+    s<<"\thw_radio_serial="<<cli.hw_radio_serial<<"\n";
+    s<<"\thw_ublox_device="<<cli.hw_ublox_device<<"\n";
 
     return s.str();
 }

tracker/code/main/main.cpp

@@ -243,7 +243,7 @@ int main1(int argc, char** argv)
 	while(G_RUN)
 	{
 		int msg_num = 0;
-		while( msg_num++ < G.cli.msg_num )
+		while( G_RUN && msg_num++ < G.cli.msg_num )
 		{
 			const nmea_t current_nmea = G.nmea_get();
 			const bool gps_fix_valid =