X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hantek_6022be.c;h=bfd4fd44447c1cf7c820883a95d83dded6a4aace;hb=4d971e019068b5747fe439b177c57cd635f3b9dd;hp=1f58a608271f1fb1926377a9b7d45529faa850e4;hpb=0ab4ea5da80c9f3d3e523dcaa259f5e97dcda0b8;p=sigrok-firmware-fx2lafw.git diff --git a/hantek_6022be.c b/hantek_6022be.c index 1f58a608..bfd4fd44 100644 --- a/hantek_6022be.c +++ b/hantek_6022be.c @@ -15,8 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * License along with this library; if not, see . */ #include @@ -25,6 +24,15 @@ #include #include +#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; @@ -67,14 +75,11 @@ void suspend_isr(void) __interrupt SUSPEND_ISR void timer2_isr(void) __interrupt TF2_ISR { - PA7 = !PA7; - if (ledcounter) { - if (--ledcounter == 0) { - /* Clear LED. */ - PC0 = 1; - PC1 = 1; - } - } + TOGGLE_CALIBRATION_PIN(); + + if (ledcounter && (--ledcounter == 0)) + LED_CLEAR(); + TF2 = 0; } @@ -162,6 +167,8 @@ static void start_sampling(void) { int i; + SET_ANALOG_MODE(); + clear_fifo(); for (i = 0; i < 1000; i++); @@ -175,16 +182,15 @@ 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) { const BYTE *pPacketSize = \ - (USBCS & bmHSM ? &highspd_dscr : &fullspd_dscr) + ((USBCS & bmHSM) ? &highspd_dscr : &fullspd_dscr) + (9 + (16 * alt) + 9 + 4); altiface = alt; @@ -216,18 +222,18 @@ static const struct samplerate_info { BYTE out0; BYTE ifcfg; } samplerates[] = { - { 48,0x80, 0, 3, 0, 0x00, 0xea }, - { 30,0x80, 0, 3, 0, 0x00, 0xaa }, - { 24, 1, 0, 2, 1, 0x40, 0xca }, - { 16, 1, 1, 2, 0, 0x40, 0xca }, - { 12, 2, 1, 2, 0, 0x40, 0xca }, - { 8, 3, 2, 2, 0, 0x40, 0xca }, - { 4, 6, 5, 2, 0, 0x40, 0xca }, - { 2, 12, 11, 2, 0, 0x40, 0xca }, - { 1, 24, 23, 2, 0, 0x40, 0xca }, - { 50, 48, 47, 2, 0, 0x40, 0xca }, - { 20, 120, 119, 2, 0, 0x40, 0xca }, - { 10, 240, 239, 2, 0, 0x40, 0xca }, + { 48, 0x80, 0, 3, 0, 0x00, 0xea }, + { 30, 0x80, 0, 3, 0, 0x00, 0xaa }, + { 24, 1, 0, 2, 1, 0x40, 0xca }, + { 16, 1, 1, 2, 0, 0x40, 0xca }, + { 12, 2, 1, 2, 0, 0x40, 0xca }, + { 8, 3, 2, 2, 0, 0x40, 0xca }, + { 4, 6, 5, 2, 0, 0x40, 0xca }, + { 2, 12, 11, 2, 0, 0x40, 0xca }, + { 1, 24, 23, 2, 0, 0x40, 0xca }, + { 50, 48, 47, 2, 0, 0x40, 0xca }, + { 20, 120, 119, 2, 0, 0x40, 0xca }, + { 10, 240, 239, 2, 0, 0x40, 0xca }, }; static BOOL set_samplerate(BYTE rate) @@ -243,23 +249,26 @@ static BOOL set_samplerate(BYTE rate) IFCONFIG = samplerates[i].ifcfg; AUTOPTRSETUP = 7; - AUTOPTRH2 = 0xE4; + AUTOPTRH2 = 0xE4; /* 0xE400: GPIF waveform descriptor 0. */ AUTOPTRL2 = 0x00; /* * The program for low-speed, e.g. 1 MHz, is: - * wait 24, CTL2=0, FIFO - * wait 23, CTL2=1 - * jump 0, CTL2=1 + * wait 24, CTLx=0, FIFO + * wait 23, CTLx=1 + * jump 0, CTLx=1 * * The program for 24 MHz is: - * wait 1, CTL2=0, FIFO - * jump 0, CTL2=1 + * wait 1, CTLx=0, FIFO + * jump 0, CTLx=1 * * The program for 30/48 MHz is: - * jump 0, CTL2=Z, FIFO, LOOP + * jump 0, CTLx=Z, FIFO, LOOP + * + * (CTLx is device-dependent, could be e.g. CTL0 or CTL2.) */ + /* LENGTH / BRANCH 0-7 */ EXTAUTODAT2 = samplerates[i].wait0; EXTAUTODAT2 = samplerates[i].wait1; EXTAUTODAT2 = 1; @@ -269,24 +278,27 @@ static BOOL set_samplerate(BYTE rate) EXTAUTODAT2 = 0; EXTAUTODAT2 = 0; + /* OPCODE 0-7 */ EXTAUTODAT2 = samplerates[i].opc0; EXTAUTODAT2 = samplerates[i].opc1; - EXTAUTODAT2 = 1; + EXTAUTODAT2 = 1; /* DATA=0 DP=1 */ EXTAUTODAT2 = 0; EXTAUTODAT2 = 0; EXTAUTODAT2 = 0; EXTAUTODAT2 = 0; EXTAUTODAT2 = 0; + /* OUTPUT 0-7 */ EXTAUTODAT2 = samplerates[i].out0; - EXTAUTODAT2 = 0x44; - EXTAUTODAT2 = 0x44; - EXTAUTODAT2 = 0x00; - EXTAUTODAT2 = 0x00; - EXTAUTODAT2 = 0x00; - EXTAUTODAT2 = 0x00; - EXTAUTODAT2 = 0x00; + EXTAUTODAT2 = 0x44; /* OE2=1, CTL2=1 */ + EXTAUTODAT2 = 0x44; /* OE2=1, CTL2=1 */ + EXTAUTODAT2 = 0; + EXTAUTODAT2 = 0; + EXTAUTODAT2 = 0; + EXTAUTODAT2 = 0; + EXTAUTODAT2 = 0; + /* LOGIC FUNCTION 0-7 */ EXTAUTODAT2 = 0; EXTAUTODAT2 = 0; EXTAUTODAT2 = 0; @@ -344,36 +356,30 @@ BOOL handle_vendorcommand(BYTE cmd) { stop_sampling(); - /* Set red LED. */ - PC0 = 0; - PC1 = 1; + /* Set red LED, clear after timeout. */ + LED_RED(); ledcounter = 1000; - switch (cmd) { - case 0xe0: - case 0xe1: + /* Clear EP0BCH/L for each valid command. */ + if (cmd >= 0xe0 && cmd <= 0xe4) { EP0BCH = 0; EP0BCL = 0; while (EP0CS & bmEPBUSY); + } + + switch (cmd) { + case 0xe0: + case 0xe1: set_voltage(cmd - 0xe0, EP0BUF[0]); return TRUE; case 0xe2: - EP0BCH = 0; - EP0BCL = 0; - while (EP0CS & bmEPBUSY); set_samplerate(EP0BUF[0]); return TRUE; case 0xe3: - EP0BCH = 0; - EP0BCL = 0; - while (EP0CS & bmEPBUSY); if (EP0BUF[0] == 1) start_sampling(); return TRUE; case 0xe4: - EP0BCH = 0; - EP0BCL = 0; - while (EP0CS & bmEPBUSY); set_numchannels(EP0BUF[0]); return TRUE; } @@ -386,9 +392,11 @@ static void init(void) EP4CFG = 0; EP8CFG = 0; + SET_ANALOG_MODE(); + /* In idle mode tristate all outputs. */ - GPIFIDLECTL = 0x00; - GPIFCTLCFG = 0x80; + GPIFIDLECTL = 0x00; /* Don't enable CTL0-5 outputs. */ + GPIFCTLCFG = 0x80; /* TRICTL=1. CTL0-2: CMOS outputs, tri-statable. */ GPIFWFSELECT = 0x00; GPIFREADYSTAT = 0x00; @@ -422,17 +430,19 @@ static void main(void) /* Init timer2. */ RCAP2L = -500 & 0xff; - RCAP2H = (-500 >> 8) & 0xff; + RCAP2H = (-500 & 0xff00) >> 8; T2CON = 0; ET2 = 1; TR2 = 1; RENUMERATE(); + PORTECFG = 0; PORTCCFG = 0; PORTACFG = 0; + OEE = 0xff; OEC = 0xff; - OEA = 0x80; + OEA = 0xff; while (TRUE) { if (dosud) { @@ -444,7 +454,7 @@ static void main(void) dosuspend = FALSE; do { /* Make sure ext wakeups are cleared. */ - WAKEUPCS |= bmWU|bmWU2; + WAKEUPCS |= bmWU | bmWU2; SUSPEND = 1; PCON |= 1; __asm