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

63 Commits

Author SHA1 Message Date
Jim Paris
150732ee3c Cleanups for thesis inclusion 2013-06-12 18:43:35 -04:00
Jim Paris
431f387b55 Fix line endings 2013-06-12 18:40:40 -04:00
jim
6b5a14b01f Changes to fix the real-10-bit case. 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@9082 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2011-01-07 21:41:15 +00:00
jim
555b95f641 Add support for a real 10-bit dac 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@8673 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2010-07-08 00:00:03 +00:00
jim
a2921bf297 10bit version 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@8044 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-11-07 21:27:00 +00:00
jim
06e38991b1 Calibration seems to work now with FAKE_BITS set. 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@8029 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-11-04 19:16:47 +00: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
5cb6542c7e add lookup table for DAC mapping 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@8026 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-11-03 22:31:47 +00:00
jim
1f34386bce misc 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7810 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-08-14 00:51:08 +00:00
jim
56bdae2230 git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7727 ddd99763-3ecb-0310-9145-efcb8ce7c51f 2009-07-24 00:09:56 +00:00
jim
488e0fe9b0 various changes 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7708 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-23 00:54:10 +00:00
jim
8b3041faec Fixes 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7698 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 22:02:27 +00:00
jim
9e8129c63a Normal mode, using new calib 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7697 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 22:00:30 +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
94a79e1964 pointer mixup 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7695 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 18:07:51 +00:00
jim
aab6b45fd4 add seek/calibrate commands 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7694 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 18:06:37 +00:00
jim
219b30e0d7 update to fix build issues. Time to test? 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7693 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 17:58:12 +00:00
jim
4c6ed3cd06 rip stuff out of mode_debug, replace it with stuff in calibrate 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7692 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 17:51:59 +00:00
jim
f99461512e calibration work, need to commit to test-compile in windows 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7691 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 17:44:15 +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
3f625c3d26 update 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7688 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 06:21:05 +00:00
jim
8c797705d3 this is totally broken 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7687 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2009-07-21 02:54:42 +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
55589a4930 git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7006 ddd99763-3ecb-0310-9145-efcb8ce7c51f 2008-12-04 23:48:24 +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
b3b1e70836 workspace 
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6898 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2008-09-25 00:15:06 +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