lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Cronixie functions for dates

Browse Source 
Updated binaries
This commit is contained in:
cschwinne 2017-12-20 00:39:55 +01:00
parent 17b2578974
commit a3b3ddf930
5 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/wled05dev_1712152_CRONIXIE_dont_use_for_regular_led_strip.bin → bin/wled05dev_1712200_CRONIXIE_dont_use_for_regular_strip.bin
View File

Binary file not shown.

BIN
bin/wled05dev_1712200_RGB.bin Normal file
View File

Binary file not shown.

BIN
bin/wled05dev_1712200_RGBW.bin Normal file
View File

Binary file not shown.

8
wled00/wled00.ino
View File

@ -25,7 +25,7 @@
#include "WS2812FX.h" #include "WS2812FX.h"
//version in format yymmddb (b = daily build) //version in format yymmddb (b = daily build)
#define VERSION 1712192 #define VERSION 1712200
//AP and OTA default passwords (change them!) //AP and OTA default passwords (change them!)
String appass = "wled1234"; String appass = "wled1234";
@ -34,10 +34,10 @@ String otapass = "wledota";
//If you have an RGBW strip, uncomment first line in WS2812FX.h! //If you have an RGBW strip, uncomment first line in WS2812FX.h!
//overlays, needed for clocks etc. //overlays, needed for clocks etc.
//#define USEOVERLAYS #define USEOVERLAYS
//support for the CRONIXIE clock by Diamex //support for the CRONIXIE clock by Diamex
#define CRONIXIE //#define CRONIXIE
//spiffs FS only useful for debug //spiffs FS only useful for debug
//#define USEFS //#define USEFS
@ -74,7 +74,7 @@ unsigned long cronixieRefreshedTime;
byte dP[]{0,0,0,0,0,0}; byte dP[]{0,0,0,0,0,0};
bool cronixieUseAMPM = false; bool cronixieUseAMPM = false;
bool cronixieBacklight = true; bool cronixieBacklight = true;
boolean ntpEnabled = true; bool ntpEnabled = true;
#endif #endif
//Default CONFIG //Default CONFIG

38
wled00/wled13_cronixie.ino
View File

@ -90,8 +90,8 @@ void setCronixie(char const digits[])
dP[i] = 10; dP[i] = 10;
switch (digits[i]) switch (digits[i])
{ {
case '_': dP[i] = 10; case '_': dP[i] = 10; break;
case '-': dP[i] = 11; case '-': dP[i] = 11; break;
case 'r': dP[i] = random(1,7); break; //random btw. 1-6 case 'r': dP[i] = random(1,7); break; //random btw. 1-6
case 'R': dP[i] = random(0,10); break; //random btw. 0-9 case 'R': dP[i] = random(0,10); break; //random btw. 0-9
case 't': break; //Test upw. case 't': break; //Test upw.
@ -106,14 +106,14 @@ void setCronixie(char const digits[])
case 'M': dP[i] = 24 + getSameCodeLength('M',i,digits); i = i+dP[i]-24; break; case 'M': dP[i] = 24 + getSameCodeLength('M',i,digits); i = i+dP[i]-24; break;
case 's': dP[i] = 80 + getSameCodeLength('s',i,digits); i = i+dP[i]-80; cronixieRefreshMs = 497; break; //refresh more often bc. of secs case 's': dP[i] = 80 + getSameCodeLength('s',i,digits); i = i+dP[i]-80; cronixieRefreshMs = 497; break; //refresh more often bc. of secs
case 'S': dP[i] = 30 + getSameCodeLength('S',i,digits); i = i+dP[i]-30; cronixieRefreshMs = 497; break; case 'S': dP[i] = 30 + getSameCodeLength('S',i,digits); i = i+dP[i]-30; cronixieRefreshMs = 497; break;
case 'Y': break; case 'Y': dP[i] = 36 + getSameCodeLength('Y',i,digits); i = i+dP[i]-36; break;
case 'y': break; case 'y': dP[i] = 86 + getSameCodeLength('y',i,digits); i = i+dP[i]-86; break;
case 'I': break; //Month. Don't ask me why month and minute both start with M. case 'I': dP[i] = 39 + getSameCodeLength('I',i,digits); i = i+dP[i]-39; break; //Month. Don't ask me why month and minute both start with M.
case 'i': break; case 'i': dP[i] = 89 + getSameCodeLength('i',i,digits); i = i+dP[i]-89; break;
case 'W': break; case 'W': break;
case 'w': break; case 'w': break;
case 'D': break; case 'D': dP[i] = 43 + getSameCodeLength('D',i,digits); i = i+dP[i]-43; break;
case 'd': break; case 'd': dP[i] = 93 + getSameCodeLength('d',i,digits); i = i+dP[i]-93; break;
case '0': dP[i] = 0; break; case '0': dP[i] = 0; break;
case '1': dP[i] = 1; break; case '1': dP[i] = 1; break;
case '2': dP[i] = 2; break; case '2': dP[i] = 2; break;
@ -151,7 +151,11 @@ void handleCronixie()
uint8_t s = second(local); uint8_t s = second(local);
uint8_t d = day(local); uint8_t d = day(local);
uint8_t mi = month(local); uint8_t mi = month(local);
uint16_t y = year(local); int y = year(local);
uint8_t woy =
//this has to be changed in time for 22nd century
y -= 2000; if (y<0) y = 99;
if (cronixieUseAMPM) if (cronixieUseAMPM)
{ {
if (h>12) h-=12; if (h>12) h-=12;
@ -173,6 +177,13 @@ void handleCronixie()
case 20: _digitOut[i] = h- (h/10)*10; break; //H case 20: _digitOut[i] = h- (h/10)*10; break; //H
case 24: _digitOut[i] = m/10; break; //M case 24: _digitOut[i] = m/10; break; //M
case 30: _digitOut[i] = s/10; break; //S case 30: _digitOut[i] = s/10; break; //S
case 43: _digitOut[i] = weekday(local); _digitOut[i]--; if (_digitOut[i]<1) _digitOut[i]= 7; break; //D
case 44: _digitOut[i] = d/10; _digitOut[i+1] = d- _digitOut[i]*10; i++; break; //DD
case 40: _digitOut[i] = mi/10; _digitOut[i+1] = mi- _digitOut[i]*10; i++; break; //II
case 37: _digitOut[i] = y/10; _digitOut[i+1] = y- _digitOut[i]*10; i++; break; //YY
case 39: _digitOut[i] = 2; _digitOut[i+1] = 0; _digitOut[i+2] = y/10; _digitOut[i+3] = y- _digitOut[i+2]*10; i+=3; break; //YYYY
case 16: _digitOut[i+2] = ((h0/3)&1)?1:0; i++; //BBB (BBBB NI) case 16: _digitOut[i+2] = ((h0/3)&1)?1:0; i++; //BBB (BBBB NI)
case 15: _digitOut[i+1] = (h0>17 || (h0>5 && h0<12))?1:0; i++; //BB case 15: _digitOut[i+1] = (h0>17 || (h0>5 && h0<12))?1:0; i++; //BB
case 14: _digitOut[i] = (h0>11)?1:0; break; //B case 14: _digitOut[i] = (h0>11)?1:0; break; //B
@ -184,6 +195,15 @@ void handleCronixie()
case 71: _digitOut[i] = h/10; _digitOut[i+1] = h- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //hh case 71: _digitOut[i] = h/10; _digitOut[i+1] = h- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //hh
case 75: _digitOut[i] = m/10; _digitOut[i+1] = m- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //mm case 75: _digitOut[i] = m/10; _digitOut[i+1] = m- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //mm
case 81: _digitOut[i] = s/10; _digitOut[i+1] = s- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //ss case 81: _digitOut[i] = s/10; _digitOut[i+1] = s- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //ss
case 66: _digitOut[i+2] = ((h0/3)&1)?1:10; i++; //bbb (bbbb NI)
case 65: _digitOut[i+1] = (h0>17 || (h0>5 && h0<12))?1:10; i++; //bb
case 64: _digitOut[i] = (h0>11)?1:10; break; //b
case 93: _digitOut[i] = weekday(local); _digitOut[i]--; if (_digitOut[i]<1) _digitOut[i]= 7; break; //d
case 94: _digitOut[i] = d/10; _digitOut[i+1] = d- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //dd
case 90: _digitOut[i] = mi/10; _digitOut[i+1] = mi- _digitOut[i]*10; if(_digitOut[i] == 0) _digitOut[i]=10; i++; break; //ii
case 87: _digitOut[i] = y/10; _digitOut[i+1] = y- _digitOut[i]*10; i++; break; //yy
case 89: _digitOut[i] = 2; _digitOut[i+1] = 0; _digitOut[i+2] = y/10; _digitOut[i+3] = y- _digitOut[i+2]*10; i+=3; break; //yyyy
} }
} }
} }