Browse Source

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
tags/zoom-1.0
jim 15 years ago
parent
commit
5a39bbe11c
3 changed files with 4 additions and 2 deletions
  1. +1
    -1
      firmware/util.h
  2. +3
    -1
      firmware/zoom.c
  3. BIN
      firmware/zoom.mcw

+ 1
- 1
firmware/util.h View File

@@ -6,7 +6,7 @@
/* Convert from ascii hex digit to number */
uint8_t from_hex(uint8_t ch);
extern const uint8_t hex[16];
int32_t hex_to_u16(char x[4])
int32_t hex_to_u16(char x[4]);

/* Array length */
#define array_len(x) (sizeof(x)/sizeof(x[0]))


+ 3
- 1
firmware/zoom.c View File

@@ -32,7 +32,7 @@ void TISR_HANDLER(5)
float i;

/* toggle A9 every time an interrupt occurs */
LATAbits.LATA9 ^= 1;
LATAbits.LATA9 = 1;
timer_clear_txif(5);
/* Get most recent sample from 12-bit ADC. */
@@ -65,6 +65,8 @@ void TISR_HANDLER(5)
/* Now send it out */
dac_cmd = current_to_dac(dac_current);
dac_write(dac_cmd);

LATAbits.LATA9 = 0;
}

void send_to_pc(uint16_t adc, uint16_t dac)


BIN
firmware/zoom.mcw View File


Loading…
Cancel
Save