Case work, bugfixes

adapter.cpp

@@ -108,6 +108,7 @@ void VailAdapter::HandleMIDI(midiEventPacket_t event) {
             this->keyer->Release();
         }
         this->keyer = GetKeyerByNumber(event.byte2, this);
+        this->keyer->SetDitDuration(this->ditDuration);
         break;
     case 0x80: // Note off
         this->buzzer->NoTone(1);

keyers.cpp

@@ -66,7 +66,7 @@ public:
         this->ditDuration = 100;
     }
 
-    void SetDitDuration(int duration) {
+    void SetDitDuration(unsigned int duration) {
         this->ditDuration = duration;
     }
 

keyers.h

@@ -18,7 +18,7 @@ class Keyer {
 public:
     virtual void SetOutput(Transmitter *output);
     virtual void Reset();
-    virtual void SetDitDuration(int d);
+    virtual void SetDitDuration(unsigned int d);
     virtual void Release();
     virtual bool TxClosed();
     virtual bool TxClosed(int relay);

polybuzzer.cpp

@@ -16,8 +16,8 @@ void PolyBuzzer::update() {
             if (playing != tones[i]) {
                 playing = tones[i];
                 tone(this->pin, tones[i]);
-                return;
             }
+            return;
         }
     }
     this->playing = 0;

touchbounce.cpp

@@ -1,11 +1,11 @@
 #include "touchbounce.h"
 
 void TouchBounce::attach(int pin) {
-    this->qt = Adafruit_FreeTouch(pin, OVERSAMPLE_2, RESISTOR_50K, FREQ_MODE_NONE);
+    this->qt = Adafruit_FreeTouch(pin, OVERSAMPLE_2, RESISTOR_0, FREQ_MODE_SPREAD);
     this->qt.begin();
 }
 
 bool TouchBounce::readCurrentState() {
     int val = this->qt.measure();
-    return val > QT_THRESHOLD/2;
+    return val > QT_THRESHOLD;
 }

touchbounce.h

@@ -3,7 +3,7 @@
 #include <Adafruit_FreeTouch.h>
 #include "bounce2.h"
 
-#define QT_THRESHOLD 850
+#define QT_THRESHOLD 450
 
 class TouchBounce: public Bounce {
 public:

vail-adapter.ino

@@ -22,7 +22,7 @@
 
 #define DIT_KEYBOARD_KEY KEY_LEFT_CTRL
 #define DAH_KEYBOARD_KEY KEY_RIGHT_CTRL
-#define TONE 550
+#define TONE 3000
 
 #define MILLISECOND 1
 #define SECOND (1 * MILLISECOND)