rob/fishtankmonitor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

We don't use a pH sensor

Browse source
This commit is contained in:
Robert Marshall 2023-09-12 14:13:10 +01:00
parent 9e65fbb47e
commit 43855cadba
4 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.vscode/c_cpp_properties.json vendored
View file

@ -12,12 +12,10 @@
"/home/rob/Code/FishTankMonitor/src",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/Wire",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/PubSubClient/src",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/DallasTemperature",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/OneWire",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/Adafruit ADS1X15",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/Adafruit BusIO",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/Wire",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/FastLED/src",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/SPI",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/SoftwareSerial/src",
@ -66,12 +64,10 @@
"/home/rob/Code/FishTankMonitor/src",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266HTTPClient/src",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/ESP8266WiFi/src",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/Wire",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/PubSubClient/src",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/DallasTemperature",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/OneWire",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/Adafruit ADS1X15",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/Adafruit BusIO",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/Wire",
"/home/rob/Code/FishTankMonitor/.pio/libdeps/d1_mini_lite/FastLED/src",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/SPI",
"/home/rob/.platformio/packages/framework-arduinoespressif8266/libraries/SoftwareSerial/src",

2
platformio.ini
View file

@ -16,7 +16,7 @@ framework = arduino
lib_deps =
ArduinoJson
FastLED
adafruit/Adafruit ADS1X15
; adafruit/Adafruit ADS1X15
; adafruit/Adafruit SSD1306
OneWire
DallasTemperature

40
src/Sensors.cpp
View file

@ -11,26 +11,26 @@ Sensors::Sensors(int temperaturePin, Networking* networking, DallasTemperature*
void Sensors::setup() {
pinMode(_temperaturePin, INPUT_PULLUP);
_ds18b20->begin();
_ads.setGain(GAIN_TWOTHIRDS);
_ads.begin();
// _ads.setGain(GAIN_TWOTHIRDS);
// _ads.begin();
}
float Sensors::readpH() {
int sum = 0;
const int readCount = 10;
// float Sensors::readpH() {
// int sum = 0;
// const int readCount = 10;
for (int i = 0; i < readCount; i++) {
sum += _ads.readADC_SingleEnded(0);
delay(10);
}
// for (int i = 0; i < readCount; i++) {
// sum += _ads.readADC_SingleEnded(0);
// delay(10);
// }
float averageRead = float(sum) / readCount;
// float averageRead = float(sum) / readCount;
float voltage = 6.144 / 32768.0 * averageRead;
voltage -= VOLTAGE_OFFSET;
float pH = 7 - ((PH_7_VOLTAGE - voltage) / _pHStep);
return pH;
}
// float voltage = 6.144 / 32768.0 * averageRead;
// voltage -= VOLTAGE_OFFSET;
// float pH = 7 - ((PH_7_VOLTAGE - voltage) / _pHStep);
// return pH;
// }
const String Sensors::getTemperature(){
_ds18b20->requestTemperatures();
@ -46,8 +46,8 @@ const String Sensors::getTemperature(){
return String(temperature, 2);
}
const char* Sensors::getpH() {
float pH = readpH();
String pHString(pH, 2);
return pHString.c_str();
}
// const char* Sensors::getpH() {
// float pH = readpH();
// String pHString(pH, 2);
// return pHString.c_str();
// }

8
src/Sensors.h
View file

@ -1,7 +1,7 @@
#ifndef Sensors_h
#define Sensors_h
#include <Wire.h>
#include <Adafruit_ADS1X15.h>
// #include <Adafruit_ADS1X15.h>
#include <OneWire.h>
#include <DallasTemperature.h>
#include <PubSubClient.h>
@ -14,15 +14,15 @@
class Sensors {
int _temperaturePin;
float _pHStep = (PH_7_VOLTAGE - PH_4_VOLTAGE) / 3;
Adafruit_ADS1115 _ads;
// Adafruit_ADS1115 _ads;
DallasTemperature* _ds18b20;
Networking *_networking;
public:
Sensors(int temperaturePin, Networking *networking, DallasTemperature* ds18b20);
void setup();
float readpH();
const char* getpH();
// float readpH();
// const char* getpH();
const String getTemperature();
};
#endif