Rename fet_* to pwr_* and toss bat check for now.

1 files changed, 12 insertions, 34 deletions

diff --git a/main.c b/main.c
index 8d11de8..b708226 100644
--- a/main.c
+++ b/main.c
@@ -14,16 +14,14 @@
 #define PWM_MAX            2550
 #define PWM_TOP            19999
 
-#define VCC_MIN            4900
-
 #define LED_PIN            PB5
 #define LED_DDR            DDRB
 #define LED_PORT           PORTB
 
-#define FET_FPM            PC4
-#define FET_SERVO          PC5
-#define FET_DDR            DDRC
-#define FET_PORT           PORTC
+#define PWR_FPM            PC4
+#define PWR_SERVO          PC5
+#define PWR_DDR            DDRC
+#define PWR_PORT           PORTC
 
 #define FRONT_UNLOCK_PIN   PD2
 #define FRONT_LOCK_PIN     PD3
@@ -66,26 +64,6 @@ static inline void unlock(void)
 	_delay_ms(500);
 }
 
-uint16_t getvcc(void)
-{
-	uint16_t vcc;
-
-	ADMUX |= (1 << REFS0);
-	ADMUX |= (1 << MUX3) | (1 << MUX2) | (1 << MUX1);
-	ADCSRA |= (1 << ADEN) | (1 << ADPS2) | (1 << ADPS0);
-
-	// https://www.sciencetronics.com/greenphotons/?p=1521
-	_delay_us(500);
-
-	ADCSRA |= (1 << ADSC);
-	while (ADCSRA & (1 << ADSC))
-		; 
-	vcc = (1100UL * 1023 / ADC);
-
-	ADCSRA &= ~(1 << ADEN);
-	return vcc;
-}
-
 static inline void flash_led(void)
 {
 	for (int i = 0; i < 4; i++) {
@@ -96,14 +74,14 @@ static inline void flash_led(void)
 	}
 }
 
-static inline void fet_on(void)
+static inline void pwr_fpm_servo_on(void)
 {
-	FET_PORT &= ~((1 << FET_FPM) | (1 << FET_SERVO));
+	PWR_PORT &= ~((1 << PWR_FPM) | (1 << PWR_SERVO));
 }
 
-static inline void fet_off(void)
+static inline void pwr_fpm_servo_off(void)
 {
-	FET_PORT |= (1 << FET_FPM) | (1 << FET_SERVO);
+	PWR_PORT |= (1 << PWR_FPM) | (1 << PWR_SERVO);
 }
 
 int main(void)
@@ -118,8 +96,8 @@ int main(void)
 	WDTCSR = 0x00;
 
 	/* power on peripherals */
-	FET_DDR |= (1 << FET_FPM) | (1 << FET_SERVO);
-	fet_on();
+	PWR_DDR |= (1 << PWR_FPM) | (1 << PWR_SERVO);
+	pwr_fpm_servo_on();
 
 	fpm_init();
 
@@ -192,7 +170,7 @@ int main(void)
 		cmd = NONE;
 		_delay_ms(50);
 
-		fet_off();
+		pwr_fpm_servo_off();
 		set_sleep_mode(SLEEP_MODE_PWR_DOWN);
 		sleep_enable();
 		sleep_bod_disable();
@@ -200,7 +178,7 @@ int main(void)
 		sleep_cpu();
 		cli();
 		sleep_disable();
-		fet_on();
+		pwr_fpm_servo_on();
 	}
 
 	return 0;