scopes: Factor out TIMER2_VAL.

[sigrok-firmware-fx2lafw.git] / hantek_6022bl.c

diff --git a/hantek_6022bl.c b/hantek_6022bl.c
index d637c8227360de210f49ac0e6b4c39157613bb53..aa16921ae0dd3d8dc891f4cebe3ac382b4a9c4e4 100644 (file)
--- a/hantek_6022bl.c
+++ b/hantek_6022bl.c
@@ -26,6 +26,10 @@
 
 #define SET_ANALOG_MODE() PA7 = 1
 
+#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
 
@@ -33,6 +37,14 @@
 #define LED_GREEN() PC0 = 1; PC1 = 0;
 #define LED_RED()   PC0 = 0; PC1 = 1;
 
+#define TIMER2_VAL 500
+
+/* CTLx pin index (IFCLK, ADC clock input). */
+#define CTL_BIT 0
+
+#define OUT0 ((1 << CTL_BIT) << 4) /* OEx = 1, CTLx = 0 */
+#define OE_CTL (((1 << CTL_BIT) << 4) | (1 << CTL_BIT)) /* OEx = CTLx = 1 */
+
 /* Change to support as many interfaces as you need. */
 static BYTE altiface = 0;
 
@@ -132,6 +144,25 @@ static BOOL set_voltage(BYTE channel, BYTE val)
        return TRUE;
 }
 
+/**
+ * Each LSB in the nibble of the byte controls the coupling per channel.
+ *
+ * Setting PE3 disables AC coupling capacitor on CH0.
+ * Setting PE0 disables AC coupling capacitor on CH1.
+ */
+static void set_coupling(BYTE coupling_cfg)
+{
+       if (coupling_cfg & 0x01)
+               IOE |= 0x08;
+       else
+               IOE &= ~0x08;
+
+       if (coupling_cfg & 0x10)
+               IOE |= 0x01;
+       else
+               IOE &= ~0x01;
+}
+
 static BOOL set_numchannels(BYTE numchannels)
 {
        if (numchannels == 1 || numchannels == 2) {
@@ -225,16 +256,16 @@ static const struct samplerate_info {
 } samplerates[] = {
        { 48, 0x80,   0, 3, 0, 0x00, 0xea },
        { 30, 0x80,   0, 3, 0, 0x00, 0xaa },
-       { 24,    1,   0, 2, 1, 0x10, 0xca },
-       { 16,    1,   1, 2, 0, 0x10, 0xca },
-       { 12,    2,   1, 2, 0, 0x10, 0xca },
-       {  8,    3,   2, 2, 0, 0x10, 0xca },
-       {  4,    6,   5, 2, 0, 0x10, 0xca },
-       {  2,   12,  11, 2, 0, 0x10, 0xca },
-       {  1,   24,  23, 2, 0, 0x10, 0xca },
-       { 50,   48,  47, 2, 0, 0x10, 0xca },
-       { 20,  120, 119, 2, 0, 0x10, 0xca },
-       { 10,  240, 239, 2, 0, 0x10, 0xca },
+       { 24,    1,   0, 2, 1, OUT0, 0xca },
+       { 16,    1,   1, 2, 0, OUT0, 0xca },
+       { 12,    2,   1, 2, 0, OUT0, 0xca },
+       {  8,    3,   2, 2, 0, OUT0, 0xca },
+       {  4,    6,   5, 2, 0, OUT0, 0xca },
+       {  2,   12,  11, 2, 0, OUT0, 0xca },
+       {  1,   24,  23, 2, 0, OUT0, 0xca },
+       { 50,   48,  47, 2, 0, OUT0, 0xca },
+       { 20,  120, 119, 2, 0, OUT0, 0xca },
+       { 10,  240, 239, 2, 0, OUT0, 0xca },
 };
 
 static BOOL set_samplerate(BYTE rate)
@@ -291,8 +322,8 @@ static BOOL set_samplerate(BYTE rate)
 
        /* OUTPUT 0-7 */
        EXTAUTODAT2 = samplerates[i].out0;
-       EXTAUTODAT2 = 0x11; /* OE0=1, CTL0=1 */
-       EXTAUTODAT2 = 0x11; /* OE0=1, CTL0=1 */
+       EXTAUTODAT2 = OE_CTL;
+       EXTAUTODAT2 = OE_CTL;
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
@@ -315,6 +346,30 @@ static BOOL set_samplerate(BYTE rate)
        return TRUE;
 }
 
+static BOOL set_calibration_pulse(BYTE fs)
+{
+       switch (fs) {
+       case 0:         // 100Hz
+               RCAP2L = -10000 & 0xff;
+               RCAP2H = (-10000 & 0xff00) >> 8;
+               return TRUE;
+       case 1:         // 1kHz
+               RCAP2L = -1000 & 0xff;
+               RCAP2H = (-1000 & 0xff00) >> 8;
+               return TRUE;
+       case 10:        // 1kHz
+               RCAP2L = (BYTE)(-100 & 0xff);
+               RCAP2H = 0xff;
+               return TRUE;
+       case 50:        // 50kHz
+               RCAP2L = (BYTE)(-20 & 0xff);
+               RCAP2H = 0xff;
+               return TRUE;
+       default:
+               return FALSE;
+       }
+}
+
 /* Set *alt_ifc to the current alt interface for ifc. */
 BOOL handle_get_interface(BYTE ifc, BYTE *alt_ifc)
 {
@@ -362,7 +417,7 @@ BOOL handle_vendorcommand(BYTE cmd)
        ledcounter = 1000;
 
        /* Clear EP0BCH/L for each valid command. */
-       if (cmd >= 0xe0 && cmd <= 0xe4) {
+       if (cmd >= 0xe0 && cmd <= 0xe6) {
                EP0BCH = 0;
                EP0BCL = 0;
                while (EP0CS & bmEPBUSY);
@@ -383,6 +438,12 @@ BOOL handle_vendorcommand(BYTE cmd)
        case 0xe4:
                set_numchannels(EP0BUF[0]);
                return TRUE;
+       case 0xe5:
+               SET_COUPLING(EP0BUF[0]);
+               return TRUE;
+       case 0xe6:
+               SET_CALIBRATION_PULSE(EP0BUF[0]);
+               return TRUE;
        }
 
        return FALSE; /* Not handled by handlers. */
@@ -430,8 +491,8 @@ static void main(void)
        EA = 1;
 
        /* Init timer2. */
-       RCAP2L = -500 & 0xff;
-       RCAP2H = (-500 & 0xff00) >> 8;
+       RCAP2L = -TIMER2_VAL & 0xff;
+       RCAP2H = (-TIMER2_VAL & 0xff00) >> 8;
        T2CON = 0;
        ET2 = 1;
        TR2 = 1;