bugfix in hantek 6022BL voltage range selection

[sigrok-firmware-fx2lafw.git] / hw / hantek-6022bl / fw.c

diff --git a/hw/hantek-6022bl/fw.c b/hw/hantek-6022bl/fw.c
index a78350ecca3b4d23a4a84ac7503523e21c9a5164..115990a9dc128145f3905d9110c6b13cfde650fe 100644 (file)
--- a/hw/hantek-6022bl/fw.c
+++ b/hw/hantek-6022bl/fw.c
@@ -24,18 +24,17 @@
 #include <delay.h>
 #include <setupdat.h>
 
-#define SET_ANALOG_MODE() PA7 = 1
+#define SET_ANALOG_MODE() do { PA7 = 1; } while (0)
 
 #define SET_COUPLING(x)
 
 #define SET_CALIBRATION_PULSE(x)
 
-/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
-#define TOGGLE_CALIBRATION_PIN() PC2 = !PC2
+#define TOGGLE_CALIBRATION_PIN() do { PC2 = !PC2; } while (0)
 
-#define LED_CLEAR() PC0 = 1; PC1 = 1;
-#define LED_GREEN() PC0 = 1; PC1 = 0;
-#define LED_RED()   PC0 = 0; PC1 = 1;
+#define LED_CLEAR() do { PC0 = 1; PC1 = 1; } while (0)
+#define LED_GREEN() do { PC0 = 1; PC1 = 0; } while (0)
+#define LED_RED()   do { PC0 = 0; PC1 = 1; } while (0)
 
 #define TIMER2_VAL 500
 
@@ -101,7 +100,7 @@ static BOOL set_voltage(BYTE channel, BYTE val)
                return FALSE;
        }
 
-       bits = bits << (channel ? 1 : 4);
+       bits = bits << (channel ? 4 : 1);
        mask = (channel) ? 0x70 : 0x0e;
        IOA = (IOA & ~mask) | (bits & mask);