include/effect_big_clock.h

@@ -6,12 +6,10 @@ class BigClockEffect : public Effect {
 private:
 	CRGB _color_font = CRGB(0xAAAAAA);
     CRGB _color_seconds_light = CRGB(0xFFFF00);
-    CRGB _color_seconds_dark = CRGB(0xAA0000);
+    CRGB _color_seconds_dark = CRGB(0xFF0000);
-	CRGB _color_seconds_moving_light = CRGB(0x666600);
-    CRGB _color_seconds_moving_dark = CRGB(0x660000);
 
     void _draw_seconds();
-    void _draw_border_pixel(accum88 pos, CRGB* color);
+    void _draw_border_pixel(uint8_t second, uint8_t part, CRGB* color);
 
 public:
     void loop(uint16_t ms);

include/settings.h

@@ -32,10 +32,6 @@ struct Settings {
 			uint16_t random_count = 32;
 		} matrix;
 
-		struct /* big_clock */ {
-			uint16_t spacing = 5;
-		} big_clock;
-
 		struct /* confetti */ {
 			uint16_t pixels_per_loop = 2;
 		} confetti;
@@ -79,7 +75,7 @@ struct Settings {
 			uint16_t direction_change = 5;
 			uint16_t slowdown = 2;
 		} snake;
-
+		
 		struct /* tv_static */ {
 			uint16_t black_bar_speed = 3500;
 		} tv_static;

src/effect_big_clock.cpp

@@ -2,7 +2,6 @@
 #include "effect_big_clock.h"
 #include "fonts.h"
 #include "ntp.h"
-#include "settings.h"
 
 void BigClockEffect::loop(uint16_t ms) {
     window->clear();
@@ -26,35 +25,35 @@ void BigClockEffect::loop(uint16_t ms) {
 void BigClockEffect::_draw_seconds() {
 	uint8_t seconds = ntpClient.getSeconds();
 	for (int i=1; i<=seconds; i++) {
-		_draw_border_pixel(i<<8, (i%5==0) ? &_color_seconds_light : &_color_seconds_dark);
+		_draw_border_pixel(i, 0, (i%5==0) ? &_color_seconds_light : &_color_seconds_dark);
 	}
 
 	uint16_t millis = ntpClient.getEpochMillis() % 1000;
-	accum88 pos = (seconds<<8) + ((settings.effects.big_clock.spacing-1)<<8) * (1000 - millis) / 1000 + (1<<8);
+	uint8_t offset = 5 - (millis / 200);
-    uint8_t sec = seconds + 1;
+	uint8_t part = 255 - ((millis % 200) * 256 / 200);
-    while (pos < (60<<8)) {
+	uint8_t number_to_show = (60 - seconds - offset) / 5 + 1;
-		_draw_border_pixel(pos, sec%5==0 ? &_color_seconds_moving_light : &_color_seconds_moving_dark);
+	for(uint8_t i = 0; i<number_to_show; i++) {
-        pos += settings.effects.big_clock.spacing<<8;
+		uint8_t pos = seconds + offset + i*5;
-        sec++;
+		_draw_border_pixel(pos, part, (seconds + i + 1)%5==0 ? &_color_seconds_light : &_color_seconds_dark);
 	}
 }
 
-void BigClockEffect::_draw_border_pixel(accum88 i, CRGB* color) {
+void BigClockEffect::_draw_border_pixel(uint8_t i, uint8_t part, CRGB* color) {
 	accum88 x, y;
-	if (i<(8<<8)) {
+	if (i<=8) {
-		x = i + (7<<8);
+		x = ((7+i)<<8) + part;
 		y = 0;
-	} else if (i<(23<<8)) {
+	} else if (i<=23) {
 		x = 15<<8;
-		y = i - (8<<8);
+		y = ((i-8)<<8) + part;
-	} else if (i<(38<<8)) {
+	} else if (i<=38) {
-		x = (38<<8) - i;
+		x = ((38-i)<<8) - part;
 		y = 15<<8;
-	} else if (i<(53<<8)) {
+	} else if (i<=53) {
 		x = 0;
-		y = (53<<8) - i;
+		y = ((53-i)<<8) - part;
-	} else if (i<=(60<<8)) {
+	} else if (i<=60) {
-		x = i - (53<<8);
+		x = ((i-53)<<8) + part;
 		y = 0;
 	} else {
 		return;

src/effect_twirl.cpp

@@ -2,7 +2,7 @@
 #include "functions.h"
 
 boolean TwirlEffect::can_be_shown_with_clock() { return true; };
-boolean TwirlEffect::clock_as_mask() { return false; };
+boolean TwirlEffect::clock_as_mask() { return true; };
 
 void TwirlEffect::loop(uint16_t ms) {
 	double center_x = _real_center_x; // - (cos8(_center_offset_angle)>>6);

src/http_server.cpp

@@ -63,7 +63,7 @@ void http_server_setup() {
 			Setting s = all_settings[i];
 			uint16_t default_value = setting_default(&s);
 			uint16_t value = *(s.value);
-
+			
 			message += "<tr><td>";
 			if (default_value != value) {
 				message += "<strong>";
@@ -155,30 +155,11 @@ void http_server_setup() {
 		for (int i=0; i<effects_size; i++) {
 			message += "<tr><td>";
 			message += effects[i].name;
-			message += "</td><td><form method='post' action='/effects'><input type='hidden' name='name' value='";
+			message += "</td></tr>";
-			message += effects[i].name;
-			message += "'><input type='hidden' name='redir' value='1'><input type='submit' value='Select'></form></td></tr>";
 		}
 		message += "</table></body></html>";
 		http_server.send(200, "text/html", message);
 	});
-	http_server.on("/effects", HTTP_POST, [&]() {
-		if (!http_server.hasArg("name")) {
-			http_server.send(400, "text/plain", "Missing argument 'name'.");
-			return;
-		}
-		String name = http_server.arg("name");
-		if (change_current_effect(name)) {
-			if (http_server.hasArg("redir")) {
-				http_server.sendHeader("Location", "/effects");
-				http_server.send(301);
-			} else {
-				http_server.send(200, "text/plain", "OK");
-			}
-		} else {
-			http_server.send(404, "text/plain", "Effect not found.");
-		}
-	});
 	http_server.on("/delete", HTTP_GET, [&]() {
 		LOGln("HTTP * GET /delete");
 		if (http_server.args()==0) {

src/settings.cpp

@@ -7,8 +7,6 @@ Settings settings;
 Setting all_settings[] = {
 	{"fps", &settings.fps, TYPE_UINT8},
 
-	{"effects.big_clock.spacing", &settings.effects.big_clock.spacing, TYPE_UINT8},
-
 	{"effects.confetti.pixels_per_loop", &settings.effects.confetti.pixels_per_loop, TYPE_UINT8},
 
 	{"effects.cycle.random", &settings.effects.cycle.random, TYPE_BOOL},
@@ -45,11 +43,11 @@ Setting all_settings[] = {
 	{"effects.sines.count", &settings.effects.sines.count, TYPE_UINT8},
 
 	{"effects.snake.direction_change", &settings.effects.snake.direction_change, TYPE_UINT8},
-
+	
 	{"effects.tv_static.black_bar_speed", &settings.effects.tv_static.black_bar_speed, TYPE_UINT16},
 };
 
-const uint8_t all_settings_size = 30;
+const uint8_t all_settings_size = 29;
 
 bool change_setting(const char* key, uint16_t new_value) {
 	LOGln("Settings * Setting %s to new value %d.", key, new_value);
@@ -95,13 +93,13 @@ bool save_settings() {
 		LOGln("Settings * Could not open SPIFFS for saving.");
 		return false;
 	}
-
+	
 	File f = SPIFFS.open("/pitrix_settings.txt", "w");
 	if (!f) {
 		LOGln("Settings * Could not open /pitrix_settings.txt for writing.");
 		return false;
 	}
-
+	
 	Setting* s;
 	for (uint8_t i=0; i<all_settings_size; i++) {
 		s = &(all_settings[i]);
@@ -114,7 +112,7 @@ bool save_settings() {
 			f.println(buf);
 		}
 	}
-
+	
 	f.close();
 	return true;
 }
@@ -124,16 +122,16 @@ bool load_settings() {
 		LOGln("Settings * Could not open SPIFFS for loading.");
 		return false;
 	}
-
+	
 	File f = SPIFFS.open("/pitrix_settings.txt", "r");
 	if (!f) {
 		LOGln("Settings * Could not open /pitrix_settings.txt for reading.");
 		return false;
 	}
-
+	
 	String s = f.readString();
 	f.close();
-
+	
 	while (s.length() > 0) {
 		int pos = s.lastIndexOf('\n');
 		String part = s.substring(pos + 1);