From e37b1120ff1ff9f457839a19c711e6c82db90bbc Mon Sep 17 00:00:00 2001
From: willem <willem@oldemans.nl>
Date: Sun, 28 Nov 2021 12:19:21 +0100
Subject: [PATCH] Add ADS1X15 code

---
 FW/leo_muziekdoos_esp32/src/audio.cpp  |  2 +-
 FW/leo_muziekdoos_esp32/src/board.h    |  9 ++++++---
 FW/leo_muziekdoos_esp32/src/main.cpp   |  6 ++++--
 FW/leo_muziekdoos_esp32/src/sensor.cpp | 24 ++++++++++++++++++++++++
 FW/leo_muziekdoos_esp32/src/sensor.h   | 10 ++++++++++
 5 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 FW/leo_muziekdoos_esp32/src/sensor.cpp
 create mode 100644 FW/leo_muziekdoos_esp32/src/sensor.h

diff --git a/FW/leo_muziekdoos_esp32/src/audio.cpp b/FW/leo_muziekdoos_esp32/src/audio.cpp
index 62877f0..29d28dd 100644
--- a/FW/leo_muziekdoos_esp32/src/audio.cpp
+++ b/FW/leo_muziekdoos_esp32/src/audio.cpp
@@ -74,7 +74,7 @@ void initAudio()
   mp3 = new AudioGeneratorMP3();
   mp3->RegisterStatusCB(StatusCallback, (void *)"mp3");
   Serial.println("init Audio Done");
-  //playSong(audio_current_Song);
+  playSong(audio_current_Song);
 }
 
 void handleAudio()
diff --git a/FW/leo_muziekdoos_esp32/src/board.h b/FW/leo_muziekdoos_esp32/src/board.h
index e519f7f..98ec49f 100644
--- a/FW/leo_muziekdoos_esp32/src/board.h
+++ b/FW/leo_muziekdoos_esp32/src/board.h
@@ -18,10 +18,13 @@
 
 #define PWR_HOLD     4
 #define PWR_BTN      5
-#define MEAS_EN     12
-#define MEAS_ADC    35  //ADC1_CH7
+#define MEAS_EN     22
 
-#define HALL_INPUT  36  //ADC1_CH0
+#define I2C_SDA     33
+#define I2C_SCL     32
+#define MEAS_ADC    1  //ADC1_CH7
+
+#define HALL_INPUT  0  //ADC1_CH0
 #endif
 
 #if HARDWARE == 1
diff --git a/FW/leo_muziekdoos_esp32/src/main.cpp b/FW/leo_muziekdoos_esp32/src/main.cpp
index 47511cb..2d6cd18 100644
--- a/FW/leo_muziekdoos_esp32/src/main.cpp
+++ b/FW/leo_muziekdoos_esp32/src/main.cpp
@@ -5,6 +5,7 @@
 #include "storage.h"
 #include "audio.h"
 #include "rfid.h"
+#include "sensor.h"
 #include "config.h"
 #include "ota.h"
 #include "game.h"
@@ -20,7 +21,7 @@ void setup()
   //initOta();
   initAudio();
   initRfid();
-  
+  initSensor();
   initGame();
 
 }
@@ -30,7 +31,8 @@ void loop()
   debugHandle();
 
   handleAudio();
-  //handleRfid();
+  handleRfid();
+  handleSensor
   //handleGame();
   handlePower();
   //handleOta();
diff --git a/FW/leo_muziekdoos_esp32/src/sensor.cpp b/FW/leo_muziekdoos_esp32/src/sensor.cpp
new file mode 100644
index 0000000..edfbe92
--- /dev/null
+++ b/FW/leo_muziekdoos_esp32/src/sensor.cpp
@@ -0,0 +1,24 @@
+#include "sensor.h"
+
+ADS1115 ADS(0x48);
+uint32_t lastADS = 0;
+
+uint16_t BatterySensor = 0;
+uint16_t HallSensor = 0;
+
+
+void initSensor(void)
+{
+  ADS.begin(I2C_SDA, I2C_SCL);
+}
+
+void handleSensor(void)
+{
+  uint32_t timeNow = millis();
+  if(lastADS - timeNow > SENSORINTERVAL)
+  {
+    HallSensor = ADS.readADC(HALL_INPUT);
+    BatterySensor = ADS.readADC(MEAS_ADC);
+    Serial.printf("Read sensor: Hall=%d, vbatt=%d",HallSensor, BatterySensor);
+  }
+}
\ No newline at end of file
diff --git a/FW/leo_muziekdoos_esp32/src/sensor.h b/FW/leo_muziekdoos_esp32/src/sensor.h
new file mode 100644
index 0000000..b27bffa
--- /dev/null
+++ b/FW/leo_muziekdoos_esp32/src/sensor.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "ADS1X15.h"
+#include "board.h"
+
+#define SENSORINTERVAL 250
+
+
+void initSensor(void);
+void handleSensor(void);
\ No newline at end of file