Support blue led in sim

diff --git a/watch-library/simulator/shell.html b/watch-library/simulator/shell.html
index 8306b9198d47e0675ddb1e5c500bd84dd5d85d99..51d289cbd47b634c6eefe5469320458b5691baa3 100644 (file)
--- a/watch-library/simulator/shell.html
+++ b/watch-library/simulator/shell.html
@@ -64,22 +64,22 @@
   <h1 style="text-align: center;">Sensor Watch Emulator</h1>
   <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1271 1311" width="320">
     <defs>
-      <radialGradient id="Dégradé_sans_nom_3" data-name="Dégradé sans nom 3" cx="635" cy="687" fx="260.1751499985994" r="374.83" gradientUnits="userSpaceOnUse">
-        <stop offset="0.28" stop-color="lime"/>
-        <stop offset="0.46" stop-color="#00b200" stop-opacity="0.7"/>
-        <stop offset="0.65" stop-color="#006700" stop-opacity="0.4"/>
-        <stop offset="0.82" stop-color="#002f00" stop-opacity="0.19"/>
-        <stop offset="0.94" stop-color="#000d00" stop-opacity="0.05"/>
-        <stop offset="1" stop-opacity="0"/>
+      <radialGradient id="Dégradé_sans_nom_3" data-name="Dégradé sans nom 3"
+                      cx="635" cy="687" fx="260.1751499985994" r="374.83" gradientUnits="userSpaceOnUse">
+        <stop offset="0.28" stop-color="white"/>
+        <stop offset="0.46" stop-color="#ccc" stop-opacity="0.7"/>
+        <stop offset="0.65" stop-color="#999" stop-opacity="0.4"/>
+        <stop offset="0.82" stop-color="#666" stop-opacity="0.19"/>
+        <stop offset="0.94" stop-color="#333" stop-opacity="0.05"/>
+        <stop offset="1" stop-color="#000" stop-opacity="0"/>
       </radialGradient>
-      <filter id="ledcolor">
-        <feColorMatrix in="SourceGraphic" type="matrix"
-                       values=" 0      0      0      0 0
-                                0      1      0      0 0
-                                0      0      0      0 0
-                                0      0      0      1 0  "/>
-
-      </filter>
+        <filter id="ledcolor">
+          <feColorMatrix in="SourceGraphic" type="matrix"
+                 values="1 0 0 0 0
+                         0 1 0 0 0
+                         0 0 1 0 0
+                         0 0 0 1 0"/>
+        </filter>
     </defs>
     <g id="Calque">
       <path id="btn3" d="M1226,777h39.08a5.92,5.92,0,0,1,5.92,5.92v58.16a5.92,5.92,0,0,1-5.92,5.92H1226a0,0,0,0,1,0,0V777A0,0,0,0,1,1226,777Z" style="fill: #999"/>

diff --git a/watch-library/simulator/watch/watch_tcc.c b/watch-library/simulator/watch/watch_tcc.c
index f0046849c536edd3948e01c9de03383c6826fcda..5466eebb6c023142cd7554104b46c3fcf0b6a38c 100644 (file)
--- a/watch-library/simulator/watch/watch_tcc.c
+++ b/watch-library/simulator/watch/watch_tcc.c
@@ -190,37 +190,29 @@ void watch_enable_leds(void) {}
 
 void watch_disable_leds(void) {}
 
-void watch_set_led_color(uint8_t red, uint8_t green) {
+void watch_set_led_color_rgb(uint8_t red, uint8_t green, uint8_t blue) {
     EM_ASM({
-        // the watch svg contains an feColorMatrix filter with id ledcolor
-        // and a green svg gradient that mimics the led being on
-        // https://developer.mozilla.org/en-US/docs/Web/SVG/Element/feColorMatrix
-        // this changes the color of the gradient to match the red+green combination
         let filter = document.getElementById("ledcolor");
         let color_matrix = filter.children[0].values.baseVal;
-        color_matrix[1].value = $0  / 255; // red value
-        color_matrix[6].value = $1 / 255; // green value
-        document.getElementById('light').style.opacity = Math.min(255, $0 + $1) / 255;
-    }, red, green);
-}
-
-void watch_set_led_color_rgb(uint8_t red, uint8_t green, uint8_t blue) {
-    (void) blue;
-    watch_set_led_color(red, green);
+        color_matrix[0].value = $0 / 255; // red
+        color_matrix[6].value = $1 / 255; // green
+        color_matrix[12].value = $2 / 255; // blue
+        document.getElementById('light').style.opacity = Math.min(255, $0 + $1 + $2) / 255;
+    }, red, green, blue);
 }
 
 void watch_set_led_red(void) {
-    watch_set_led_color(255, 0);
+    watch_set_led_color_rgb(255, 0, 0);
 }
 
 void watch_set_led_green(void) {
-    watch_set_led_color(0, 255);
+    watch_set_led_color_rgb(0, 255, 0);
 }
 
 void watch_set_led_yellow(void) {
-    watch_set_led_color(255, 255);
+    watch_set_led_color_rgb(255, 255, 0);
 }
 
 void watch_set_led_off(void) {
-    watch_set_led_color(0, 0);
+    watch_set_led_color_rgb(0, 0, 0);
 }