Allow for 12 buttons + command (#77)

k3ng_keyer/src/buttonarray/buttonarray.h

@@ -1,8 +1,9 @@
 #ifndef buttonarray_h
 #define buttonarray_h
 #include "Arduino.h"
-
-#define MAX_BUTTONS 8
+#ifndef MAX_ARRAY_BUTTONS
+    #define MAX_ARRAY_BUTTONS 13
+#endif
 #define DEBOUNCE_MS 200
 
 #if defined(ARDUINO_ARCH_ESP32)
@@ -30,7 +31,7 @@ class Button {
 
 class ButtonArray {
     private:
-        Button button_array_[MAX_BUTTONS];
+        Button button_array_[MAX_ARRAY_BUTTONS];
         uint8_t pin_;
         uint8_t nb_buttons_;
         int32_t high_limit_;

src/buttonarray/buttonarray.cpp

@@ -1,116 +0,0 @@
-#include "arduino.h"
-#include "buttonarray.h"
-
-Button::InitLimits(uint8_t step){
-
-    int32_t button_value;
-    int32_t lower_button_value;
-    int32_t higher_button_value;
-
-    button_value = uint32_t(max_value * (float(step * r2_value)/float((step * r2_value) + r1_value)));
-    lower_button_value = uint32_t(max_value * (float((step-1) * r2_value)/float(((step-1) * r2_value) + r1_value)));
-    higher_button_value = uint32_t(max_value * (float((step+1) * r2_value)/float(((step+1) * r2_value) + r1_value)));
-    low_limit_= (button_value - ((button_value - lower_button_value)/2));
-    high_limit_= (button_value + ((higher_button_value - button_value)/2));
-    step_ = step;
-}
-
-bool Button::Pressed(int32_t analog_reading)
-{
-    if ((analog_reading > low_limit_) && (analog_reading <=  high_limit_)) {
-        return true;
-    } 
-    return false;
-}
-int32_t Button::high_limit()
-{
-    return high_limit_;
-}
-
-int32_t Button::low_limit()
-{
-    return low_limit_;
-}
-
-// Add all buttons in incremental order
-ButtonArray::AddAll()
-{
-    for(size_t i = 0; i < nb_buttons_; i++)
-    {
-        ButtonArray::Add(i, i);
-    }
-}
-
-
-// Adds a single button to the array
-// Takes a step (rank in the resistor ladder), and the index in the button array.
-ButtonArray::Add(uint8_t step, uint8_t index){
-    Button button;
-    button.init_limits(step);
-    button_array_[index] = button;
-    if (button.high_limit() > high_limit_) {
-        high_limit_ = button.high_limit();
-    }
-}
-
-int32_t ButtonArray::high_limit(){
-    return high_limit_;
-}
-
-int8_t ButtonArray::ReadButtons(){
-    uint32_t analog_read_temp =0;
-    uint32_t analog_line_read_average=0;
-
-    for (byte x = 0; x < 19; x++){
-        analog_read_temp = analogRead(pin_);
-        if (analog_read_temp <= high_limit_){
-            analog_line_read_average = (analog_line_read_average + analog_read_temp) / 2;
-        }
-    }
-    for (size_t x = 0; x < nb_buttons_; x++) {
-        Button button = button_array_[x];
-        if (button.Pressed(analog_line_read_average)) {
-            last_pressed_ms = millis();
-            return x;
-        }
-    }
-    return -1;
-}
-// returns the index of the pressed button or -1 if none pressed
-int8_t ButtonArray::Pressed() 
-{
-    if ((analogRead(pin_) <= high_limit_) && ((millis() - last_pressed_ms) > DEBOUNCE_MS )){
-        return ReadButtons();
-    }
-    return -1;
-}
-// returns true if button at the provided index is pressed
-bool ButtonArray::Pressed(uint8_t index) 
-{
-    uint32_t analog_read_temp =0;
-    analog_read_temp = analogRead(pin_);
-    if (analog_read_temp <= high_limit_) && ( index < nb_buttons_)) {
-        Button button = button_array_[index];
-        return button.Pressed(analog_read_temp)
-    }
-    return false;
-}
-// Return true as long as the indicated button is held and the deadline not reached.
-bool ButtonArray::Held(uint8_t index, uint32_t deadline) 
-{
-    if ((analogRead(pin_) <= high_limit_) && 
-    (millis() < deadline) && 
-    (ReadButtons() == index)) {
-        return true;
-    }
-    return false;
-}
-
-// Return true as long as the indicated button is held
-bool ButtonArray::Held(uint8_t index) 
-{
-    if ((analogRead(pin_) <= high_limit_) && (ReadButtons() == index)) {
-        return true;
-    }
-    return false;
-}

src/buttonarray/buttonarray.h

@@ -1,50 +0,0 @@
-#ifndef buttonarray_h
-#define buttonarray_h
-#include "Arduino.h"
-
-#define MAX_BUTTONS 8
-#define DEBOUNCE_MS 200
-
-#if defined(ARDUINO_ARCH_ESP32)
-    #define max_value 4095
-#else
-    #define max_value 1023
-#endif
-
-#define r1_value 10
-#define r2_value 1
-
-class Button {
-    private:
-        int32_t low_limit_;
-        int32_t high_limit_;
-        uint8_t step_;
-    public:
-        Button(){};
-        InitLimits(uint8_t step);
-        bool Pressed(int32_t analog_reading);
-        int32_t high_limit();
-        int32_t low_limit();
-};
-
-class ButtonArray {
-    private:
-        Button button_array_[MAX_BUTTONS];
-        uint8_t pin_;
-        uint8_t nb_buttons_;
-        int32_t high_limit_;
-        int8_t ReadButtons();
-
-    public:
-        uint32_t last_pressed_ms;
-        ButtonArray(uint8_t pin, uint8_t nb): pin_(pin), nb_buttons_(nb){};
-        AddAll();
-        Add(uint8_t step, uint8_t index);
-        int32_t high_limit();
-        int8_t Pressed();
-        bool Pressed(uint8_t index);
-        bool Held(uint8_t index, uint32_t deadline );
-};
-
-
-#endif