From 98b9e4c7fafd2c495ad4c9bb506f67102232792f Mon Sep 17 00:00:00 2001 From: jim Date: Wed, 8 Jul 2009 21:12:53 +0000 Subject: [PATCH] does not compile -- moving to laptop git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7595 ddd99763-3ecb-0310-9145-efcb8ce7c51f --- firmware/zoom.c | 28 ++++++++++++++++++++++++++++ firmware/zoom.mcw | Bin 41472 -> 41472 bytes 2 files changed, 28 insertions(+) diff --git a/firmware/zoom.c b/firmware/zoom.c index 37b5672..c734d6a 100644 --- a/firmware/zoom.c +++ b/firmware/zoom.c @@ -125,12 +125,16 @@ void run_debug(void) uart1_put_dec(adc); uart1_crlf(); switch (uart1_get()) { + + // small step case '[': dac--; break; case ']': dac++; break; + + // medium step case '-': dac -= 16; break; @@ -138,6 +142,8 @@ void run_debug(void) case '=': dac += 16; break; + + // big step case ',': case '<': dac -= 1024; @@ -146,15 +152,21 @@ void run_debug(void) case '>': dac += 1024; break; + + // set DAC to midpoint case '0': dac = 32768; break; + + // run degauss (currently a noop) case 'd': uart1_put_string("degauss..."); degauss(); uart1_crlf(); dac = 32768; break; + + // set DAC to specified hex value case 'v': case 'V': buf[0] = uart1_get(); @@ -167,6 +179,22 @@ void run_debug(void) else dac = v; break; + + // maintain ADC input at zero + case 'z': + case 'Z': + uart1_put_string("zeroing input...\r\n"); + debug_zero_adc = 1; + uart1_get(); + debug_zero_adc = 0; + break; + + // sweep DAC + case 's': + case 'S': + uart1_put_string("sweep\r\n"); + debug_sweep(); + break; } } } diff --git a/firmware/zoom.mcw b/firmware/zoom.mcw index 09254d60234281a0780450b0c63f06507ec83a42..a32c30f59428a3eba00c38f79c515f70903047f2 100644 GIT binary patch literal 41472 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 literal 41472 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