Sensor with class

src/config.h

@@ -0,0 +1,18 @@
+/**
+ * Configuration file for the entire project.
+ * Define and change all constant variables here!
+*/
+#pragma once
+
+// Connection for CS pin on ADC breakout board
+#define CS_PIN 17 
+
+// Change these constants according to your project's design
+const float VCC = 5;			// Voltage that the sensors are connected to
+const float R_DIV = 100000.0;	// Resistor used to create a voltage divider
+
+// Number of samples for the median filter
+const int SAMPLES = 20;
+
+// Pin to the push button that turns the controller on
+#define INTERUPT_PIN 16

src/main.cpp

@@ -1,45 +1,37 @@
 #include <Arduino.h>
-#include <readFingers.h>
-#include <talkyBoi.h>
-
-#define interuptPin 17
+#include "TalkyBoi.h"
 
 // Pin connected to voltage divider output. used for analogRead to get resistance of the flexsensors
-const int thumbIP_Pin = 36;
-const int thumbMCP_Pin = 39;
-const int f1PIP_Pin = 32;			
-const int f1MCP_Pin = 33;			
-const int f2PIP_Pin = 34;
-const int f2MCP_Pin = 35;
-const int f3PIP_Pin = ads1118.AIN_2;
-const int f3MCP_Pin = ads1118.AIN_3;
-const int f4PIP_Pin = ads1118.AIN_0;
-const int f4MCP_Pin = ads1118.AIN_1;
+const uint8_t thumbIP_Pin = ads1118.AIN_0;
+const uint8_t thumbMCP_Pin = ads1118.AIN_1;
+const uint8_t f1PIP_Pin = ads1118.AIN_2;			
+const uint8_t f1MCP_Pin = ads1118.AIN_3;			
+const int f2PIP_Pin = 36;
+const int f2MCP_Pin = 39;
+const int f3PIP_Pin = 32;
+const int f3MCP_Pin = 33;
+const int f4PIP_Pin = 34;
+const int f4MCP_Pin = 35;
 const int pinList[] = {thumbIP_Pin, thumbMCP_Pin, f1PIP_Pin, f1MCP_Pin, f2PIP_Pin, f2MCP_Pin, f3PIP_Pin, f3MCP_Pin, f4PIP_Pin, f4MCP_Pin};
 const int sizeList = sizeof(pinList)/sizeof(int);
 float fingerAngles[10] = {0,0,0,0,0,0,0,0,0,0};
 int sendID = 0;
-int o = 0;
 
 int buttonRun = 0;
 int state = 0;
 
+/**
+ * Initiates the ADC breakout board.
+*/
 void initBoard(){
     ads1118.begin();    // Initialize board
     ads1118.setSamplingRate(ads1118.RATE_860SPS);   // highest sampling rate possible
     ads1118.setFullScaleRange(ads1118.FSR_4096);    // 12 bit
 }
 
-void initAnalogPin(){
-    pinMode(thumbIP_Pin, INPUT);  // change later!
-    pinMode(thumbMCP_Pin, INPUT);
-    pinMode(f1PIP_Pin, INPUT);
-    pinMode(f1MCP_Pin, INPUT);
-    pinMode(f2PIP_Pin, INPUT);
-    pinMode(f2MCP_Pin, INPUT);  
-
-}
-
+/**
+ * Toggles the state of the microcontroller.
+*/
 void interuptFunc(){
   static unsigned long last_interuptTime = 0;
   unsigned long interupt_time = millis();
@@ -56,43 +48,22 @@ void interuptFunc(){
 }
 
 
-
 void setup() {
   Serial.begin(115200);
   delay(100);
-  getMACAdress();                          //MAC adress är vad som körs för att WIFI ska funkar, den ANDRA bärands MAC adress ska skrivas in i denna koden och tvärtom.
+  getMACAdress();                          //MAC adress is run for the WIFI to work, the OTHER wearers MAC adress shall be written in this code and vice versa.
   init_wifi();                             // Initiate ESP_NOW
-  initBoard();                             // Initiate breakout board 
-  initAnalogPin();                                               
-  // attachInterrupt(17, interuptFunc, HIGH); // interupt för start/stopp knapp
+  initBoard();                             // Initiate breakout board                  
+  //attachInterrupt(17, interuptFunc, HIGH); // interupt for start/stop button
 }
 
 void loop() {
-  //while(!state){}                                             //Ta bort kommentar för att ha en knapp som låser/öppnar programmet när det körs. Behöver en  debounce för knappen innan det funkar.
-
-  for(int i = 0; i<sizeList; i++){                              //Läser alla sensorer och lägger i en lista
-    fingerAngles[i] = readResistance(pinList[i], i);
-    Serial.println(String(i) + ": " + String(fingerAngles[i]));
-  }
-<<<<<<< HEAD
-=======
-  Serial.println();
-  // Serial.println(String(getAngle(ads1118.AIN_0, 3)));
-
->>>>>>> de77f9514885061b4545c7e60c6282d2ad28d74c
+  /*
   sendID++;
 
   send(sendID, fingerAngles[0], fingerAngles[1], fingerAngles[2], fingerAngles[3], fingerAngles[4], fingerAngles[5], fingerAngles[6], fingerAngles[7], fingerAngles[8], fingerAngles[9]);
-<<<<<<< HEAD
-
-  sendToModel(o,1.0,1.0);
-  o++;
-  delay(1000);
-
-=======
-  delay(10);
-  delay(10);
->>>>>>> de77f9514885061b4545c7e60c6282d2ad28d74c
+  */
+  delay(100);
 }