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

More reorganisation

Browse source
This commit is contained in:
Robert Marshall 2019-03-03 08:58:19 +00:00
parent 905ea49dc7
commit 1513e5af70
2 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.vscode/arduino.json vendored
View file

@ -1,5 +1,5 @@
{ {
"port": "/dev/ttyUSB1", "port": "/dev/ttyUSB0",
"board": "esp8266:esp8266:d1_mini", "board": "esp8266:esp8266:d1_mini",
"configuration": "CpuFrequency=80,FlashSize=4M1M,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,UploadSpeed=921600", "configuration": "CpuFrequency=80,FlashSize=4M1M,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,UploadSpeed=921600",
"sketch": "monitor.ino" "sketch": "monitor.ino"

55
monitor.ino
View file

@ -1,39 +1,53 @@
#include<FastLED.h> /*-----------------+
#include <time.h> | Network settings |
+-----------------*/
#include "Networking.h"
#include "sensors.h"
#include "NaturalLight.h"
#include "Weather.h"
#define HOSTNAME "72L_Aquarium" #define HOSTNAME "72L_Aquarium"
#define MQTT_SERVER "192.168.1.3" #define NETWORK_NAME "GCHQ Surveillance Van"
#define SSID "GCHQ Surveillance Van"
#define PASSWORD "cocklol." #define PASSWORD "cocklol."
#define MQTT_SERVER "192.168.1.3"
#define BASE_TOPIC "/home/sensors/" HOSTNAME /*------------------+
#define PH_TOPIC BASE_TOPIC "/ph" | Lighting settings |
#define TEMPERATURE_TOPIC BASE_TOPIC "/temperature" +------------------*/
#define LED_USE_STRIP #define LED_USE_STRIP
#define LED_COUNT 41 #define LED_COUNT 41
#define LED_USE_PWM #define LED_USE_PWM
#define CLOUD_COVER_LIMIT 50.0 // percent;
/*----------------+
| Pin allocations |
+----------------*/
#define TEMPERATURE_PIN D5 #define TEMPERATURE_PIN D5
#define WHITE_PIN D2 #define WHITE_PIN D2
#define RGB_PIN D3 #define RGB_PIN D3
#define R_PIN D8 #define R_PIN D8
#define G_PIN D7 #define G_PIN D7
#define B_PIN D6 #define B_PIN D6
#define SCL_PIN D1
#define SDA_PIN D4
/*---------------------------+
| Location and time settings |
+---------------------------*/
#define LATITUDE "20.548103" #define LATITUDE "20.548103"
#define LONGITUDE "96.916835" #define LONGITUDE "96.916835"
#define TIMEZONE_OFFSET 30600 // 8.5 hours in seconds #define TIMEZONE_OFFSET 30600 // 8.5 hours in seconds
#define NTP_POOL "uk.pool.ntp.org"
/*============================================================================================================================*/
#include <FastLED.h>
#include <time.h>
#include "Networking.h"
#include "sensors.h"
#include "NaturalLight.h"
#include "Weather.h"
#define BASE_TOPIC "/home/sensors/" HOSTNAME
#define PH_TOPIC BASE_TOPIC "/ph"
#define TEMPERATURE_TOPIC BASE_TOPIC "/temperature"
#define LIGHT_INDEX_TOPIC BASE_TOPIC "/lightindex" #define LIGHT_INDEX_TOPIC BASE_TOPIC "/lightindex"
#define BRIGHTNESS_TOPIC BASE_TOPIC "/brightness" #define BRIGHTNESS_TOPIC BASE_TOPIC "/brightness"
#define CLOUD_COVER_LIMIT 50.0 // percent;
#define NTP_POOL "uk.pool.ntp.org"
/*----------------------------------------------------------+ /*----------------------------------------------------------+
| Need this here until I figure out why I can't instantiate | | Need this here until I figure out why I can't instantiate |
@ -42,15 +56,14 @@
#include <OneWire.h> #include <OneWire.h>
#include <DallasTemperature.h> #include <DallasTemperature.h>
OneWire oneWire(TEMPERATURE_PIN); OneWire oneWire(TEMPERATURE_PIN);
DallasTemperature sensors(&oneWire); DallasTemperature temperatureSensor(&oneWire);
Networking _networking = Networking(HOSTNAME, SSID, PASSWORD ,MQTT_SERVER); Networking _networking = Networking(HOSTNAME, NETWORK_NAME, PASSWORD ,MQTT_SERVER);
Sensors _sensors = Sensors(TEMPERATURE_PIN, TEMPERATURE_TOPIC, PH_TOPIC, &_networking, &sensors); Sensors _sensors = Sensors(TEMPERATURE_PIN, TEMPERATURE_TOPIC, PH_TOPIC, &_networking, &temperatureSensor);
NaturalLight _naturalLight = NaturalLight(LATITUDE, LONGITUDE, TIMEZONE_OFFSET); NaturalLight _naturalLight = NaturalLight(LATITUDE, LONGITUDE, TIMEZONE_OFFSET);
Weather _weather = Weather(LATITUDE, LONGITUDE); Weather _weather = Weather(LATITUDE, LONGITUDE);
Lighting _lighting = Lighting(&_naturalLight, &_weather, CLOUD_COVER_LIMIT); Lighting _lighting = Lighting(&_naturalLight, &_weather, CLOUD_COVER_LIMIT);
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);