diff options
| author | Selene ToyKeeper | 2015-10-05 18:19:05 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2015-10-05 18:19:05 -0600 |
| commit | dcbda82b4d8ed49e5434e43951333b36cbc4a770 (patch) | |
| tree | 12cae65293ea0e47ebe69b9ffcb69f928a35cbbb | |
| parent | Added volts+tenths and 8-bar battery check styles. (diff) | |
| parent | Replaced how USE_FILE_DELAY works. (diff) | |
| download | anduril-dcbda82b4d8ed49e5434e43951333b36cbc4a770.tar.gz anduril-dcbda82b4d8ed49e5434e43951333b36cbc4a770.tar.bz2 anduril-dcbda82b4d8ed49e5434e43951333b36cbc4a770.zip | |
merged sandbox -- added Tido's BLF-VLD, updated s7 and added volts+tents battcheck to it, battcheck.py and tk-*.h updates...
| -rw-r--r-- | tk-attiny.h | 13 | ||||
| -rw-r--r-- | tk-delay.h | 19 |
2 files changed, 25 insertions, 7 deletions
diff --git a/tk-attiny.h b/tk-attiny.h index 9415a97..4fee640 100644 --- a/tk-attiny.h +++ b/tk-attiny.h @@ -84,6 +84,19 @@ // TODO: fill in this section, update Ferrero_Rocher code to use it. #endif // FERRERO_ROCHER_LAYOUT +#ifdef NANJG_LAYOUT +#define STAR2_PIN PB0 +#define STAR3_PIN PB4 +#define STAR4_PIN PB3 +#define PWM_PIN PB1 +#define VOLTAGE_PIN PB2 +#define ADC_CHANNEL 0x01 // MUX 01 corresponds with PB2 +#define ADC_DIDR ADC1D // Digital input disable bit corresponding with PB2 +#define ADC_PRSCL 0x06 // clk/64 + +#define PWM_LVL OCR0B // OCR0B is the output compare register for PB1 +#endif // NANJG_LAYOUT + #ifndef PWM_LVL Hey, you need to define an I/O pin layout. #endif @@ -28,15 +28,20 @@ void _delay_ms(uint16_t n) { // TODO: make this take tenths of a ms instead of ms, // for more precise timing? - #ifdef USE_FINE_DELAY - if (n==0) { _delay_loop_2(BOGOMIPS/3); } - else { - while(n-- > 0) _delay_loop_2(BOGOMIPS); - } - #else + //#ifdef USE_FINE_DELAY + //if (n==0) { _delay_loop_2(BOGOMIPS/3); } + //else { + // while(n-- > 0) _delay_loop_2(BOGOMIPS); + //} + //#else while(n-- > 0) _delay_loop_2(BOGOMIPS); - #endif + //#endif } +#ifdef USE_FINE_DELAY +void _delay_zero() { + _delay_loop_2(BOGOMIPS/3); +} +#endif #ifdef USE_DELAY_S void _delay_s() // because it saves a bit of ROM space to do it this way { |