diff --git a/Circuit-Teensy/OpeNITHM.pro b/Circuit-Teensy/OpeNITHM.pro index 034c867..9471876 100644 --- a/Circuit-Teensy/OpeNITHM.pro +++ b/Circuit-Teensy/OpeNITHM.pro @@ -1,4 +1,4 @@ -update=6/27/2019 11:21:15 PM +update=11/24/2019 9:19:44 PM version=1 last_client=kicad [general] diff --git a/Circuit-Teensy/OpeNITHM.sch b/Circuit-Teensy/OpeNITHM.sch index d37bf5b..530a4d3 100644 --- a/Circuit-Teensy/OpeNITHM.sch +++ b/Circuit-Teensy/OpeNITHM.sch @@ -116,7 +116,7 @@ L Device:R R20 U 1 1 5C729DF3 P 1900 6250 F 0 "R20" H 1750 6300 50 0000 C CNN -F 1 "10k" H 1750 6200 50 0000 C CNN +F 1 "51k" H 1750 6200 50 0000 C CNN F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal" V 1830 6250 50 0001 C CNN F 3 "~" H 1900 6250 50 0001 C CNN 1 1900 6250 @@ -294,7 +294,7 @@ L Device:R R21 U 1 1 5C7370DB P 2350 6250 F 0 "R21" H 2200 6300 50 0000 C CNN -F 1 "10k" H 2200 6200 50 0000 C CNN +F 1 "51k" H 2200 6200 50 0000 C CNN F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal" V 2280 6250 50 0001 C CNN F 3 "~" H 2350 6250 50 0001 C CNN 1 2350 6250 @@ -305,7 +305,7 @@ L Device:R R22 U 1 1 5C737141 P 2800 6250 F 0 "R22" H 2650 6300 50 0000 C CNN -F 1 "10k" H 2650 6200 50 0000 C CNN +F 1 "51k" H 2650 6200 50 0000 C CNN F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal" V 2730 6250 50 0001 C CNN F 3 "~" H 2800 6250 50 0001 C CNN 1 2800 6250 @@ -316,7 +316,7 @@ L Device:R R23 U 1 1 5C7371B3 P 3250 6250 F 0 "R23" H 3100 6300 50 0000 C CNN -F 1 "10k" H 3100 6200 50 0000 C CNN +F 1 "51k" H 3100 6200 50 0000 C CNN F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal" V 3180 6250 50 0001 C CNN F 3 "~" H 3250 6250 50 0001 C CNN 1 3250 6250 @@ -327,7 +327,7 @@ L Device:R R24 U 1 1 5C737282 P 3700 6250 F 0 "R24" H 3550 6300 50 0000 C CNN -F 1 "10k" H 3550 6200 50 0000 C CNN +F 1 "51k" H 3550 6200 50 0000 C CNN F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal" V 3630 6250 50 0001 C CNN F 3 "~" H 3700 6250 50 0001 C CNN 1 3700 6250 @@ -338,7 +338,7 @@ L Device:R R25 U 1 1 5C737302 P 4150 6250 F 0 "R25" H 4000 6300 50 0000 C CNN -F 1 "10k" H 4000 6200 50 0000 C CNN +F 1 "51k" H 4000 6200 50 0000 C CNN F 2 "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P5.08mm_Horizontal" V 4080 6250 50 0001 C CNN F 3 "~" H 4150 6250 50 0001 C CNN 1 4150 6250 @@ -1370,23 +1370,23 @@ Wire Notes Line rgb(194, 0, 0) 1100 1800 1100 1650 Text Notes 800 1650 0 39 ~ 0 RGB lighting -Wire Notes Line rgb(181, 36, 194) +Wire Notes Line rgb(181, 36, 0) 1500 1900 1000 1900 -Wire Notes Line rgb(181, 36, 194) +Wire Notes Line rgb(181, 36, 0) 1000 1850 1000 1900 Wire Notes Line rgb(194, 0, 0) 1100 1800 1500 1800 Text Notes 800 1850 0 39 ~ 0 IR LEDs -Wire Notes Line rgb(181, 36, 194) +Wire Notes Line rgb(181, 36, 0) 3450 1800 2950 1800 -Wire Notes Line rgb(181, 36, 194) +Wire Notes Line rgb(181, 36, 0) 2950 1750 2950 1800 Text Notes 2750 1750 0 39 ~ 0 IR LEDs -Wire Notes Line rgb(181, 36, 194) +Wire Notes Line rgb(181, 36, 0) 3450 2300 3300 2300 -Wire Notes Line rgb(181, 36, 194) +Wire Notes Line rgb(181, 36, 0) 3300 2300 3300 1800 Wire Notes Line rgb(194, 0, 0) 5050 1350 5050 1300 diff --git a/Circuit-Teensy/OpeNITHM_Teensy_Schematic.pdf b/Circuit-Teensy/OpeNITHM_Teensy_Schematic.pdf index 48cf331..c168d01 100644 Binary files a/Circuit-Teensy/OpeNITHM_Teensy_Schematic.pdf and b/Circuit-Teensy/OpeNITHM_Teensy_Schematic.pdf differ diff --git a/Firmware/OpeNITHM/Config.h b/Firmware/OpeNITHM/Config.h index 08ad9be..b3239f0 100644 --- a/Firmware/OpeNITHM/Config.h +++ b/Firmware/OpeNITHM/Config.h @@ -26,8 +26,12 @@ // Uncomment this line if your LED lights are mirrored //#define LED_REVERSE -// Uncomment this line to output the RAW touch values to the Serial port (for use with Arduino's Serial Plotter) +// *** FOR CALIBRATING AND DEBUGGING + +// Uncomment this line to output the touch values to the Serial port (for use with Arduino's Serial Plotter) //#define SERIAL_PLOT +// Uncomment this line if you want RAW touch values (vs. normalized) +//#define SERIAL_RAW_VALUE // Define PLOT_PIN as -1 to print all key's values, otherwise define as 0-15 for an individual key #define PLOT_PIN -1 diff --git a/Firmware/OpeNITHM/OpeNITHM.ino b/Firmware/OpeNITHM/OpeNITHM.ino index 202e450..568c91d 100644 --- a/Firmware/OpeNITHM/OpeNITHM.ino +++ b/Firmware/OpeNITHM/OpeNITHM.ino @@ -219,7 +219,7 @@ void setup() { // Set LEDS to red prior to intialize for (CRGB& led : leds) { - led = CRGB::Orange; + led = CRGB::Red; FastLED.show(); } @@ -316,9 +316,16 @@ void loop() { { for (int i = 0; i < 16; i++) { +#ifdef SERIAL_RAW_VALUES + // Print values Serial.print(touchboard->getRawValue(i)); +#else + // Print normalized values + Serial.print(touchboard->getRawValue(i) - touchboard->getNeutralValue(i)); +#endif Serial.print("\t"); } + Serial.print(touchboard->getDeadzone()); Serial.println(); } else