From 94ba77de5c2c4bf8df3f23ac9ab397a360a75e69 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sat, 3 Nov 2018 18:55:31 -0600
Subject: Made it easier to override hwdef-*.h values in cfg-*.h files.

---
 hwdef-Emisar_D4.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'hwdef-Emisar_D4.h')

diff --git a/hwdef-Emisar_D4.h b/hwdef-Emisar_D4.h
index 105d3b9..0dfcab9 100644
--- a/hwdef-Emisar_D4.h
+++ b/hwdef-Emisar_D4.h
@@ -9,24 +9,32 @@
 
 #define PWM_CHANNELS 2
 
-#define AUXLED_PIN   PB4    // pin 3
+//#define AUXLED_PIN   PB4    // pin 3
 
+#ifndef SWITCH_PIN
 #define SWITCH_PIN   PB3    // pin 2
 #define SWITCH_PCINT PCINT3 // pin 2 pin change interrupt
+#endif
 
+#ifndef PWM1_PIN
 #define PWM1_PIN PB0        // pin 5, 1x7135 PWM
 #define PWM1_LVL OCR0A      // OCR0A is the output compare register for PB0
+#endif
+#ifndef PWM2_PIN
 #define PWM2_PIN PB1        // pin 6, FET PWM
 #define PWM2_LVL OCR0B      // OCR0B is the output compare register for PB1
+#endif
 
 // (FIXME: remove?  not used?)
-#define VOLTAGE_PIN PB2     // pin 7, voltage ADC
-#define ADC_CHANNEL 0x01    // MUX 01 corresponds with PB2
-#define ADC_DIDR    ADC1D   // Digital input disable bit corresponding with PB2
+//#define VOLTAGE_PIN PB2     // pin 7, voltage ADC
+//#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
 
 // average drop across diode on this hardware
+#ifndef VOLTAGE_FUDGE_FACTOR
 #define VOLTAGE_FUDGE_FACTOR 5  // add 0.25V
+#endif
 
 //#define TEMP_DIDR   ADC4D
 #define TEMP_CHANNEL 0b00001111
-- 
cgit v1.2.3