From acb7b8c741e0108da226363443703f1d92360ef3 Mon Sep 17 00:00:00 2001 From: Hendrik Langer Date: Mon, 10 Apr 2017 14:23:03 +0200 Subject: [PATCH] serial debug output --- README.md | 3 +-- src/keyboard.cpp | 40 ++++++++++------------------------------ src/main.cpp | 9 ++++++++- 3 files changed, 19 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 48af0fd..88a347b 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,7 @@ cd soundboard virtualenv . source bin/activate pip install -U platformio -platformio run -platformio run -t upload +platformio run -t upload && platformio device monitor -b 115200 ``` ## ToDo diff --git a/src/keyboard.cpp b/src/keyboard.cpp index 6cd69e1..5854155 100644 --- a/src/keyboard.cpp +++ b/src/keyboard.cpp @@ -7,54 +7,34 @@ Keyboard::Keyboard() { } void gotTouch0() { - delay(10); - if (touchRead(T0) < threshold[0]) - touchDetected[0] = true; + touchDetected[0] = true; } void gotTouch1() { - delay(10); - if (touchRead(T1) < threshold[1]) - touchDetected[1] = true; + touchDetected[1] = true; } void gotTouch2() { - delay(10); - if (touchRead(T2) < threshold[2]) - touchDetected[2] = true; + touchDetected[2] = true; } void gotTouch3() { - delay(10); - if (touchRead(T3) < threshold[3]) - touchDetected[3] = true; + touchDetected[3] = true; } void gotTouch4() { - delay(10); - if (touchRead(T4) < threshold[4]) - touchDetected[4] = true; + touchDetected[4] = true; } void gotTouch5() { - delay(10); - if (touchRead(T5) < threshold[5]) - touchDetected[5] = true; + touchDetected[5] = true; } void gotTouch6() { - delay(10); - if (touchRead(T6) < threshold[6]) - touchDetected[6] = true; + touchDetected[6] = true; } void gotTouch7() { - delay(10); - if (touchRead(T7) < threshold[7]) - touchDetected[7] = true; + touchDetected[7] = true; } void gotTouch8() { - delay(10); - if (touchRead(T8) < threshold[8]) - touchDetected[8] = true; + touchDetected[8] = true; } void gotTouch9() { - delay(10); - if (touchRead(T9) < threshold[9]) - touchDetected[9] = true; + touchDetected[9] = true; } bool Keyboard::getTouchDetected(uint8_t pad) { diff --git a/src/main.cpp b/src/main.cpp index bbb79ed..ff09727 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -9,6 +9,7 @@ #include "keyboard.h" +#define VERSION "0.0" #define LED_PIN 21 Keyboard keyboard; @@ -18,12 +19,18 @@ void setup() // initialize LED digital pin as an output. pinMode(LED_PIN, OUTPUT); keyboard.init(); + Serial.begin(115200); + Serial.println("-------------------------------------"); + Serial.print("Soundboard v."); + Serial.println(VERSION); + Serial.println("https://dev.xd0.de/hendrik/soundboard"); + Serial.println("-------------------------------------"); } void loop() { bool touched = false; - for(int i; i<=9; i++) { + for(int i=0; i<=9; i++) { if (keyboard.getTouchDetected(i) == true) { touched = true; }