Browse Source

git-svn-id: https://bucket.mit.edu/svn/nilm/zoom@7587 ddd99763-3ecb-0310-9145-efcb8ce7c51f

tags/zoom-1.0
jim 14 years ago
parent
commit
15c0ce55c0
4 changed files with 52 additions and 19 deletions
  1. +8
    -0
      firmware/led.c
  2. +19
    -0
      firmware/led.h
  3. +12
    -10
      firmware/zoom.c
  4. +13
    -9
      firmware/zoom.mcp

+ 8
- 0
firmware/led.c View File

@@ -0,0 +1,8 @@
#include "config.h"
#include "led.h"
void led_init(void)
{
TRISBbits.TRISB13 = 0;
PORTBbits.RB13 = 1;
}

+ 19
- 0
firmware/led.h View File

@@ -0,0 +1,19 @@
#ifndef LED_H
#define LED_H
#include "config.h"
/* Initialize LED */
void led_init(void);
static inline void led_on(void)
{
PORTBbits.RB13 = 0;
}
static inline void led_off(void)
{
PORTBbits.RB13 = 1;
}
#endif

+ 12
- 10
firmware/zoom.c View File

@@ -8,6 +8,7 @@
#include <math.h>
#include "scaling.h"
#include "util.h"
#include "led.h"

int send_data = 0;
uint16_t send_adc;
@@ -207,29 +208,30 @@ void run_normal(void)
int main(void)
{
config_init();
led_init();

/* Pull PGD high internally. */
TRISCbits.TRISC13 = 1;
CNPU1bits.CN1PUE = 1;

/* Output RA9 (PICVREF-) is used for debugging */
TRISAbits.TRISA9 = 0;
led_on();
/* Detect jumper on B10/B11 */
//TRISCbits.TRISC13 = 1;
//CNPU1bits.CN1PUE = 1;

adcext_init();
dac_init();
dac_write(32768);
adc_init();

led_off();
msleep(100);

led_on();
degauss();

/* If PGD is externally tied to ground, use MODE_1
(Short ICD pins 3 and 4) */
if (PORTCbits.RC13 == 0)
// if (PORTCbits.RC13 == 0)
MODE_1();
else
MODE_2();
// else
// MODE_2();

for (;;)
continue;


+ 13
- 9
firmware/zoom.mcp View File

@@ -35,6 +35,8 @@ file_014=no
file_015=no
file_016=no
file_017=no
file_018=no
file_019=no
[FILE_INFO]
file_000=zoom.c
file_001=config.c
@@ -45,15 +47,17 @@ file_005=timer.c
file_006=adcext.c
file_007=adc.c
file_008=scaling.c
file_009=config.h
file_010=uart.h
file_011=util.h
file_012=dac.h
file_013=timer.h
file_014=adcext.h
file_015=adc.h
file_016=scaling.h
file_017=p33fj256gp710.gld
file_009=led.c
file_010=config.h
file_011=uart.h
file_012=util.h
file_013=dac.h
file_014=timer.h
file_015=adcext.h
file_016=adc.h
file_017=scaling.h
file_018=led.h
file_019=p33fj256gp710.gld
[SUITE_INFO]
suite_guid={479DDE59-4D56-455E-855E-FFF59A3DB57E}
suite_state=


Loading…
Cancel
Save