Merge branch 'spotrem' into app-loader

Author: thyttan

modules/Dial_Display.js

@@ -14,21 +14,20 @@ function DialDisplay(options) {
     }, options);
 
   this.value = 0;
-  this.reset();
+  this.isFullDraw = true;
 }
 
-DialDisplay.prototype.reset = function() {
-  this.isFirstDraw = true;
+DialDisplay.prototype.queueRedraw = function() {
+  this.isFullDraw = true;
+  this.prevDrawnValue = null;
 };
 
 DialDisplay.prototype.set = function(value) {
-  this.prevValue = this.value;
   this.value = value;
 };
 
 DialDisplay.prototype.step = function(step) {
   "ram";
-  let prevValue = this.prevValue != null ? this.prevValue : this.value;
   this.value += step;
   //g.setFont("Vector:30");
   //g.drawString(this.value);
@@ -47,22 +46,22 @@ DialDisplay.prototype.step = function(step) {
     if (!isFill) g.drawCircle(x, y, rad);
     if (isFill) g.fillCircle(x, y, rad);
   }
-  if (this.isFirstDraw) {
+  if (this.isFullDraw) {
     g.setColor(0,0,0).fillCircle(CENTER.x, CENTER.y, 25);
     g.setColor(1,1,1).drawCircle(CENTER.x, CENTER.y, 25);
     for (let i=0; i<this.options.stepsPerWholeTurn; i++) {
       drawCircle(i, 1, 1, 1, 1, true);
     }
-    this.isFirstDraw = false;
+    this.isFullDraw = false;
   }
 
   //drawCircle(this.value, 1, 1, 1, 2, false);
   //drawCircle(prevValue, 0, 0, 0, 2, false);
-  g.setColor(0,0,0).drawLine(CENTER.x, CENTER.y, CENTER.x+23*Math.sin(prevValue*(2*Math.PI/this.options.stepsPerWholeTurn)), CENTER.y-23*Math.cos(prevValue*(2*Math.PI/this.options.stepsPerWholeTurn)));
+  g.setColor(0,0,0).drawLine(CENTER.x, CENTER.y, CENTER.x+23*Math.sin(this.prevDrawnValue*(2*Math.PI/this.options.stepsPerWholeTurn)), CENTER.y-23*Math.cos(this.prevDrawnValue*(2*Math.PI/this.options.stepsPerWholeTurn)));
   g.setColor(1,1,1).drawLine(CENTER.x, CENTER.y, CENTER.x+23*Math.sin(this.value*(2*Math.PI/this.options.stepsPerWholeTurn)), CENTER.y-23*Math.cos(this.value*(2*Math.PI/this.options.stepsPerWholeTurn)));
   g.setColor(0,0,0).fillCircle(CENTER.x, CENTER.y, 9);
 
-  delete this.prevValue;
+  this.prevDrawnValue = this.value;
 };
 
 exports = DialDisplay;

modules/Dial_Display.md

@@ -16,7 +16,7 @@ dialDisplay.step(-1);
 var value = dialDisplay.value;
 
 // ... after some time:
-dialDisplay.reset();
+dialDisplay.queueRedraw();
 dialDisplay.set(0);
 ```
 
@@ -37,11 +37,10 @@ var DialDisplay = require("Dial_Display");
 var dialDisplay = new DialDisplay(options);
 
 var cb = (step) => {
-  dialDisplay.reset();
   dialDisplay.step(step);
 };
 
-var dial = require("Dial")(cb, options)
+var dial = require("dial")(cb, options)
 Bangle.on("drag", dial);
 ```
 
@@ -65,7 +64,7 @@ Defaults:
 The Dial Display has three functions:
 `step(amount)` - +1 or -1 to step the dial.
 `set(value)` - set the value for the next `step()` to act on.
-`reset()` - draw all of the dial (instead of just the indicator) on the next `step()`.
+`queueRedraw()` - draw all of the dial (instead of just the indicator) on the next `step()`.
 
 Notes:
 ======