From f6b5dfe68d7ed28a3615608c8a7260ed0ca5d18c Mon Sep 17 00:00:00 2001
From: cnlohr <lohr85@gmail.com>
Date: Thu, 10 Oct 2024 01:11:08 -0700
Subject: [PATCH] Cleanup

---
 ch32v/ch32v003fun          |  2 +-
 ch32v/lib/calculator.html  | 13 +++++++------
 ch32v/lib/webhidcontrol.js |  8 +++++---
 3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ch32v/ch32v003fun b/ch32v/ch32v003fun
index 0631938..31a231f 160000
--- a/ch32v/ch32v003fun
+++ b/ch32v/ch32v003fun
@@ -1 +1 @@
-Subproject commit 0631938a88060cd8686b2e7c118664f1bd6984ed
+Subproject commit 31a231ff279d9c60bf9bd6628e891e031371ef3a
diff --git a/ch32v/lib/calculator.html b/ch32v/lib/calculator.html
index 46f47fa..0c7db2e 100644
--- a/ch32v/lib/calculator.html
+++ b/ch32v/lib/calculator.html
@@ -2,22 +2,23 @@
 <HTML>
 <HEAD>
 <LINK rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon"> 
-<META charset="UTF-8">
+<META charset="UTF-8"/>
 <STYLE>
-body { background-color: Canvas; color: CanvasText; }
 :root { color-scheme: dark; }
 </STYLE>
-
 <SCRIPT src=webhidcontrol.js></SCRIPT>
-
 <SCRIPT>
+var darkmode = true;
+
+//body { background-color: Canvas; color: CanvasText; }
+
 function DrawSpan( rowspan, colspan, freq, target, docolor, extrastr = "" )
 {
 	var fdist = Math.abs( freq - target );
 	fdist = Math.pow( fdist, 0.5 ) * 500;
 //	if( fdist > 255 ) fdist = 255;
 	let ret = "<TD COLSPAN=" + colspan + ' ROWSPAN' + rowspan + ' ';
-	if( docolor ) ret += 'STYLE="color:black;background-color:rgb(' + fdist + ',' + (511-fdist) + ',0)";';
+	if( docolor ) ret += 'STYLE="color:black;background-color:rgba(' + fdist + ',' + (511-fdist) + ',0,0.2)";';
 	ret += '>' + extrastr + freq.toFixed(6) + "</TD>";
 	return ret;
 }
@@ -485,7 +486,7 @@ function onLoad()
 </TD>
 <TD VALIGN=TOP>
 
-Live Control:
+Live Control:<br>
 <TABLE><TR>
 <TD><INPUT TYPE=SUBMIT onClick="reqConnect()" VALUE="Open Device" ID=connectButton>
 <INPUT TYPE=SUBMIT onClick="toggleAudio()" VALUE="Play Audio" ID="ToggleAudioButton">
diff --git a/ch32v/lib/webhidcontrol.js b/ch32v/lib/webhidcontrol.js
index dc8053b..806ce4f 100644
--- a/ch32v/lib/webhidcontrol.js
+++ b/ch32v/lib/webhidcontrol.js
@@ -346,16 +346,18 @@ async function sendLoop()
 
 					ctx.clearRect(0, 0, liveGraph.width, liveGraph.height);
 
+					let grey = darkmode?"rgb( 240 240 240 )":"rgb(16 16 16)";
+					let mark = darkmode?"rgb( 255 255 255 )":"rgb(0 0 0)";
 
 					var filledness = lastNumQ * 198 / 120;
-					ctx.fillStyle = "rgb( 240 240 240 )";
+					ctx.fillStyle = grey;
 					ctx.fillRect( 2, 2 + 198 - filledness, 18, filledness - 2);
 
 					filledness = ( lastTimeUsed * 1.0 / lastTotalTime ) * 198;
-					ctx.fillStyle = "rgb( 240 240 240 )";
+					ctx.fillStyle = grey;
 					ctx.fillRect( 26, 2 + 198 - filledness, 18, filledness - 2 );
 
-					ctx.fillStyle = `rgb( 255 255 255 )`;
+					ctx.fillStyle = mark;
 
 					let mulcoeff = 2500.0 / lastIntensity;
 					var lot = 1.2;
