Rollback homekita
This commit is contained in:
@@ -5,9 +5,6 @@
|
||||
#include "DHT.h"
|
||||
#include <Adafruit_NeoPixel.h>
|
||||
#include <BH1750.h>
|
||||
#include "HomeSpan.h"
|
||||
#include "DEV_LED.h"
|
||||
|
||||
#define Version "0.3.3"
|
||||
|
||||
|
||||
@@ -181,7 +178,7 @@ uint32_t Wheel(byte pos) {
|
||||
}
|
||||
|
||||
void setup() {
|
||||
Serial.begin(115200);
|
||||
Serial.begin(9600);
|
||||
if (!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
|
||||
Serial.println(F("SSD1306 allocation failed"));
|
||||
}
|
||||
@@ -225,31 +222,7 @@ void setup() {
|
||||
} else {
|
||||
dimmVal = 24;
|
||||
}
|
||||
// ##### HOME SPAN
|
||||
homeSpan.setPairingCode("11122333");
|
||||
homeSpan.setQRID("111-22-333");
|
||||
// konfiguracja WIFI przez port szerefowy "W<returm"
|
||||
// 1.Płytka ESP32 Dev Module
|
||||
// 2 Partycja: Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
|
||||
// 3. konfiguracja WIFI przez port szerefowy komenda "W", U - unpair
|
||||
homeSpan.begin(Category::Bridges,"HomeSpan Bridge");
|
||||
|
||||
new SpanAccessory();
|
||||
new Service::AccessoryInformation();
|
||||
new Characteristic::Identify();
|
||||
|
||||
new SpanAccessory();
|
||||
new Service::AccessoryInformation();
|
||||
new Characteristic::Identify();
|
||||
new Characteristic::Name("RGB LED");
|
||||
new DEV_RgbLED();
|
||||
// ##### HOME SPAN END
|
||||
} //setup end
|
||||
|
||||
void loop() {
|
||||
neoPixelRed = int(RedHomeKit/10);
|
||||
neoPixelGreen = int(GreenHomeKit/10);
|
||||
neoPixelBlue = int(BlueHomeKit/10);
|
||||
// ###################################################
|
||||
// WYŚWIETLACZ
|
||||
display.clearDisplay();
|
||||
@@ -374,7 +347,7 @@ void loop() {
|
||||
dimmVal = 24;
|
||||
}
|
||||
|
||||
// Ustawianie LED docelowych wartości
|
||||
// Ustawianie LED docelowych wartości
|
||||
if (hygrostatVal >= 65) {
|
||||
neoPixelLvl_1 = 1;
|
||||
neoPixelLvl_2 = 1;
|
||||
@@ -420,21 +393,21 @@ void loop() {
|
||||
neoPixelLvl_5 = 1;
|
||||
}
|
||||
|
||||
// Ustawianie LED osiągniętych wartości
|
||||
if (hum >= 65 && hygrostatVal >= 65 ) {
|
||||
// Ustawianie LED osiągniętych wartości
|
||||
if (hum >= 65 && hygrostatVal >= 65) {
|
||||
neoPixelLvl_5 = 8;
|
||||
}
|
||||
if (hum >= 60 && hygrostatVal >= 60) {
|
||||
neoPixelLvl_4 = 8;
|
||||
neoPixelLvl_4 = 8;
|
||||
}
|
||||
if (hum >= 55 && hygrostatVal >= 55) {
|
||||
neoPixelLvl_3 = 8;
|
||||
neoPixelLvl_3 = 8;
|
||||
}
|
||||
if (hum >= 50 && hygrostatVal >= 50) {
|
||||
neoPixelLvl_2 = 8;
|
||||
if (hum >= 50 && hygrostatVal >= 50) {
|
||||
neoPixelLvl_2 = 8;
|
||||
}
|
||||
if (hum >= 45 && hygrostatVal >= 45) {
|
||||
neoPixelLvl_1 = 8;
|
||||
neoPixelLvl_1 = 8;
|
||||
}
|
||||
|
||||
// wartości zależne od sposobu zasilania PC/Powerbank/Ładowarka
|
||||
@@ -479,6 +452,7 @@ void loop() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
//NEOPIXELS
|
||||
// #################################################################
|
||||
// #################################################################
|
||||
@@ -487,28 +461,13 @@ void loop() {
|
||||
pixels.setPixelColor(ADR_NEOPXL_SPEED_1, pixels.Color(int((neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelSpeed_1) / NON_ACTIVE_LED_DIVIDER), int((neoPixelRed * dimmVal * neoPixelSwitch * neoPixelSpeed_1) / NON_ACTIVE_LED_DIVIDER), int((neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelSpeed_1) / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_SPEED_2, pixels.Color(int((neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelSpeed_2) / NON_ACTIVE_LED_DIVIDER), int((neoPixelRed * dimmVal * neoPixelSwitch * neoPixelSpeed_2) / NON_ACTIVE_LED_DIVIDER), int((neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelSpeed_2) / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_FILTER, pixels.Color(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelFilter, neoPixelRed * dimmVal * neoPixelSwitch * neoPixelFilter, neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelFilter));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L1, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_1/ NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_1/ NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_1 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L2, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_2/ NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_2/ NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_2 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L3, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_3/ NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_3/ NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_3 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L4, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_4/ NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_4/ NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_4 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L5, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_5/ NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_5/ NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_5 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L1, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_1 / NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_1 / NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_1 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L2, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_2 / NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_2 / NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_2 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L3, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_3 / NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_3 / NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_3 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L4, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_4 / NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_4 / NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_4 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_L5, pixels.Color(int(neoPixelGreen * dimmVal * neoPixelSwitch * neoPixelLvl_5 / NON_ACTIVE_LED_DIVIDER), int(neoPixelRed * dimmVal * neoPixelSwitch * neoPixelLvl_5 / NON_ACTIVE_LED_DIVIDER), int(neoPixelBlue * dimmVal * neoPixelSwitch * neoPixelLvl_5 / NON_ACTIVE_LED_DIVIDER)));
|
||||
pixels.setPixelColor(ADR_NEOPXL_WATERLVL, pixels.Color(dimmVal * neoPixelSwitch * neoPixelWaterLvlG, dimmVal * neoPixelSwitch * neoPixelWaterLvlR, dimmVal * neoPixelSwitch * neoPixelWaterLvlB));
|
||||
// pixels.setPixelColor(ADR_NEOPXL_TANK, pixels.Color(neoPixelGreen*dimmVal*neoPixelSwitch*neoPixelTank, neoPixelRed*dimmVal*neoPixelSwitch*neoPixelTank, neoPixelBlue*dimmVal*neoPixelSwitch*neoPixelTank));
|
||||
pixels.show();
|
||||
// rainbowCycle(10); // im mniejsza liczba, tym szybsza animacja
|
||||
|
||||
homeSpan.poll();
|
||||
Serial.println("---------------------------");
|
||||
Serial.print("R: ");
|
||||
Serial.println(RedHomeKit);
|
||||
Serial.print("G: ");
|
||||
Serial.println(GreenHomeKit);
|
||||
Serial.print("B: ");
|
||||
Serial.println(BlueHomeKit);
|
||||
Serial.print("turnOnFlag: ");
|
||||
Serial.println(turnOnFlag);
|
||||
|
||||
|
||||
delay(500);
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user