X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hantek_6022be.c;h=bfd4fd44447c1cf7c820883a95d83dded6a4aace;hb=4d971e019068b5747fe439b177c57cd635f3b9dd;hp=84e37876e1d485bba87e4fbf150311cdcdf70bf7;hpb=be6d306de12082c887c30e364dcf66438acc6183;p=sigrok-firmware-fx2lafw.git

diff --git a/hantek_6022be.c b/hantek_6022be.c
index 84e37876..bfd4fd44 100644
--- a/hantek_6022be.c
+++ b/hantek_6022be.c
@@ -26,6 +26,13 @@
 
 #define SET_ANALOG_MODE()
 
+/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
+#define TOGGLE_CALIBRATION_PIN() PA7 = !PA7
+
+#define LED_CLEAR() PC0 = 1; PC1 = 1;
+#define LED_GREEN() PC0 = 1; PC1 = 0;
+#define LED_RED()   PC0 = 0; PC1 = 1;
+
 /* Change to support as many interfaces as you need. */
 static BYTE altiface = 0;
 
@@ -68,16 +75,10 @@ void suspend_isr(void) __interrupt SUSPEND_ISR
 
 void timer2_isr(void) __interrupt TF2_ISR
 {
-	/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
-	PA7 = !PA7;
-
-	if (ledcounter) {
-		if (--ledcounter == 0) {
-			/* Clear LED. */
-			PC0 = 1;
-			PC1 = 1;
-		}
-	}
+	TOGGLE_CALIBRATION_PIN();
+
+	if (ledcounter && (--ledcounter == 0))
+		LED_CLEAR();
 
 	TF2 = 0;
 }
@@ -181,10 +182,9 @@ static void start_sampling(void)
 	GPIFTCB0 = 0;
 	GPIFTRIG = (altiface == 0) ? 6 : 4;
 
-	/* Set green LED, don't clear LED. */
+	/* Set green LED, don't clear LED afterwards (ledcounter = 0). */
+	LED_GREEN();
 	ledcounter = 0;
-	PC0 = 1;
-	PC1 = 0;
 }
 
 static void select_interface(BYTE alt)
@@ -356,9 +356,8 @@ BOOL handle_vendorcommand(BYTE cmd)
 {
 	stop_sampling();
 
-	/* Set red LED. */
-	PC0 = 0;
-	PC1 = 1;
+	/* Set red LED, clear after timeout. */
+	LED_RED();
 	ledcounter = 1000;
 
 	/* Clear EP0BCH/L for each valid command. */
@@ -438,10 +437,12 @@ static void main(void)
 
 	RENUMERATE();
 
+	PORTECFG = 0;
 	PORTCCFG = 0;
 	PORTACFG = 0;
+	OEE = 0xff;
 	OEC = 0xff;
-	OEA = 0x80;
+	OEA = 0xff;
 
 	while (TRUE) {
 		if (dosud) {