aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSelene ToyKeeper2020-07-08 21:52:34 -0600
committerSelene ToyKeeper2020-07-08 21:52:34 -0600
commit2d3070b75cabab97343efceccf9c52d2dd82d6c6 (patch)
tree618314a0fa92c442888545d391fed40381adf1e1
parentadded Emisar D4v2.5 support (D4v2 with a KR4 driver, same as KR4 but with lig... (diff)
downloadanduril-2d3070b75cabab97343efceccf9c52d2dd82d6c6.tar.gz
anduril-2d3070b75cabab97343efceccf9c52d2dd82d6c6.tar.bz2
anduril-2d3070b75cabab97343efceccf9c52d2dd82d6c6.zip
minor formatting cleanup
Diffstat (limited to '')
-rw-r--r--hwdef-Emisar_D4v2.h12
-rw-r--r--hwdef-Noctigon_KR4.h3
2 files changed, 7 insertions, 8 deletions
diff --git a/hwdef-Emisar_D4v2.h b/hwdef-Emisar_D4v2.h
index fc95e22..e118ed5 100644
--- a/hwdef-Emisar_D4v2.h
+++ b/hwdef-Emisar_D4v2.h
@@ -56,12 +56,12 @@
#endif
// this light has aux LEDs under the optic
-#define AUXLED_R_PIN PA5 // pin 2
-#define AUXLED_G_PIN PA4 // pin 3
-#define AUXLED_B_PIN PA3 // pin 4
-#define AUXLED_RGB_PORT PORTA // PORTA or PORTB or PORTC
-#define AUXLED_RGB_DDR DDRA // DDRA or DDRB or DDRC
-#define AUXLED_RGB_PUE PUEA // PUEA or PUEB or PUEC
+#define AUXLED_R_PIN PA5 // pin 2
+#define AUXLED_G_PIN PA4 // pin 3
+#define AUXLED_B_PIN PA3 // pin 4
+#define AUXLED_RGB_PORT PORTA // PORTA or PORTB or PORTC
+#define AUXLED_RGB_DDR DDRA // DDRA or DDRB or DDRC
+#define AUXLED_RGB_PUE PUEA // PUEA or PUEB or PUEC
#define BUTTON_LED_PIN PA1 // pin 6
#define BUTTON_LED_PORT PORTA // for all "PA" pins
diff --git a/hwdef-Noctigon_KR4.h b/hwdef-Noctigon_KR4.h
index 940df41..feb49e6 100644
--- a/hwdef-Noctigon_KR4.h
+++ b/hwdef-Noctigon_KR4.h
@@ -82,11 +82,10 @@
#define ADMUX_VOLTAGE_DIVIDER 0b10000110
#define ADC_PRSCL 0x07 // clk/128
-// TODO: calibrate this
// Raw ADC readings at 4.4V and 2.2V
// calibrate the voltage readout here
// estimated / calculated values are:
-// (voltage - D1) * (R2/(R2+R1) * 256 / 1.1)
+// (voltage - D1) * (R2/(R2+R1) * 1024 / 1.1)
// D1, R1, R2 = 0, 330, 100
#ifndef ADC_44
//#define ADC_44 981 // raw value at 4.40V