Jim Paris
150732ee3c
Cleanups for thesis inclusion
11 years ago
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
14 years ago
a9379588cf
calibration works
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7696 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
af0cc2dbfb
misc fixes
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7689 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
267c251999
do 4000 point sweep
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7611 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
3becc85976
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7597 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
45afdd15ba
transfer again
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7596 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
98b9e4c7fa
does not compile -- moving to laptop
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7595 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
ab11999ef2
New scaling values etc.
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7591 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
adb9fbe267
Misc
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7588 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
15c0ce55c0
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7587 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
33a48296ba
toggle normal & debug mode again
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7175 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
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
15 years ago
dc0e311582
allow arbitrary value input
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7173 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
18661b23e6
I don't know
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7079 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
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
15 years ago
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
15 years ago
7e3e0f9ff1
Timer improvements, degauss
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7065 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
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
15 years ago
a3a5a41951
Add 8khz streaming to debug mode
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6942 ddd99763-3ecb-0310-9145-efcb8ce7c51f
15 years ago
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
15 years ago
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
15 years ago
71b0e4f619
window tracks properly now
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6671 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
7896f8463c
misc
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6666 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
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
16 years ago
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
16 years ago
a16510eb1f
Sort of works.
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@6034 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
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
16 years ago
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
16 years ago
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
16 years ago
136fb77276
Start refactoring timer stuff for internal ADC
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5928 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
d341d1ef6b
calibration test
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5806 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
04012c7080
Update test app
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5805 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
3c9c415f7d
add sweep
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5477 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
18b75e5ef4
add DAC magic for AD5542.
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5476 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
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
16 years ago
00a3aee934
Updates
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5456 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
a1afdee08a
Updates
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5374 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
11ba7c897b
blah
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5373 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
f8bf63ce92
initial import
git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@5371 ddd99763-3ecb-0310-9145-efcb8ce7c51f
16 years ago
Jim Paris
jim