coelner/LED-Clock
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

real SK6812 hardware support

Browse Source
This commit is contained in:
coelner 2020-09-27 08:29:14 +02:00
parent d72706d4ed
commit 6776269b8a
1 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
60LED_WS2812B_NTP_Clock.ino
View File

@ -1,20 +1,37 @@
#include <WiFi.h>
#include "time.h"
#include <FastLED.h>
#include <NeoPixelBrightnessBus.h>
#include <IotWebConf.h>
#define MOD(a,b) ((((a)%(b))+(b))%(b))
// LDR (GL5516 ) is connected to GPIO 34 (Analog ADC1_CH6, 12bit resolution default
// Light Resistance (at 10 Lux): 5-10 Kohm
// Dark Resistance: 0.5 Mohm
// over a 56k voltage divider . Dark (0.5MOhm) , 10Lux (5-10kOhm)
const int ldrPin = 34;
#define LDR_PIN A6
// How many leds in your strip?
#define MINIMAL_BRIGHTNESS 5
#define colorSaturation 128
#define MINIMAL_BRIGHTNESS 2
#define NUM_LEDS 60
#define COLOR_ORDER GRB
#define DATA_PIN 5
#define DATA_PIN 17
#define SERIAL_BAUD 9600
// Define the array of leds
CRGB leds[NUM_LEDS];
NeoPixelBrightnessBus<NeoGrbwFeature, Neo800KbpsMethod> strip(NUM_LEDS, DATA_PIN);
//NeoPixelBus<NeoGrbFeature, Neo800KbpsMethod> strip(NUM_LEDS, DATA_PIN);
//NeoPixelBus<NeoRgbFeature, Neo400KbpsMethod> strip(NUM_LEDS, DATA_PIN);
RgbwColor red(colorSaturation, 0, 0, 0);
RgbwColor green(0, colorSaturation, 0, 0);
RgbwColor blue(0, 0, colorSaturation, 0);
RgbwColor white(colorSaturation);
RgbwColor black(0);
RgbwColor unknown(30, 48, 40, 0); //darkish dirt
RgbwColor gold(HtmlColor( 0xFFD700 ) );
RgbwColor orangered(HtmlColor( 0xFF4500 ) );
RgbwColor orange(HtmlColor( 0xFFA500 ) );
volatile signed int interruptCounter;
@ -60,8 +77,7 @@ IotWebConfSeparator separator1 = IotWebConfSeparator("LED settings");
IotWebConfParameter brightnessParam = IotWebConfParameter("BRIGHTNESS", "brightness", brightnessParamValue, NUMBER_LEN, "number", "10..254", "100", "min='10' max='254' step='1'");
void printLocalTime()
{
void printLocalTime() {
if (!getLocalTime(&timeinfo)) {
Serial.println("Failed to obtain time");
return;
@ -72,8 +88,7 @@ void printLocalTime()
/**
Handle web requests to "/" path.
*/
void handleRoot()
{
void handleRoot() {
// -- Let IotWebConf test and handle captive portal requests.
if (iotWebConf.handleCaptivePortal())
{
@ -159,37 +174,41 @@ void syncNTP() {
}
}
void setup()
{
void setup() {
//interrupt for one second@80Mhz!
timer = timerBegin(0, 80, true);
timerAttachInterrupt(timer, &onTimer, true);
timerAlarmWrite(timer, 1000000, true);
timerAlarmEnable(timer);
pinMode(LDR_PIN, INPUT);
pinMode(DATA_PIN, OUTPUT);
Serial.begin(SERIAL_BAUD);
FastLED.addLeds<WS2812B, DATA_PIN, GRB>(leds, NUM_LEDS);
FastLED.setBrightness(50);
FastLED.clear();
strip.Begin();
strip.Show();
//currentSec = 40; currentMin = 1; currentHour = 2;
iotWebConf_Setup();
//syncNTP();
}
void brightnessSet() {
int BRIGHTNESS = atoi(brightnessParamValue);
int x;
if (ldrValue == 0) {
FastLED.setBrightness( BRIGHTNESS );
strip.SetBrightness( BRIGHTNESS );
}
else {
x = int(MINIMAL_BRIGHTNESS + ( (BRIGHTNESS - MINIMAL_BRIGHTNESS) / (ldrValue/32) + 1) );
FastLED.setBrightness( x );
x = int(MINIMAL_BRIGHTNESS + ( (BRIGHTNESS - MINIMAL_BRIGHTNESS) / (ldrValue / 64) + 1) );
if (strip.GetBrightness() != x) {
strip.SetBrightness( x );
}
}
Serial.println("Brightness: " + String( x ) + "(" + String(ldrValue) + ")");
ldrValue = 0;
}
void loop()
@ -203,9 +222,10 @@ void loop()
interruptCounter--;
currentSec--;
portEXIT_CRITICAL(&timerMux);
//brigthness measurement
ldrValue = (ldrValue + analogRead(ldrPin)) / 2;
ldrValue = (ldrValue + analogRead(LDR_PIN)) / 2;
//Serial.println(ldrValue);
if (currentSec < 0) {
currentSec = 59;
currentMin--;
@ -225,32 +245,32 @@ void loop()
}
//reset color
leds[(currentSec + 1) % NUM_LEDS] = CRGB(30, 48, 40);
leds[(currentMin + 1) % NUM_LEDS] = CRGB(30, 48, 40);
leds[((currentHour + 1) * 5 - 1) % NUM_LEDS] = CRGB(30, 48, 40);
leds[((currentHour + 1) * 5 + 1) % NUM_LEDS] = CRGB(30, 48, 40);
strip.SetPixelColor((currentSec + 1) % NUM_LEDS, white);
strip.SetPixelColor((currentMin + 1) % NUM_LEDS, white);
strip.SetPixelColor(((currentHour + 1) * 5 - 1) % NUM_LEDS, white);
strip.SetPixelColor(((currentHour + 1) * 5 + 1) % NUM_LEDS, white);
//1 dot hour marking
for (int dot = 0; dot < NUM_LEDS; dot++) {
if (dot % 5 == 0) {
leds[dot] = CRGB::OrangeRed;
strip.SetPixelColor(dot, orangered);
}
}
//3 dots hour
if (currentHour == 0) {
leds[59 % NUM_LEDS] = CRGB::Gold;
strip.SetPixelColor(59 % NUM_LEDS, gold);
}
else {
leds[(currentHour * 5 - 1) % NUM_LEDS] = CRGB::Gold;
strip.SetPixelColor((currentHour * 5 - 1) % NUM_LEDS, gold);
}
leds[(currentHour * 5) % NUM_LEDS] = CRGB::Gold;
leds[(currentHour * 5 + 1) % NUM_LEDS] = CRGB::Gold;
strip.SetPixelColor((currentHour * 5) % NUM_LEDS, gold);
strip.SetPixelColor((currentHour * 5 + 1) % NUM_LEDS, gold);
leds[0] = CRGB::Blue; //define high noon
//leds[NUM_LEDS / 2] = CRGB::Green; //define half noon
strip.SetPixelColor(0, blue); //define high noon
//strip.SetPixelColor(NUM_LEDS / 2, CRGB::Green; //define half noon
leds[(currentSec + 0) % NUM_LEDS] = CRGB::Black;
leds[(currentMin + 0) % NUM_LEDS] = CRGB::Orange;
FastLED.show();
strip.SetPixelColor((currentSec + 0) % NUM_LEDS, black);
strip.SetPixelColor((currentMin + 0) % NUM_LEDS, orange);
strip.Show();
}
}