diff --git a/firmware/scaling.c b/firmware/calibrate.c similarity index 100% rename from firmware/scaling.c rename to firmware/calibrate.c diff --git a/firmware/scaling.h b/firmware/calibrate.h similarity index 100% rename from firmware/scaling.h rename to firmware/calibrate.h diff --git a/firmware/led.c b/firmware/led.c index 19b52fa..bd7e5d8 100644 --- a/firmware/led.c +++ b/firmware/led.c @@ -1,5 +1,6 @@ #include "config.h" #include "led.h" +#include "timer.h" int16_t __led_pattern; @@ -33,7 +34,7 @@ void led_init(void) } /* Set a pattern (8-bit binary pattern). */ -void led_pattern(int8_t pattern) +void led_pattern(uint8_t pattern) { __led_pattern = pattern; } diff --git a/firmware/led.h b/firmware/led.h index f64d6ef..d5e1e66 100644 --- a/firmware/led.h +++ b/firmware/led.h @@ -10,7 +10,7 @@ extern int16_t __led_pattern; void led_init(void); /* Set a pattern (8-bit binary pattern). */ -void led_pattern(int8_t pattern); +void led_pattern(uint8_t pattern); static inline void led_on(void) { diff --git a/firmware/mode_debug.c b/firmware/mode_debug.c index 70d502e..07ebb79 100644 --- a/firmware/mode_debug.c +++ b/firmware/mode_debug.c @@ -5,7 +5,7 @@ #include "timer.h" #include #include -#include "scaling.h" +#include "calibrate.h" #include "util.h" #include "led.h" #include "mode.h" @@ -18,6 +18,8 @@ static int zero_adc = 0; void TISR_HANDLER(7) { +#pragma warn FIXME +#if 0 int16_t v; float dac_current, i; @@ -37,6 +39,7 @@ void TISR_HANDLER(7) dac = current_to_dac(dac_current); dac_write(dac); } +#endif } void sweep(void) @@ -74,7 +77,7 @@ void run_debug(void) timer_setup_16bit(7, TIMER_RATE, 1); timer_set_priority(7, 6); - led_pattern(0x10101010); + led_pattern(0b10101010); uart1_put_string("Zoom NILM Debug\r\n"); diff --git a/firmware/mode_normal.c b/firmware/mode_normal.c index 87a6eaf..96d8f31 100644 --- a/firmware/mode_normal.c +++ b/firmware/mode_normal.c @@ -6,9 +6,10 @@ #include "timer.h" #include #include -#include "scaling.h" +#include "calibrate.h" #include "util.h" #include "mode.h" +#include "led.h" #include "zoom.h" int send_data = 0; @@ -50,6 +51,8 @@ void TISR_HANDLER(5) } /* Convert ADC value to current */ +#pragma xxx +#if 0 i = adc12_to_current(v); #if 0 @@ -68,6 +71,7 @@ void TISR_HANDLER(5) /* Now send it out */ dac_cmd = current_to_dac(dac_current); +#endif dac_write(dac_cmd); LATAbits.LATA9 = 0; diff --git a/firmware/zoom.c b/firmware/zoom.c index b5b5c09..c1b2d74 100644 --- a/firmware/zoom.c +++ b/firmware/zoom.c @@ -8,20 +8,6 @@ #include "led.h" #include "mode.h" #include "zoom.h" -#include "scaling.h" - -void degauss(void) -{ - return; -#if 0 - dac_write(65535); /* max */ - msleep(25); - dac_write(0); /* min */ - msleep(25); - dac_write(32768); /* middle */ - msleep(25); -#endif -} int main(void) { @@ -34,7 +20,6 @@ int main(void) /* debug output */ TRISAbits.TRISA9 = 0; - scaling_init(); adcext_init(); dac_init(); dac_write(32768); diff --git a/firmware/zoom.mcp b/firmware/zoom.mcp index d729993..cc4bccf 100644 --- a/firmware/zoom.mcp +++ b/firmware/zoom.mcp @@ -50,10 +50,10 @@ file_004=dac.c file_005=timer.c file_006=adcext.c file_007=adc.c -file_008=scaling.c -file_009=led.c -file_010=mode_debug.c -file_011=mode_normal.c +file_008=led.c +file_009=mode_debug.c +file_010=mode_normal.c +file_011=calibrate.c file_012=config.h file_013=uart.h file_014=util.h @@ -61,10 +61,10 @@ file_015=dac.h file_016=timer.h file_017=adcext.h file_018=adc.h -file_019=scaling.h -file_020=led.h -file_021=mode.h -file_022=zoom.h +file_019=led.h +file_020=mode.h +file_021=zoom.h +file_022=calibrate.h file_023=p33fj256gp710.gld [SUITE_INFO] suite_guid={479DDE59-4D56-455E-855E-FFF59A3DB57E}