Merge branch 'develop' into photodiode_interlock

DSTAT/src/config/conf_usb.h

@@ -146,7 +146,7 @@
 //#define  UDI_CDC_LOW_RATE
 
 //! Default configuration of communication port
-#define  UDI_CDC_DEFAULT_RATE             1024000
+#define  UDI_CDC_DEFAULT_RATE             115200
 #define  UDI_CDC_DEFAULT_STOPBITS         CDC_STOP_BITS_1
 #define  UDI_CDC_DEFAULT_PARITY           CDC_PAR_NONE
 #define  UDI_CDC_DEFAULT_DATABITS         8

DSTAT/src/main.c

@@ -24,8 +24,8 @@ int8_t command_handler(char command){
 	 * @param command Command character input.
 	 */
 	
-	int16_t pcv1, pcv2;
-	uint16_t pct1, pct2;
+	static int16_t pcv1, pcv2;
+	static uint16_t pct1, pct2;
 	
 	switch (command){
 		case 'A': //ADS Buffer/rate/PGA values from ads1255.h
@@ -166,14 +166,12 @@ int main(void){
     pot_set_gain();
 
 	
-	//Wait for application connection - Get 'c', reply 'K', get 'k'
+//	Wait for application connection - Get 'c', reply 'K', get 'k'
 	while(1){
 		while(getchar() != 'c');
 		putchar('#');
-		if (getchar() == 'k')
-			break;
+		while(getchar() != 'k');
 		printf("\n\r");
-	}	
         break;
 	}