nilm/zoom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
238 Commits 1 Branch 1 Tag 45 MiB
zoom-1.0
Commit Graph

40 Commits

Author SHA1 Message Date
Jim Paris
150732ee3c Cleanups for thesis inclusion 2013-06-12 18:43:35 -04:00
jim
af9b2b1ce4 Fake 10-bit mode, using random number lookup for low bits. 
Untested.  Need to test 16-bit mode (current compilation) first
then go back to 10-bit.

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@8027 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-11-04 00:19:44 +00:00
jim
a9379588cf calibration works 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7696 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 20:31:09 +00:00
jim
af0cc2dbfb misc fixes 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7689 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 06:34:53 +00:00
jim
267c251999 do 4000 point sweep 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7611 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-10 21:33:15 +00:00
jim
3becc85976 git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7597 ddd99763-3ecb-0310-9145-efcb8ce7c51f 2009-07-08 22:15:24 +00:00
jim
45afdd15ba transfer again 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7596 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-08 21:21:25 +00:00
jim
98b9e4c7fa does not compile -- moving to laptop 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7595 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-08 21:12:53 +00:00
jim
ab11999ef2 New scaling values etc. 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7591 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-01 21:11:34 +00:00
jim
adb9fbe267 Misc 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7588 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-01 19:27:23 +00:00
jim
15c0ce55c0 git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7587 ddd99763-3ecb-0310-9145-efcb8ce7c51f 2009-07-01 19:26:39 +00:00
jim
33a48296ba toggle normal & debug mode again 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7175 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-02-05 23:43:09 +00:00
jim
5a39bbe11c Fix typo in util.h 
Use pin output to indicate ISR state

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7174 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-02-05 23:42:14 +00:00
jim
dc0e311582 allow arbitrary value input 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7173 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-02-05 23:39:49 +00:00
jim
18661b23e6 I don't know 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7079 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-01-15 22:22:47 +00:00
jim
b4375aeab2 Tweak some build options, add -O1 
Make PC output send 0x8000 if there was ever an ADC overflow or underflow.
(The ADC underflow check might be more strict than necessary).


git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7068 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-01-13 05:45:45 +00:00
jim
8977dea014 Include .lst files in output 
Add dac_to_current scaling so we can set limits easily.
Change interrupt to do everything in terms of current.  Much simpler to understand, and is preferable if we can get away with using the cycles.


git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7067 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-01-13 05:11:00 +00:00
jim
7e3e0f9ff1 Timer improvements, degauss 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7065 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-01-13 02:34:17 +00:00
jim
19f41a087b Add degauss mode, scaling helpers, better handling of ADC result 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7009 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-12-05 02:04:04 +00:00
jim
a3a5a41951 Add 8khz streaming to debug mode 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6942 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-10-22 22:23:44 +00:00
jim
7df0122961 Bugfixes & updates. 
I think the 12-bit ADC can't drive the optoisolator, crap.


git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6914 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-10-06 21:37:48 +00:00
jim
c5c949c509 All the changes I made on Friday before my computer blew up 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6896 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-09-23 23:27:40 +00:00
jim
71b0e4f619 window tracks properly now 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6671 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-07-09 17:41:51 +00:00
jim
7896f8463c misc 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6666 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-07-08 22:00:33 +00:00
jim
c495a51866 Update for latest circuit changes 
Now needs a smarter algorithm for figuring out the DAC from the ADC.

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6628 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-06-27 18:33:02 +00:00
jim
4fddc90a8c Debug mode -- control the DAC from PC at 115200 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6582 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-06-13 19:43:33 +00:00
jim
a16510eb1f Sort of works. 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6034 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-02-29 16:50:47 +00:00
jim
2322b564a3 Fix DAC stuff slightly 
Update code to test bipolar dac

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6027 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-02-29 09:25:05 +00:00
jim
b376f39f83 Simple "zoom nilm" behavior & sending ADC/DAC data to the PC. 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5936 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-02-12 23:03:00 +00:00
jim
b95491274d Set up 128 KHz 12-bit ADC sampling with DMA, and send to UART at 0.5 Mbps. 
Seems to work well.
Next step is to process ADC data at 128 KHz to determine DAC stepping,
and send DAC + ADC to PC at 8 KHz.




git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5931 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-02-12 05:24:34 +00:00
jim
136fb77276 Start refactoring timer stuff for internal ADC 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5928 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-02-12 02:58:54 +00:00
jim
d341d1ef6b calibration test 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5806 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-01-23 04:29:07 +00:00
jim
04012c7080 Update test app 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5805 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-01-23 03:33:10 +00:00
jim
3c9c415f7d add sweep 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5477 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2007-11-07 00:08:38 +00:00
jim
18b75e5ef4 add DAC magic for AD5542. 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5476 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2007-11-07 00:06:28 +00:00
jim
458c1e9ed1 ADC seems to work now. 
Added adc_convert to give us a nice signed 32 bit value as the result.

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5470 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2007-11-06 00:57:07 +00:00
jim
00a3aee934 Updates 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5456 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2007-11-01 23:36:31 +00:00
jim
a1afdee08a Updates 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5374 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2007-10-16 23:31:48 +00:00
jim
11ba7c897b blah 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5373 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2007-10-16 23:20:11 +00:00
jim
f8bf63ce92 initial import 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5371 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2007-10-16 22:43:26 +00:00