normalized indentation with spaces

1 files changed, 179 insertions, 179 deletions

diff --git a/DarkHorse/DarkHorse.c b/DarkHorse/DarkHorse.c
index e67fc34..fe5c69b 100644
--- a/DarkHorse/DarkHorse.c
+++ b/DarkHorse/DarkHorse.c
@@ -5,17 +5,17 @@
  * Settings to modify per driver

  */

 

-#define VOLTAGE_MON			// Comment out to disable - ramp down and eventual shutoff when battery is low

-#define MODES			0,16,32,125,255	// Must be low to high, and must start with 0

-#define TURBO				// Comment out to disable - full output with a step down after n number of seconds

-							// If turbo is enabled, it will be where 255 is listed in the modes above

-#define TURBO_TIMEOUT	5625 // How many WTD ticks before before dropping down (.016 sec each)

-							// 90  = 5625

-							// 120 = 7500

-							

-#define ADC_LOW			130	// When do we start ramping

-#define ADC_CRIT		120 // When do we shut the light off

-#define ADC_DELAY		188	// Delay in ticks between low-bat rampdowns (188 ~= 3s)

+#define VOLTAGE_MON         // Comment out to disable - ramp down and eventual shutoff when battery is low

+#define MODES           0,16,32,125,255 // Must be low to high, and must start with 0

+#define TURBO               // Comment out to disable - full output with a step down after n number of seconds

+                            // If turbo is enabled, it will be where 255 is listed in the modes above

+#define TURBO_TIMEOUT   5625 // How many WTD ticks before before dropping down (.016 sec each)

+                            // 90  = 5625

+                            // 120 = 7500

+

+#define ADC_LOW         130 // When do we start ramping

+#define ADC_CRIT        120 // When do we shut the light off

+#define ADC_DELAY       188 // Delay in ticks between low-bat rampdowns (188 ~= 3s)

 

 /*

  * =========================================================================

@@ -25,28 +25,28 @@
 #include <avr/io.h>

 #include <util/delay.h>

 #include <avr/interrupt.h>

-#include <avr/wdt.h>	

+#include <avr/wdt.h>

 #include <avr/eeprom.h>

 #include <avr/sleep.h>

 //#include <avr/power.h>

 

 #define STAR2_PIN   PB0

 #define STAR3_PIN   PB4

-#define SWITCH_PIN  PB3		// what pin the switch is connected to, which is Star 4

+#define SWITCH_PIN  PB3     // what pin the switch is connected to, which is Star 4

 #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 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

 

 #define DB_REL_DUR 0b00001111 // time before we consider the switch released after

-							  // each bit of 1 from the right equals 16ms, so 0x0f = 64ms

+                              // each bit of 1 from the right equals 16ms, so 0x0f = 64ms

 

 // Switch handling

 #define LONG_PRESS_DUR   32 // How many WDT ticks until we consider a press a long press

-                            // 32 is roughly .5 s	

+                            // 32 is roughly .5 s

 

 /*

  * The actual program

@@ -63,37 +63,37 @@ volatile uint8_t press_duration = 0;
 // Debounced switch press value

 int is_pressed()

 {

-	// Keep track of last switch values polled

-	static uint8_t buffer = 0x00;

-	// Shift over and tack on the latest value, 0 being low for pressed, 1 for pulled-up for released

-	buffer = (buffer << 1) | ((PINB & (1 << SWITCH_PIN)) == 0);

-	return (buffer & DB_REL_DUR);

+    // Keep track of last switch values polled

+    static uint8_t buffer = 0x00;

+    // Shift over and tack on the latest value, 0 being low for pressed, 1 for pulled-up for released

+    buffer = (buffer << 1) | ((PINB & (1 << SWITCH_PIN)) == 0);

+    return (buffer & DB_REL_DUR);

 }

 

 inline void next_mode() {

-	if (++mode_idx >= sizeof(modes)) {

-		// Wrap around

-		mode_idx = 0;

-	}	

+    if (++mode_idx >= sizeof(modes)) {

+        // Wrap around

+        mode_idx = 0;

+    }

 }

 

 inline void prev_mode() {

-	if (mode_idx == 0) {

-		// Wrap around

-		mode_idx = sizeof(modes) - 1;

-	} else {

-		--mode_idx;

-	}

+    if (mode_idx == 0) {

+        // Wrap around

+        mode_idx = sizeof(modes) - 1;

+    } else {

+        --mode_idx;

+    }

 }

 

 inline void PCINT_on() {

-	// Enable pin change interrupts

-	GIMSK |= (1 << PCIE);

+    // Enable pin change interrupts

+    GIMSK |= (1 << PCIE);

 }

 

 inline void PCINT_off() {

-	// Disable pin change interrupts

-	GIMSK &= ~(1 << PCIE);

+    // Disable pin change interrupts

+    GIMSK &= ~(1 << PCIE);

 }

 

 // Need an interrupt for when pin change is enabled to ONLY wake us from sleep.

@@ -101,176 +101,176 @@ inline void PCINT_off() {
 EMPTY_INTERRUPT(PCINT0_vect);

 

 inline void WDT_on() {

-	// Setup watchdog timer to only interrupt, not reset, every 16ms.

-	cli();							// Disable interrupts

-	wdt_reset();					// Reset the WDT

-	WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence

-	WDTCR = (1<<WDTIE);				// Enable interrupt every 16ms

-	sei();							// Enable interrupts

+    // Setup watchdog timer to only interrupt, not reset, every 16ms.

+    cli();                          // Disable interrupts

+    wdt_reset();                    // Reset the WDT

+    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence

+    WDTCR = (1<<WDTIE);             // Enable interrupt every 16ms

+    sei();                          // Enable interrupts

 }

 

 inline void WDT_off()

 {

-	cli();							// Disable interrupts

-	wdt_reset();					// Reset the WDT

-	MCUSR &= ~(1<<WDRF);			// Clear Watchdog reset flag

-	WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence

-	WDTCR = 0x00;					// Disable WDT

-	sei();							// Enable interrupts

+    cli();                          // Disable interrupts

+    wdt_reset();                    // Reset the WDT

+    MCUSR &= ~(1<<WDRF);            // Clear Watchdog reset flag

+    WDTCR |= (1<<WDCE) | (1<<WDE);  // Start timed sequence

+    WDTCR = 0x00;                   // Disable WDT

+    sei();                          // Enable interrupts

 }

 

 inline void ADC_on() {

-	ADMUX  = (1 << REFS0) | (1 << ADLAR) | ADC_CHANNEL; // 1.1v reference, left-adjust, ADC1/PB2

-    DIDR0 |= (1 << ADC_DIDR);							// disable digital input on ADC pin to reduce power consumption

-	ADCSRA = (1 << ADEN ) | (1 << ADSC ) | ADC_PRSCL;   // enable, start, prescale

+    ADMUX  = (1 << REFS0) | (1 << ADLAR) | ADC_CHANNEL; // 1.1v reference, left-adjust, ADC1/PB2

+    DIDR0 |= (1 << ADC_DIDR);                           // disable digital input on ADC pin to reduce power consumption

+    ADCSRA = (1 << ADEN ) | (1 << ADSC ) | ADC_PRSCL;   // enable, start, prescale

 }

 

 inline void ADC_off() {

-	ADCSRA &= ~(1<<7); //ADC off

+    ADCSRA &= ~(1<<7); //ADC off

 }

 

 void sleep_until_switch_press()

 {

-	// This routine takes up a lot of program memory :(

-	// Turn the WDT off so it doesn't wake us from sleep

-	// Will also ensure interrupts are on or we will never wake up

-	WDT_off();

-	// Need to reset press duration since a button release wasn't recorded

-	press_duration = 0;

-	// Enable a pin change interrupt to wake us up

-	// However, we have to make sure the switch is released otherwise we will wake when the user releases the switch

-	while (is_pressed()) {

-		_delay_ms(16);

-	}

-	PCINT_on();

-	// Enable sleep mode set to Power Down that will be triggered by the sleep_mode() command.

-	//set_sleep_mode(SLEEP_MODE_PWR_DOWN);

-	// Now go to sleep

-	sleep_mode();

-	// Hey, someone must have pressed the switch!!

-	// Disable pin change interrupt because it's only used to wake us up

-	PCINT_off();

-	// Turn the WDT back on to check for switch presses

-	WDT_on();

-	// Go back to main program

+    // This routine takes up a lot of program memory :(

+    // Turn the WDT off so it doesn't wake us from sleep

+    // Will also ensure interrupts are on or we will never wake up

+    WDT_off();

+    // Need to reset press duration since a button release wasn't recorded

+    press_duration = 0;

+    // Enable a pin change interrupt to wake us up

+    // However, we have to make sure the switch is released otherwise we will wake when the user releases the switch

+    while (is_pressed()) {

+        _delay_ms(16);

+    }

+    PCINT_on();

+    // Enable sleep mode set to Power Down that will be triggered by the sleep_mode() command.

+    //set_sleep_mode(SLEEP_MODE_PWR_DOWN);

+    // Now go to sleep

+    sleep_mode();

+    // Hey, someone must have pressed the switch!!

+    // Disable pin change interrupt because it's only used to wake us up

+    PCINT_off();

+    // Turn the WDT back on to check for switch presses

+    WDT_on();

+    // Go back to main program

 }

 

 // The watchdog timer is called every 16ms

 ISR(WDT_vect) {

 

-	//static uint8_t  press_duration = 0;  // Pressed or not pressed

-	static uint16_t turbo_ticks = 0;

-	static uint8_t  adc_ticks = ADC_DELAY;

-	static uint8_t  lowbatt_cnt = 0;

-

-	if (is_pressed()) {

-		if (press_duration < 255) {

-			press_duration++;

-		}

-		

-		if (press_duration == LONG_PRESS_DUR) {

-			// Long press, go to previous mode

-			prev_mode();

-		}

-		// Just always reset turbo timer whenever the button is pressed

-		turbo_ticks = 0;

-		// Same with the ramp down delay

-		adc_ticks = ADC_DELAY;

-	} else {

-		// Not pressed

-		if (press_duration > 0 && press_duration < LONG_PRESS_DUR) {

-			// Short press, go to next mode

-			next_mode();

-		} else {

-			// Only do turbo check when switch isn't pressed

-		#ifdef TURBO

-			if (pgm_read_byte(&modes[mode_idx]) == 255) {

-				turbo_ticks++;

-				if (turbo_ticks > TURBO_TIMEOUT) {

-					// Go to the previous mode

-					prev_mode();

-				}

-			}

-		#endif

-			// Only do voltage monitoring when the switch isn't pressed

-		#ifdef VOLTAGE_MON

-			if (adc_ticks > 0) {

-				--adc_ticks;

-			}

-			if (adc_ticks == 0) {

-				// See if conversion is done

-				if (ADCSRA & (1 << ADIF)) {

-					// See if voltage is lower than what we were looking for

-					if (ADCH < ((mode_idx == 1) ? ADC_CRIT : ADC_LOW)) {

-						++lowbatt_cnt;

-					} else {

-						lowbatt_cnt = 0;

-					}

-				}

-				

-				// See if it's been low for a while

-				if (lowbatt_cnt >= 4) {

-					prev_mode();

-					lowbatt_cnt = 0;

-					// If we reach 0 here, main loop will go into sleep mode

-					// Restart the counter to when we step down again

-					adc_ticks = ADC_DELAY;

-				}

-				

-				// Make sure conversion is running for next time through

-				ADCSRA |= (1 << ADSC);

-			}

-		#endif

-		}

-		press_duration = 0;

-	}

+    //static uint8_t  press_duration = 0;  // Pressed or not pressed

+    static uint16_t turbo_ticks = 0;

+    static uint8_t  adc_ticks = ADC_DELAY;

+    static uint8_t  lowbatt_cnt = 0;

+

+    if (is_pressed()) {

+        if (press_duration < 255) {

+            press_duration++;

+        }

+

+        if (press_duration == LONG_PRESS_DUR) {

+            // Long press, go to previous mode

+            prev_mode();

+        }

+        // Just always reset turbo timer whenever the button is pressed

+        turbo_ticks = 0;

+        // Same with the ramp down delay

+        adc_ticks = ADC_DELAY;

+    } else {

+        // Not pressed

+        if (press_duration > 0 && press_duration < LONG_PRESS_DUR) {

+            // Short press, go to next mode

+            next_mode();

+        } else {

+            // Only do turbo check when switch isn't pressed

+        #ifdef TURBO

+            if (pgm_read_byte(&modes[mode_idx]) == 255) {

+                turbo_ticks++;

+                if (turbo_ticks > TURBO_TIMEOUT) {

+                    // Go to the previous mode

+                    prev_mode();

+                }

+            }

+        #endif

+            // Only do voltage monitoring when the switch isn't pressed

+        #ifdef VOLTAGE_MON

+            if (adc_ticks > 0) {

+                --adc_ticks;

+            }

+            if (adc_ticks == 0) {

+                // See if conversion is done

+                if (ADCSRA & (1 << ADIF)) {

+                    // See if voltage is lower than what we were looking for

+                    if (ADCH < ((mode_idx == 1) ? ADC_CRIT : ADC_LOW)) {

+                        ++lowbatt_cnt;

+                    } else {

+                        lowbatt_cnt = 0;

+                    }

+                }

+

+                // See if it's been low for a while

+                if (lowbatt_cnt >= 4) {

+                    prev_mode();

+                    lowbatt_cnt = 0;

+                    // If we reach 0 here, main loop will go into sleep mode

+                    // Restart the counter to when we step down again

+                    adc_ticks = ADC_DELAY;

+                }

+

+                // Make sure conversion is running for next time through

+                ADCSRA |= (1 << ADSC);

+            }

+        #endif

+        }

+        press_duration = 0;

+    }

 }

 

 int main(void)

-{	

-	// Set all ports to input, and turn pull-up resistors on for the inputs we are using

-	DDRB = 0x00;

-	PORTB = (1 << SWITCH_PIN) | (1 << STAR2_PIN) | (1 << STAR3_PIN);

-

-	// Set the switch as an interrupt for when we turn pin change interrupts on

-	PCMSK = (1 << SWITCH_PIN);

-	

+{

+    // Set all ports to input, and turn pull-up resistors on for the inputs we are using

+    DDRB = 0x00;

+    PORTB = (1 << SWITCH_PIN) | (1 << STAR2_PIN) | (1 << STAR3_PIN);

+

+    // Set the switch as an interrupt for when we turn pin change interrupts on

+    PCMSK = (1 << SWITCH_PIN);

+

     // Set PWM pin to output

     DDRB = (1 << PWM_PIN);

 

     // Set timer to do PWM for correct output pin and set prescaler timing

     TCCR0A = 0x23; // phase corrected PWM is 0x21 for PB1, fast-PWM is 0x23

     TCCR0B = 0x01; // pre-scaler for timer (1 => 1, 2 => 8, 3 => 64...)

-	

-	// Turn features on or off as needed

-	#ifdef VOLTAGE_MON

-	ADC_on();

-	#else

-	ADC_off();

-	#endif

-	ACSR   |=  (1<<7); //AC off

-	

-	// Enable sleep mode set to Power Down that will be triggered by the sleep_mode() command.

-	set_sleep_mode(SLEEP_MODE_PWR_DOWN);

-	sleep_until_switch_press();

-	

-	uint8_t last_mode_idx = 0;

-	

-	while(1) {

-		// We will never leave this loop.  The WDT will interrupt to check for switch presses and 

-		// will change the mode if needed.  If this loop detects that the mode has changed, run the

-		// logic for that mode while continuing to check for a mode change.

-		if (mode_idx != last_mode_idx) {

-			last_mode_idx = mode_idx;

-			// The WDT changed the mode.

-			PWM_LVL = pgm_read_byte(&modes[mode_idx]);

-			if (PWM_LVL == 0) {

-				_delay_ms(1); // Need this here, maybe instructions for PWM output not getting executed before shutdown?

-				// Go to sleep

-				sleep_until_switch_press();

-			}

-		}

-	}

+

+    // Turn features on or off as needed

+    #ifdef VOLTAGE_MON

+    ADC_on();

+    #else

+    ADC_off();

+    #endif

+    ACSR   |=  (1<<7); //AC off

+

+    // Enable sleep mode set to Power Down that will be triggered by the sleep_mode() command.

+    set_sleep_mode(SLEEP_MODE_PWR_DOWN);

+    sleep_until_switch_press();

+

+    uint8_t last_mode_idx = 0;

+

+    while(1) {

+        // We will never leave this loop.  The WDT will interrupt to check for switch presses and

+        // will change the mode if needed.  If this loop detects that the mode has changed, run the

+        // logic for that mode while continuing to check for a mode change.

+        if (mode_idx != last_mode_idx) {

+            last_mode_idx = mode_idx;

+            // The WDT changed the mode.

+            PWM_LVL = pgm_read_byte(&modes[mode_idx]);

+            if (PWM_LVL == 0) {

+                _delay_ms(1); // Need this here, maybe instructions for PWM output not getting executed before shutdown?

+                // Go to sleep

+                sleep_until_switch_press();

+            }

+        }

+    }

 

     return 0; // Standard Return Code

 }