From 7b72464fdfd0fd50623817e0f7bebd4538e70d32 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart@neuron.com>
Date: Tue, 10 Nov 2020 23:22:58 -0500
Subject: [PATCH] darker colors for cam

---
 src/kiri/worker.js      |  6 ++++--
 src/mode/fdm/prepare.js | 15 +++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/kiri/worker.js b/src/kiri/worker.js
index 1576d90e..632948aa 100644
--- a/src/kiri/worker.js
+++ b/src/kiri/worker.js
@@ -126,12 +126,14 @@ KIRI.worker = {
             send.data({ progress, message });
         });
 
-        const maxSpeed = (current.print || {}).maxSpeed || undefined;
+        const print = current.print || {};
+        const maxSpeed = print.maxSpeed || undefined;
+        const thinColor = print.thinColor || false;
         let speedColors = {};
         if (maxSpeed) {
             const FDM = KIRI.driver.FDM;
             for (let i=0, sd=maxSpeed/19, so=0; i<20; i++) {
-                speedColors[Math.round(so)] = FDM.colorFunc(so/(maxSpeed+1));
+                speedColors[Math.round(so)] = FDM.rateToColor(so, maxSpeed + 1, thinColor);
                 so += sd;
             }
         }
diff --git a/src/mode/fdm/prepare.js b/src/mode/fdm/prepare.js
index 237474a1..5917332e 100644
--- a/src/mode/fdm/prepare.js
+++ b/src/mode/fdm/prepare.js
@@ -397,8 +397,8 @@
         }
     }
 
-    FDM.colorFunc = function(rate) {
-        return hsv2rgb({h: rate, s:1, v:0.8});
+    FDM.rateToColor = function(rate, max, ext) {
+        return hsv2rgb({h: rate/max, s:1, v:ext ? 0.7 : 0.8}, ext);
     };
 
     FDM.prepareRender = function(levels, update, options) {
@@ -421,20 +421,15 @@
 
         // for reporting
         self.worker.print.maxSpeed = maxspd - 1;
+        self.worker.print.thinColor = thin;
 
         let lastOut = null;
         let current = null;
 
-        function colorDefault(point) {
-            return hsv2rgb({h:point.speed / maxspd, s:1, v:0.75});
+        function color(point) {
+            return FDM.rateToColor(point.speed, maxspd, thin);
         }
 
-        function colorCustom(point) {
-            return FDM.rateToColor(point.speed, maxspd);
-        }
-
-        const color = FDM.rateToColor ? colorCustom : colorDefault;
-
         levels.forEach((level, index) => {
             const prints = {};
             const moves = [];