Refactoring how board control works

2024-08-22 18:17:35 -04:00
parent a29ccbd2c8
commit 48f83eee38
7 changed files with 278 additions and 49 deletions
--- a/lib/BoardReader/BoardDriver.h
+++ b/lib/BoardReader/BoardDriver.h
@@ -0,0 +1,115 @@
+#pragma once
+
+#include <cstdint>
+#include <array>
+
+#include <Adafruit_NeoPixel.h>
+
+#include "Cube.h"
+
+namespace BoardDriverTypes{
+    struct CubeStack{
+        uint8_t adcPin;
+        uint8_t ledPin;
+    }
+};
+
+template <uint32_t NUM_STACKS>
+class BoardDriver{
+public:
+
+    BoardDriver(std::array<BoardDriverTypes::CubeStack, NUM_STACKS> &stacks, Adafruit_NeoPixel &pixelController);
+    ~BoardDriver() = default;
+
+    uint32_t GetNumberCubes(uint32_t numXStacks, uint32_t X_COORD, uint32_t Y_COORD);
+    uint32_t GetNumberCubes(uint32_t stackIndex);
+
+    void UpdateStackLEDs(uint32_t numXStacks, uint32_t X_COORD, uint32_t Y_COORD, Cube cubes[], uint32_t numCubes);
+    void UpdateStackLEDs(uint32_t stackIndex, Cube cubes[], uint32_t numCubes);
+
+
+private:
+    std::array<CubeStack, NUM_STACKS> &stacks;
+    Adafruit_NeoPixel &pixelController;
+    std::array<uint16_t, NUM_STACKS> filteredReadings;
+
+    uint32_t xy2StackIndex(uint32_t x_coord, uint32_t y_coord, uint32_t numXStacks){
+        return X_COORD + Y_COORD*numXStacks;
+    }
+};
+
+template<uint32_t NUM_STACKS>
+BoardDriver<NUM_STACKS>::BoardDriver(std::array<BoardDriverTypes::CubeStack, NUM_STACKS> &stacks, Adafruit_NeoPixel &pixelController): 
+stacks(stacks),
+pixelController(pixelController)
+{
+    for(uint32_t i = 0; i < NUM_STACKS; i++){
+        this->filteredReadings[i] = 0;
+        pinMode(this->stacks[i].ledPin, OUTPUT);
+    }
+
+    // begin doesn't really do anything besides setting the pinmode
+    this->pixelController.begin();
+}
+
+template<uint32_t NUM_STACKS>
+void BoardDriver<NUM_STACKS>::UpdateStackLEDs(uint32_t numXStacks, uint32_t X_COORD, uint32_t Y_COORD, Cube cubes[], uint32_t numCubes){
+    this->UpdateStackLEDs(this->xy2StackIndex(X_COORD, Y_COORD, numXStacks), cubes, numCubes);
+}
+
+template<uint32_t NUM_STACKS>
+void BoardDriver<NUM_STACKS>::UpdateStackLEDs(uint32_t stackIndex, Cube cubes[], uint32_t numCubes){
+    this->pixelController.setPin(this->stacks[stackIndex].ledPin);
+    for(int i = 0; i < numCubes; i++){
+        Color color{cubes[i].color};
+        this->pixelController.setPixelColor(i*2, this->pixelController.Color(color.red, color.green, color.blue));
+        this->pixelController.setPixelColor((i*2 + 1), this->pixelController.Color(color.red, color.green, color.blue));
+    }
+    this->pixelController.show();
+}
+
+template<uint32_t NUM_STACKS>
+uint32_t BoardDriver<NUM_STACKS>::GetNumberCubes(uint32_t numXStacks, uint32_t X_COORD, uint32_t Y_COORD){
+    return this->GetNumberCubes(this->xy2StackIndex(x_coord, y_coord, numXStacks));
+}
+
+template<uint32_t NUM_STACKS>
+uint32_t BoardDriver<NUM_STACKS>::GetNumberCubes(uint32_t stackIndex){
+    // read the ADC and return the number of cubes
+    /*
+    0 cubes: 1 : 4095-3400
+    1 cube: 1/2 3400-2500
+    2 cubes: 1/3 2500-1850
+    3 cubes: 1/4 1850-0
+    */
+    uint16_t value = analogRead(cube.ADCPin);
+    uint16_t lowPassADCRead = 
+        static_cast<uint16_t>(
+            (static_cast<float>(this->filteredReadings[stackIndex]) * 0.9)
+             + (static_cast<float>(value) * 0.1)
+            );
+
+    // temporary definitions to define value ranges:
+    uint16_t zeroCubesHigh = 4095;
+    uint16_t zeroCubesLow = 3400;
+    uint16_t oneCubeLow = 2500;
+    uint16_t twoCubesLow = 1850;
+    uint16_t threeCubesLow = 0;
+
+    uint8_t stackHeight = 0;
+
+    if(lowPassADCRead >= zeroCubesLow && lowPassADCRead <= zeroCubesHigh){
+        stackHeight = 0;
+    }
+    else if(lowPassADCRead >= oneCubeLow){
+        stackHeight = 1;
+    }
+    else if(lowPassADCRead >= twoCubesLow){
+        stackHeight = 2;
+    }
+    else if(lowPassADCRead >= threeCubesLow){
+        stackHeight = 3;
+    }
+    
+    return stackHeight;
+}