Added fullest color to ring setting
parent
69cc8ea73e
commit
83c829781b
|
|
@ -538,6 +538,8 @@ function drawClock() {
|
||||||
drawAllRings(date, null);
|
drawAllRings(date, null);
|
||||||
setLargeFont();
|
setLargeFont();
|
||||||
|
|
||||||
|
if (settings.color == 'Fullest')
|
||||||
|
settings.fg = settings.rings[getFullestRing()].fg;
|
||||||
g.setColor(settings.fg);
|
g.setColor(settings.fg);
|
||||||
g.setFontAlign(1,0); // right aligned
|
g.setFontAlign(1,0); // right aligned
|
||||||
g.drawString(hh, (w/2) - 1, h/2);
|
g.drawString(hh, (w/2) - 1, h/2);
|
||||||
|
|
@ -917,6 +919,7 @@ function queueDraw() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getInnerOuterMostRing() {
|
function getInnerOuterMostRing() {
|
||||||
|
// Outputs 1 through 3
|
||||||
let innerMost = 0;
|
let innerMost = 0;
|
||||||
let outerMost = 0;
|
let outerMost = 0;
|
||||||
for (let i = 0; i < settings.rings.length; i++) {
|
for (let i = 0; i < settings.rings.length; i++) {
|
||||||
|
|
@ -935,6 +938,22 @@ function getInnerOuterMostRing() {
|
||||||
outerMostRing = outerMost;
|
outerMostRing = outerMost;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getFullestRing() {
|
||||||
|
// Outputs 0 through 2
|
||||||
|
let largestPercent = 0;
|
||||||
|
let fullestRing = 0;
|
||||||
|
for (let i = 0; i < settings.rings.length; i++) {
|
||||||
|
if (settings.rings[i].type !== "None") {
|
||||||
|
let percent = (prevRing[i].end - prevRing[i].start) / prevRing[i].max;
|
||||||
|
if (largestPercent < percent) {
|
||||||
|
largestPercent = percent;
|
||||||
|
fullestRing = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return fullestRing;
|
||||||
|
}
|
||||||
|
|
||||||
// Stop updates when LCD is off, restart when on
|
// Stop updates when LCD is off, restart when on
|
||||||
Bangle.on('lcdPower',on=>{
|
Bangle.on('lcdPower',on=>{
|
||||||
if (on) {
|
if (on) {
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ function save() {
|
||||||
var ring_options = ['Hours', 'Minutes', 'Seconds', 'Day', 'Sun', 'Steps', 'Battery'];
|
var ring_options = ['Hours', 'Minutes', 'Seconds', 'Day', 'Sun', 'Steps', 'Battery'];
|
||||||
var ring_types = ['None', 'Full', 'Semi', 'C'];
|
var ring_types = ['None', 'Full', 'Semi', 'C'];
|
||||||
var step_options = [100, 1000, 5000, 10000, 15000, 20000];
|
var step_options = [100, 1000, 5000, 10000, 15000, 20000];
|
||||||
var color_options_font = ['Outer', 'Inner'].concat(color_options);
|
var color_options_font = ['Outer', 'Inner', 'Fullest'].concat(color_options);
|
||||||
var fg_code_font = [null, null].concat(color_options);
|
var fg_code_font = [null, null].concat(color_options);
|
||||||
|
|
||||||
function showRingMenu(ringIndex) {
|
function showRingMenu(ringIndex) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue