v3 of code, implementing new color pulse mode

MZandtheRaspberryPi · MZandtheRaspberryPi · commit 71b9ef7c0e86 · 2024-09-21T09:23:20.000+01:00
diff --git a/code/lib/constants.py b/code/lib/constants.py
@@ -36,3 +36,25 @@
 COLOR_B_FORM_KEY = "b"
 COLOR_UPPER_BOUND = 255
 COLOR_LOWER_BOUND = 0
+
+RED_COLOR_KEY = "red_color"
+RED_COLOR = (255, 0, 0)
+ORANGE_COLOR_KEY = "orange_color"
+ORANGE_COLOR = (255, 40, 0)
+YELLOW_COLOR_KEY = "yellow_color"
+YELLOW_COLOR = (255, 160, 0)
+GREEN_COLOR_KEY = "green_color"
+GREEN_COLOR = (0, 255, 0)
+BLUE_COLOR_KEY = "blue_color"
+BLUE_COLOR = (0, 0, 255)
+PURPLE_COLOR_KEY = "purple_color"
+PURPLE_COLOR = (255, 0, 255)
+COLOR_PULSE_INTERVAL_KEY = "color_pulse_interval"
+COLOR_PULSE_INTERVAL_MINIMUM = 0
+COLOR_PULSE_INTERVAL_MAXIMUM = 20
+PRESET_COLORS = {RED_COLOR_KEY: RED_COLOR, ORANGE_COLOR_KEY: ORANGE_COLOR,
+                 YELLOW_COLOR_KEY: YELLOW_COLOR, GREEN_COLOR_KEY: GREEN_COLOR,
+                 BLUE_COLOR_KEY: BLUE_COLOR, PURPLE_COLOR_KEY: PURPLE_COLOR}
+PULSE_BRIGHTNESS_PERCENT_KEY = "pulse_brightness_percent"
+PULSE_BRIGHTNESS_PCT_MINIMUM = 0
+PULSE_BRIGHTNESS_PCT_MAXIMUM = 1
diff --git a/code/lib/crystal_ball.py b/code/lib/crystal_ball.py
@@ -39,7 +39,23 @@
                        COLOR_B_FORM_KEY,
                        COLOR_UPPER_BOUND,
                        COLOR_LOWER_BOUND,
-                       ORDER)
+                       ORDER,
+                       PRESET_COLORS,
+                       COLOR_PULSE_INTERVAL_KEY,
+                       PULSE_BRIGHTNESS_PERCENT_KEY,
+                       COLOR_PULSE_INTERVAL_MINIMUM,
+                       COLOR_PULSE_INTERVAL_MAXIMUM,
+                       PULSE_BRIGHTNESS_PCT_MINIMUM,
+                       PULSE_BRIGHTNESS_PCT_MAXIMUM,
+                       TARGET_LOOP_RATE,
+                       RED_COLOR_KEY,
+                       ORANGE_COLOR_KEY,
+                       YELLOW_COLOR_KEY,
+                       GREEN_COLOR_KEY,
+                       BLUE_COLOR_KEY,
+                       BLUE_COLOR,
+                       PURPLE_COLOR_KEY)
+
 from util import setup_wifi, bound_number
 
 
@@ -56,6 +72,22 @@ def __init__(self):
         self.color_g = 0
         self.color_b = 255
         self.battery_level = -1
+        self.color_pulse_interval = 0
+        self.color_pulse_counter = 0
+        # if we want one cycle in 1 second
+        # and we are looping at 60HZ
+        # we will have a max counter of 60
+        self.color_pulse_max_counter = TARGET_LOOP_RATE * self.color_pulse_interval
+        self.color_pulse_brightness_pct = 0.5
+        self.color_pulse_brightness_min = self.color_pulse_brightness_pct * self.brightness
+        # 0.5 * 0.5 = 0.25
+        # 0.5 - 0.25 = 0.25
+        # 0.25 / 30 = 0.008333
+        if self.color_pulse_interval != 0:
+            self.color_pulse_brightness_increment = (self.brightness - self.color_pulse_brightness_min) / (self.color_pulse_max_counter/2)
+        else:
+            self.color_pulse_brightness_increment = 0
+        self.color_pulse_adjusted_brightness = self.brightness
 
         self.inbuilt_neopixel = digitalio.DigitalInOut(INBUILT_NEOPIXEL_PIN)
         self.inbuilt_neopixel.direction = digitalio.Direction.OUTPUT
@@ -84,7 +116,24 @@ def __init__(self):
         except OSError:
             time.sleep(5)
             print("restarting..")
-            microcontroller.reset()  
+            microcontroller.reset()
+    
+    def recalc_color_pulse_helpers(self):
+        # once the self.color_pulse_interval is updated or self.color_pulse_brightness_pct is updated, we need to re-calc
+        self.color_pulse_counter = 0
+        # if we want one cycle in 1 second
+        # and we are looping at 60HZ
+        # we will have a max counter of 60
+        self.color_pulse_max_counter = TARGET_LOOP_RATE * self.color_pulse_interval
+        self.color_pulse_brightness_min = self.color_pulse_brightness_pct * self.brightness
+        # 0.5 * 0.5 = 0.25
+        # 0.5 - 0.25 = 0.25
+        # 0.25 / 30 = 0.008333
+        if self.color_pulse_interval != 0:
+            self.color_pulse_brightness_increment = (self.brightness - self.color_pulse_brightness_min) / (self.color_pulse_max_counter/2)
+        else:
+            self.color_pulse_brightness_increment = 0
+        self.color_pulse_adjusted_brightness = self.brightness
     
     def get_mode(self):
         return self.led_mode
@@ -107,6 +156,8 @@ def get_webpage(self):
         COLOR_G = self.color_g
         COLOR_B = self.color_b
         BATTERY_LEVEL = self.battery_level
+        COLOR_PULSE_INTERVAL = self.color_pulse_interval
+        COLOR_PULSE_BRIGHTNESS_PCT = self.color_pulse_brightness_pct
 
         html = f"""<!DOCTYPE html>
 <html lang="en">
@@ -116,102 +167,150 @@ def get_webpage(self):
 <style>
 html{{font-family: monospace; background-color: lightgrey;
 display:block; margin: 0px auto; text-align: center;}}
-    h1{{color: deeppink; padding: 2vh; font-size: 2rem;}}
-    h2{{color: deeppink; padding: 2vh; font-size: 1.75rem;}}
-    p{{font-size: 1.5rem; display: block;}}
-    .button{{font-family: monospace; display: inline-block;
-    background-color: black; border: none;
-    border-radius: 4px; color: white; padding: 1rem 2.5rem;
-    text-decoration: none; font-size: 1.5rem; margin: 2px; cursor: pointer;}}
-    p.dotted {{margin: auto; display: block;
-    text-align: center;}}
-    .input{{font-family: monospace; display: inline-block;
-    background-color: black; border: none;
-    border-radius: 4px; color: white; padding: 1rem 2.5rem;
-    text-decoration: none; font-size: 1rem; margin: 2px; cursor: pointer;}}
-    .submit{{font-family: monospace; display: inline-block;
-    background-color: black; border: none;
-    border-radius: 4px; color: white; padding: 1rem 2.5rem;
-    text-decoration: none; font-size: 1rem; margin: 2px; cursor: pointer;}}
+	h1{{color: deeppink; padding: 2vh; font-size: 2rem;}}
+	h2{{color: deeppink; padding: 2vh; font-size: 1.75rem;}}
+	p{{font-size: 1.5rem; display: block;}}
+	.button{{font-family: monospace; display: inline-block;
+	background-color: black; border: none;
+	border-radius: 4px; color: white; padding: 1rem 2.5rem;
+	text-decoration: none; font-size: 1.5rem; margin: 2px; cursor: pointer;}}
+	p.dotted {{margin: auto; display: block;
+	 text-align: center;}}
+	.input{{font-family: monospace; display: inline-block;
+	background-color: black; border: none;
+	border-radius: 4px; color: white; padding: 1rem 2.5rem;
+	text-decoration: none; font-size: 1rem; margin: 2px; cursor: pointer;}}
+	.submit{{font-family: monospace; display: inline-block;
+	background-color: black; border: none;
+	border-radius: 4px; color: white; padding: 1rem 2.5rem;
+	text-decoration: none; font-size: 1rem; margin: 2px; cursor: pointer;}}
 </style>
 </head>
 <body>
 <title>Crystal Ball Web Server</title>
 <h1>Crystal Ball Web Server</h1>
 <div class="paragraph">
-<p class="dotted">This is a webserver to control the lights in the crystal ball.</p>
+ <p class="dotted">This is a webserver to control the lights in the crystal ball.</p>
 </div>
 <h1>Current Settings</h1>
+<h2>General Settings</h2>
 <div class="paragraph">
-<p class="dotted">Mode: <span style="color: deeppink;">{LED_MODE}</span></p>
+ <p class="dotted">Mode: <span style="color: deeppink;">{LED_MODE}</span></p>
 </div>
 <div class="paragraph">
-<p class="dotted">Battery: <span style="color: deeppink;">{BATTERY_LEVEL:.2f}</span></p>
+ <p class="dotted">Battery: <span style="color: deeppink;">{BATTERY_LEVEL:.2f}</span></p>
 </div>
 <div class="paragraph">
-    <p class="dotted">Brightness: <span style="color: deeppink;">{BRIGHTNESS:.2f}</span></p>
+	<p class="dotted">Brightness: <span style="color: deeppink;">{BRIGHTNESS:.2f}</span></p>
 </div>
+<h2>Rainbow Settings</h2>
 <div class="paragraph">
-    <p class="dotted">Rainbow Speed: <span style="color: deeppink;">{RAINBOW_SPEED:.3f}</span></p>
+	<p class="dotted">Rainbow Speed: <span style="color: deeppink;">{RAINBOW_SPEED:.3f}</span></p>
 </div>
+<h2>Color Pulse Settings</h2>
 <div class="paragraph">
-    <p class="dotted">Red value: <span style="color: deeppink;">{COLOR_R}</span></p>
+	<p class="dotted">Red value: <span style="color: deeppink;">{COLOR_R}</span></p>
 </div>
 <div class="paragraph">
-    <p class="dotted">Green value: <span style="color: deeppink;">{COLOR_G}</span></p>
+	<p class="dotted">Green value: <span style="color: deeppink;">{COLOR_G}</span></p>
 </div>
 <div class="paragraph">
-    <p class="dotted">Blue value: <span style="color: #ff1493;">{COLOR_B}</span></p>
+	<p class="dotted">Blue value: <span style="color: #ff1493;">{COLOR_B}</span></p>
+</div>
+<div class="paragraph"></div>
+	<p class="dotted">Color pulse interval: <span style="color: deeppink;">{COLOR_PULSE_INTERVAL}</span></p>
+</div>
+<div class="paragraph"></div>
+	<p class="dotted">Color pulse brightness percent: <span style="color: deeppink;">{COLOR_PULSE_BRIGHTNESS_PCT}</span></p>
 </div>
-
-<h1>Controls</h1>
 <h2>General Controls</h2>
 <p>
 <form action="{SETTINGS_URL}" method="post" enctype="text/plain">
-    <button class="button" name="{MODE_FORM_KEY}" value="{MODE_RAINBOW}" type="submit">Set Rainbow Mode</button>
+	<button class="button" name="{MODE_FORM_KEY}" value="{MODE_RAINBOW}" type="submit">Set Rainbow Mode</button>
 </form>
 </p>
 <p>
 <form action="{SETTINGS_URL}" method="post" enctype="text/plain">
-    <button class="button" name="{MODE_FORM_KEY}" value="{MODE_COLOR_PULSE}" type="submit">Set Color Pulse Mode</button>
+	<button class="button" name="{MODE_FORM_KEY}" value="{MODE_COLOR_PULSE}" type="submit">Set Color Pulse Mode</button>
 </form>
 </p>
 <p>
-    <form action="{SETTINGS_URL}" method="post" enctype="text/plain">
-        <button class="button" name="{MODE_FORM_KEY}" value="{MODE_SLEEP}" type="submit">Set Deep Sleep</button>
-    </form>
+	<form action="{SETTINGS_URL}" method="post" enctype="text/plain">
+		<button class="button" name="{MODE_FORM_KEY}" value="{MODE_SLEEP}" type="submit">Set Deep Sleep</button>
+	</form>
 </p>
 <p>
 <form action="{SETTINGS_URL}" method="post" enctype="text/plain">
-    <input class="input" type="text" name="{BRIGHTNESS_FORM_KEY}" placeholder="Brightness: {BRIGHTNESS_LOWER_BOUND}-{BRIGHTNESS_UPPER_BOUND}">
-    <input class="submit" type="submit" value="Submit">
+	<input class="input" type="text" name="{BRIGHTNESS_FORM_KEY}" placeholder="Brightness: {BRIGHTNESS_LOWER_BOUND}-{BRIGHTNESS_UPPER_BOUND}">
+	<input class="submit" type="submit" value="Submit">
 </form>
 </p>
 <p>
 <form action="{SETTINGS_URL}" method="post" enctype="text/plain">
-    <button class="button" name="{RESET_VARS_FORM_KEY}" value="yes" type="submit">Reset Variables</button>
+	<button class="button" name="{RESET_VARS_FORM_KEY}" value="yes" type="submit">Reset Variables</button>
 </form>
 </p>
 <h2>Rainbow Controls</h2>
 <p>
 <form action="{RAINBOW_SETTINGS_URL}" method="post" enctype="text/plain">
-    <input class="input" type="text" name="{RAINBOW_SPEED_FORM_KEY}" placeholder="Rainbow speed: {RAINBOW_MIN_SPEED}-{RAINBOW_MAX_SPEED}">
-    <input class="submit" type="submit" value="Submit">
+	<input class="input" type="text" name="{RAINBOW_SPEED_FORM_KEY}" placeholder="Rainbow speed: {RAINBOW_MIN_SPEED}-{RAINBOW_MAX_SPEED}">
+	<input class="submit" type="submit" value="Submit">
 </form>
 </p>
-<h2>Color Pulse Controls</h3>
+<h2>Color Pulse Controls</h2>
 <p>
 <form action="{COLOR_PULSE_SETTINGS_URL}" method="post" enctype="text/plain">
-    <p>
-        <input class="input" type="text" name="{COLOR_R_FORM_KEY}" placeholder="Red: {COLOR_LOWER_BOUND}-{COLOR_UPPER_BOUND}">
-    </p>
-    <p>
-        <input class="input" type="text" name="{COLOR_G_FORM_KEY}" placeholder="Green: {COLOR_LOWER_BOUND}-{COLOR_UPPER_BOUND}">
-    </p>
-    <p>
-        <input class="input" type="text" name="{COLOR_B_FORM_KEY}" placeholder="Blue: {COLOR_LOWER_BOUND}-{COLOR_UPPER_BOUND}">
-    </p>
-    <input class="submit" type="submit" value="Submit">
+	<button class="button" name="{RED_COLOR_KEY}" value="yes" type="submit">Red</button>
+</form>
+</p>
+<p>
+<form action="{COLOR_PULSE_SETTINGS_URL}" method="post" enctype="text/plain">
+	<button class="button" name="{ORANGE_COLOR_KEY}" value="yes" type="submit">Orange</button>
+</form>
+</p>
+<p>
+<form action="{COLOR_PULSE_SETTINGS_URL}" method="post" enctype="text/plain">
+	<button class="button" name="{YELLOW_COLOR_KEY}" value="yes" type="submit">Yellow</button>
+</form>
+</p>
+<p>
+<form action="{COLOR_PULSE_SETTINGS_URL}" method="post" enctype="text/plain">
+	<button class="button" name="{GREEN_COLOR_KEY}" value="yes" type="submit">Green</button>
+</form>
+</p>
+<p>
+<form action="{COLOR_PULSE_SETTINGS_URL}" method="post" enctype="text/plain">
+	<button class="button" name="{BLUE_COLOR_KEY}" value="yes" type="submit">Blue</button>
+</form>
+</p>
+<p>
+<form action="{COLOR_PULSE_SETTINGS_URL}" method="post" enctype="text/plain">
+	<button class="button" name="{PURPLE_COLOR_KEY}" value="yes" type="submit">Purple</button>
+</form>
+</p>
+<p>
+<form action="{COLOR_PULSE_SETTINGS_URL}" method="post" enctype="text/plain">
+	<input class="input" type="text" name="{COLOR_PULSE_INTERVAL_KEY}" placeholder="({COLOR_PULSE_INTERVAL_MINIMUM}-{COLOR_PULSE_INTERVAL_MAXIMUM})">
+</form>
+</p>
+<p>
+<form action="{COLOR_PULSE_SETTINGS_URL}" method="post" enctype="text/plain">
+	<input class="input" type="text" name="{PULSE_BRIGHTNESS_PERCENT_KEY}" placeholder="({PULSE_BRIGHTNESS_PCT_MINIMUM}-{PULSE_BRIGHTNESS_PCT_MAXIMUM})">
+</form>
+</p>
+<p>
+<h3>RGB Controls</h3>
+<form action="{COLOR_PULSE_SETTINGS_URL}" method="post" enctype="text/plain">
+	<p>
+		<input class="input" type="text" name="{COLOR_R_FORM_KEY}" placeholder="Red: {COLOR_LOWER_BOUND}-{COLOR_UPPER_BOUND}">
+	</p>
+	<p>
+		<input class="input" type="text" name="{COLOR_G_FORM_KEY}" placeholder="Green: {COLOR_LOWER_BOUND}-{COLOR_UPPER_BOUND}">
+	</p>
+	<p>
+		<input class="input" type="text" name="{COLOR_B_FORM_KEY}" placeholder="Blue: {COLOR_LOWER_BOUND}-{COLOR_UPPER_BOUND}">
+	</p>
+	<input class="submit" type="submit" value="Submit">
 </form>
 </p>
 </body></html>
@@ -228,6 +327,7 @@ def settings(self, request: Request):
             except ValueError:
                 pass
             self.brightness = bound_number(brightness, BRIGHTNESS_LOWER_BOUND, BRIGHTNESS_UPPER_BOUND, 0)
+            self.recalc_color_pulse_helpers()
             self.pixels.brightness = self.brightness
 
         mode = request.form_data.get(MODE_FORM_KEY, None)
@@ -254,6 +354,9 @@ def settings(self, request: Request):
             self.color_r = 255
             self.color_g = 0
             self.color_b = 255
+            self.color_pulse_interval = 0
+            self.color_pulse_brightness_pct = 0.5
+            self.recalc_color_pulse_helpers()
         return Response(request, f"{self.get_webpage()}", content_type='text/html')
 
 
@@ -271,6 +374,14 @@ def settings_rainbow(self, request: Request):
 
     def settings_color_pulse(self, request: Request):
 
+        for key, color in PRESET_COLORS.items():
+            key_val = request.form_data.get(key, None)
+            if not key_val is None:
+                self.color_r = color[0]
+                self.color_g = color[1]
+                self.color_b = color[2]
+                break
+
         r_val = request.form_data.get(COLOR_R_FORM_KEY, None)
         if not r_val is None:
             r = self.color_r
@@ -298,6 +409,26 @@ def settings_color_pulse(self, request: Request):
                 pass
             self.color_b = bound_number(b, COLOR_LOWER_BOUND, COLOR_UPPER_BOUND, 0)
 
+        pulse_interval = request.form_data.get(COLOR_PULSE_INTERVAL_KEY, None)
+        if not pulse_interval is None:
+            pulse = self.color_pulse_interval
+            try:
+                pulse = float(pulse_interval.strip())
+            except ValueError:
+                pass
+            self.color_pulse_interval = bound_number(pulse, COLOR_PULSE_INTERVAL_MINIMUM, COLOR_PULSE_INTERVAL_MAXIMUM, 0)
+            self.recalc_color_pulse_helpers()
+
+        pulse_brightness = request.form_data.get(PULSE_BRIGHTNESS_PERCENT_KEY, None)
+        if not pulse_brightness is None:
+            pb = self.color_pulse_brightness_pct
+            try:
+                pb = float(pulse_brightness.strip())
+            except ValueError:
+                pass
+            self.color_pulse_brightness_pct = bound_number(pb, PULSE_BRIGHTNESS_PCT_MINIMUM, PULSE_BRIGHTNESS_PCT_MAXIMUM, 0)
+            self.recalc_color_pulse_helpers()
+
         return Response(request, f"{self.get_webpage()}", content_type='text/html')
 
     def base(self, request: Request):  # pylint: disable=unused-argument
@@ -315,5 +446,19 @@ def rainbow(self):
             time.sleep(self.rainbow_speed)
 
     def color_pulse(self):
+        # we want to use the interval, within this many seconds, it should go from full brightness, to minimum brightness, to full brightness
+        # minimum brightness is determined by current brightness * color_pulse_brightness_percent
+        # for example, if current brightness is 0.5, and interval is 1, and color_pulse_brightness_percent is 0.5
+        # the lights will fade from 0.5 brightness, to 0.25 brightness, back to 0.5 brightness over a 1 second interval
+
+        if self.color_pulse_counter < (self.color_pulse_max_counter / 2):
+            self.color_pulse_adjusted_brightness -= self.color_pulse_brightness_increment
+        else:
+            self.color_pulse_adjusted_brightness += self.color_pulse_brightness_increment
+        self.color_pulse_counter += 1
+        if self.color_pulse_counter >= self.color_pulse_max_counter:
+            self.color_pulse_counter = 0
+
         self.pixels.fill((self.color_r, self.color_g, self.color_b))
+        self.pixels.brightness = self.color_pulse_adjusted_brightness
         self.pixels.show()
diff --git a/code/webpage.html b/code/webpage.html
