Commit Graph

331 Commits

Author SHA1 Message Date
EspoTek 21832f4d55 Added a single #define
That's it.  Literally a single #define that determines how many
milliseconds the OS waits before reconnecting.  Fixed an error with
Windows not reading it on new mobo, hopefully fixes it under OS X as
well.


Former-commit-id: d69bbf8e68
2016-11-10 17:39:40 +11:00
EspoTek 4c25a50696 Pushing Windows
Going to revert and compare.


Former-commit-id: 8d0f6dbeeb
2016-11-10 15:50:34 +11:00
EspoTek 663cf71cfe Mac OS X build running
May have accidentally broken Linux (untested, I wasn’t being shotgunny
but equally wasn’t being super careful).  Seems to randomly fail on
launch.  Probably a race condition on the mutex?


Former-commit-id: b7e0035896
2016-11-09 16:21:00 +11:00
EspoTek e8e4dfd2ca Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Desktop Interface/Labrador.pro.user


Former-commit-id: c1355d0862
2016-10-26 10:33:16 +11:00
EspoTek 323eede224 PCB update
Former-commit-id: 6731cfb7f1
2016-10-26 10:31:04 +11:00
esposch 5f9ea98da5 Added some comments.
Also cleaned up the USB drivers a bit; moved more stuff to
genericUsbDriver.

Former-commit-id: 047450f858
2016-10-24 12:40:06 +11:00
esposch 686be86974 Linux version up and running, with autorecover!
Hopefully the Windows compile hasn't been broken.  Fingers crossed!

Former-commit-id: 8b99289369
2016-10-24 11:27:19 +11:00
esposch f013018320 Iso working, but can't get libusb_handle_events() to run in another
thread.

Former-commit-id: 4509c31f55
2016-10-21 13:10:42 +11:00
esposch 8f432b3607 Oh, it's just like .dlls but they call it something different on Linux.
Fair enough.

USB Control working.  Iso still WIP, but if it works first time it
should be up and running tomorrow!

Former-commit-id: ea47ae4133
2016-10-20 17:16:09 +11:00
esposch 1c618d20e4 And committing and trying to build a sample because I don't know how to
link to libusb under Linux.  Shame, shame puppy shame.

Former-commit-id: a7da94f957
2016-10-20 13:56:09 +11:00
EspoTek cb9f622c1e More changes for multiplatform build
.pro file now works with both Windows and Linux.  Have fixed up some
header names to have capital letters.  Windows doesn't mind, but Linux
cracks the shits.  Hop to have it runnning in Ubuntu ASAP.


Former-commit-id: 10a09fdf50
2016-10-20 12:54:05 +11:00
EspoTek 1c407df178 And updated isoDriver
So it no longer uses winusbDriver


Former-commit-id: 539832ae66
2016-10-18 09:48:18 +11:00
EspoTek 4e5f8aaac1 Subclassed winUsbDriver
Created a genericUsbDriver class and then subclassed winUsbDriver to it.


Former-commit-id: bd8480541c
2016-10-18 09:44:58 +11:00
EspoTek 920cfea03d New PCB
New version of PCB for the "shape the dev" folks


Former-commit-id: ddda840a5e
2016-10-18 08:52:34 +11:00
EspoTek aafb6d184b Added back in recovery
Sadly, it only functions about half a dozen times before failing.  I
suspect something isn't being released; perhaps another call needs to be
made to the .dll?


Former-commit-id: fb964d0f71
2016-10-17 12:53:44 +11:00
EspoTek c0389ceb42 Quick bugfix
Fixed the "pause bug".  It was actually a feature that I deliberately
coded in, but apparently it's really annoying.


Former-commit-id: 5c01c3c5a9
2016-10-14 10:53:05 +11:00
EspoTek ca6b4a2255 NEW DRIVER CODE WORKING!!!
WOOO!!!!!

(Just make sure not to change the FPS.  It's still nowhere near
perfect.)


Former-commit-id: 4ae84d893c
2016-10-14 10:27:17 +11:00
EspoTek aa542ae5a4 Literally just shoved new driver into old code
Complete with file I/O rather than actual communication.


Former-commit-id: be1668ba46
2016-10-14 09:17:00 +11:00
EspoTek f694e40ed0 Removed autorecover
Now crashes instead.  Will put back properly when new driver done.


Former-commit-id: c720b6ee39
2016-10-14 08:46:24 +11:00
EspoTek 595be699ee New driver (not working)
Committing before revert.
Not worth going through after a shotgun debugging sesh.


Former-commit-id: 2e8277c392
2016-10-14 08:19:02 +11:00
EspoTek 670a821ddc Bugfix
Quick bugfix in AVR code.  Prevents CH1 accidentally controlling sample
number on CH2.


Former-commit-id: ce0d5b8bb1
2016-10-13 11:28:39 +11:00
EspoTek dfbbb44350 Proper fix for bug
Never sets device mode to 5 now, preventing frequency from changing when
scope disabled.


Former-commit-id: ae34eaf692
2016-10-05 10:17:53 +11:00
EspoTek d552f8e4f5 "Record"
Now converts samples to voltages before saving them.  Still outputs an
obscene amount of data.


Former-commit-id: 3602d0fb92
2016-09-28 10:15:18 +10:00
EspoTek 68b08929ee Board update and start of CSV export
Some CSV export features implemented - dump everything (in a stream -
750ksps!!) or just dump what's visible in screen.  Stream doesn't dump
actual voltage readings but raw sample data.

Board software has been updated to fix DMAnot transmitting the correct
data for signal gen CH1 in modes 4 and 5


Former-commit-id: 7f40f04ef9
2016-09-26 14:17:41 +10:00
EspoTek 9027dff591 Some more UI features for Scotty
Two new ways of changing range:
- Press Z to snap to cursors, or M to open a dialog and enter manually.
- The frequency boxes now scroll in a more sane way - round down to the
nearest multiple of 10, then divide by 10 to find out the increment.
For example, at 2kHz, the next value will be 2.1kHz (2000 + 1000/10)
rather than 2.001Hz (2000 + 1).


Former-commit-id: 80b928cc27
2016-09-19 12:24:10 +10:00
EspoTek 3a085a0547 Hotfix for ScottC
Mode 4 (Logic Analyzer CH1 and CH2) code has been rewritten and a
third(!!!) pause button has been added to allow pausing while scope is
diabled.
Two of them should disappear in the next commit.  :)


Former-commit-id: 749bf8d4a7
2016-09-17 15:09:59 +10:00
EspoTek a05f8b962b Another update
Removed hardcoded link to C:/kfvcc in software - it can now be run from
any folder!  Also changed some compilation settings to make it for
mass-produced hardware and actually-deployable software.  (Shadow build
was causing an error).


Former-commit-id: 41d8fd61e1
2016-09-12 18:06:42 +10:00
EspoTek ce3dd09245 Code dump
Adding the code!


Former-commit-id: 2ff768b58d
2016-09-07 16:36:43 +10:00
EspoTek 68a057876d Update README.md
Bit of a formatting fix.

Former-commit-id: f445341006
2016-09-07 16:34:55 +10:00
EspoTek 73e72f1db0 Update README.md
Former-commit-id: 3924a5ff32
2016-09-07 11:17:30 +10:00
EspoTek cfd0615447 Initial commit
Former-commit-id: 5157221658
2016-09-07 10:13:09 +10:00