Reducing number of possible colours

apps/widmp/settings.js

@@ -13,6 +13,7 @@
   
   function writeSettingsCustom() {
 	  settings.default_colour = false;
+      mainmenu["Default"].value = false;
 	  writeSettings();
   }
   
@@ -40,7 +41,7 @@
 	  "red": {
 		  value: 0|settings.red,
 		  min: 0,
-		  max: 7,
+		  max: 4,
 		  onchange: v => {
 			  settings.red = v;
 			  writeSettingsCustom();
@@ -49,7 +50,7 @@
 	  "green": {
 		  value: 0|settings.green,
 		  min: 0,
-		  max: 7,
+		  max: 4,
 		  onchange: v => {
 			  settings.green = v;
 			  writeSettingsCustom();
@@ -58,7 +59,7 @@
 	  "blue": {
 		  value: 0|settings.blue,
 		  min: 0,
-		  max: 7,
+		  max: 4,
 		  onchange: v => {
 			  settings.blue = v;
 			  writeSettingsCustom();

apps/widmp/widget.js

@@ -41,14 +41,14 @@
     }
   }
   
-  function setMoonColour() {
+  function setMoonColour(g) {
     var settings = Object.assign({
       default_colour: true,
-	  red: 0,
-	  green: 0,
-	  blue: 0,
+      red: 0,
+      green: 0,
+      blue: 0,
     }, require('Storage').readJSON("widmp.json", true) || {});
-	if (settings.default_colour) {
+    if (settings.default_colour) {
       if (g.theme.dark) {
         g.setColor(0xffff); // white
       } else {
@@ -56,19 +56,9 @@
         // 0000010000011111
         g.setColor(0x41f); // blue-ish
       }
-	} else {
-		// 1111110000000000
-		// 5432109876543210
-		// rrrrrggggggbbbbb
-        // RxxRxGxxGxxBxxBx
-		let r = settings.red;
-		let g = settings.green;
-		let b = settings.blue;
-		r = (r << 13) | ((r & 3) << 11);
-		g = (g << 8) | (g << 5);
-		b = (b << 2) | (b & 3);
-		g.setColor(r | g | b);
-	}
+    } else {
+      g.setColor(settings.red/4, settings.green/4, settings.blue/4);
+    }
   }
 
 
@@ -96,7 +86,7 @@
       var tmp=leftFactor; leftFactor=rightFactor; rightFactor=tmp;
     }
 
-    setMoonColour();
+    setMoonColour(g);
     drawMoonPhase(CenterX,CenterY, Radius, leftFactor,rightFactor);
   }