1
0
Fork 0

fix: play with syntax

master
RomanistHere 2021-12-15 22:23:38 +03:00
parent 99e75b8e11
commit 8e0ba23aa8
3 changed files with 15 additions and 15 deletions

View File

@ -8,7 +8,7 @@ Graphics.prototype.setFontLECO1976Regular22 = function(scale) {
g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/nA/+cD/5wP/nAAAAAAAAPwAA/gAD+AAPwAAAAAD+AAP4AA/gAAAAAAAAAAAAAcOAP//A//8D//wP//AHDgAcOAP//A//8D//wP//AHDgAAAAAAAAH/jgf+OB/44H/jj8OP/w4//Dj/8OPxw/4HD/gcP+Bw/4AAAAAAAP+AA/8AD/wQOHHA4c8D//wP/8A//gAD4AAfAAH/8A//wP//A84cDjhwIP/AA/8AB/wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8ABwAAAAAAAAD8AAP4AA/gAD8AAAAAAAAAAAEAAD+AB//A///v/D//gB/wABwAAAAAADgAA/wAf/4P8///wf/4AP8AAOAAAAAAAAAyAAHcAAPwAD/gAP/AA/8AA/AAH8AAMwAAAAAAAAAAAAADgAAOAAA4AAf8AD/wAP/AA/8AAOAAA4AADgAAAAAAAAAAD8AAfwAB/AAD8AAAAAAAADgAAOAAA4AADgAAOAAA4AADgAAAAAAAAAADgAAOAAA4AADgAAAAAAAAABwAB/AA/8A//gP/gA/wADwAAIAAAAAAD//wP//A//8D//wOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA4AcDgBwOAHA//8D//wP//A//8AABwAAHAAAcAAAAAAAA+f8D5/wPn/A+f8DhxwOHHA4ccDhxwP/HA/8cD/xwP/HAAAAAAAAOAHA4AcDhxwOHHA4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/wAP/AA/8AD/wAAHAAAcAABwAAHAA//8D//wP//A//8AAAAAAAA/98D/3wP/fA/98DhxwOHHA4ccDhxwOH/A4f8Dh/wOH/AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccDh/wOH/A4f8Dh/wAAAAAAAD4AAPgAA+AADgAAOAAA4AADgAAP//A//8D//wP//AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA//8D//wP//A//8AAAAAAAAOA4A4DgDgOAOA4AAAAAAAAOA/A4H8DgfwOA/AAAAAAAAB4AAPwAA/AAD8AAf4ABzgAPPAA8cAHh4AAAAAAAAAAAAHHAAccABxwAHHAAccABxwAHHAAccABxwAHHAAAAAAAAAOHAA4cADzwAPPAAf4AB/gAD8AAPwAAeAAB4AAAAAAAAA+AAD4AAPgAA+ecDh9wOH3A4fcDhwAP/AA/8AD/wAP/AAAAAAAAAP//4///j//+P//44ADjn/OOf845/zjnHOP8c4//zj//OP/84AAAAAAAP//A//8D//wP//A4cADhwAOHAA4cAD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA//8D//wP9/A/j8AAAAAAAA//8D//wP//A//8DgBwOAHA4AcDgBwOAHA4AcDgBwOAHAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA8A8D//wH/+AP/wAf+AAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4ccDhxwOAHA4AcAAAAAAAA//8D//wP//A//8DhwAOHAA4cADhwAOHAA4cADgAAOAAAAAAD//wP//A//8D//wOAHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA//8D//wP//A//8ABwAAHAAAcAABwAP//A//8D//wP//AAAAAAAAP//A//8D//wP//AAAAAAAAOAHA4AcDgBwOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA//8D//wP//A//8AHwAA/AAP8AB/wAPn/A8f8DB/wIH/AAAAAAAAP//A//8D//wP//AAAcAABwAAHAAAcAABwAAHAAAAAAAAP//A//8D//wP//Af8AAP+AAH/AAD8AAHwAD/AB/wAf8AP+AA//8D//wP//AAAAAAAAP//A//8D//wP//AfwAAfwAAfwAAfwAAfwP//A//8D//wAAAAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHAA4cADhwAOHAA/8AD/wAP/AA/8AAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//+P//4///j//+AAA4AADgAAAP//A//8D//wP//A4eADh+AOH8A4f4D/3wP/HA/8MD/wQAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA4AADgAAOAAA//8D//wP//A//8DgAAOAAA4AADgAAAAAA//8D//wP//A//8AABwAAHAAAcAABwP//A//8D//wP//AAAADAAAPgAA/wAD/4AB/8AA/8AAfwAB/AA/8Af+AP/AA/wAD4AAMAAA4AAD+AAP/gA//8AH/wAB/AAf8Af/wP/4A/4AD/gAP/4AH/8AB/wAB/AB/8D//wP/gA/gADgAAIABA4AcDwDwPw/Afn4Af+AA/wAD/AA//AH5+A/D8DwDwOAHAgAEAAAAP/AA/8AD/wAP/AAAf8AB/wAH/AAf8D/wAP/AA/8AD/wAAAAAAAADh/wOH/A4f8Dh/wOHHA4ccDhxwOHHA/8cD/xwP/HA/8cAAAAAAAAf//9///3///f//9wAA3AADcAAMAAAOAAA/gAD/wAH/8AB/8AA/wAAPAAAEAAAAHAADcAANwAB3///f//9///wAA"), 32, atob("BwYLDg4UDwYJCQwMBgkGCQ4MDg4ODg4NDg4GBgwMDA4PDg4ODg4NDg4GDQ4MEg8ODQ8ODgwODhQODg4ICQg="), 22+(scale<<8)+(1<<16)); g.setFontCustom(atob("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/nA/+cD/5wP/nAAAAAAAAPwAA/gAD+AAPwAAAAAD+AAP4AA/gAAAAAAAAAAAAAcOAP//A//8D//wP//AHDgAcOAP//A//8D//wP//AHDgAAAAAAAAH/jgf+OB/44H/jj8OP/w4//Dj/8OPxw/4HD/gcP+Bw/4AAAAAAAP+AA/8AD/wQOHHA4c8D//wP/8A//gAD4AAfAAH/8A//wP//A84cDjhwIP/AA/8AB/wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8ABwAAAAAAAAD8AAP4AA/gAD8AAAAAAAAAAAEAAD+AB//A///v/D//gB/wABwAAAAAADgAA/wAf/4P8///wf/4AP8AAOAAAAAAAAAyAAHcAAPwAD/gAP/AA/8AA/AAH8AAMwAAAAAAAAAAAAADgAAOAAA4AAf8AD/wAP/AA/8AAOAAA4AADgAAAAAAAAAAD8AAfwAB/AAD8AAAAAAAADgAAOAAA4AADgAAOAAA4AADgAAAAAAAAAADgAAOAAA4AADgAAAAAAAAABwAB/AA/8A//gP/gA/wADwAAIAAAAAAD//wP//A//8D//wOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA4AcDgBwOAHA//8D//wP//A//8AABwAAHAAAcAAAAAAAA+f8D5/wPn/A+f8DhxwOHHA4ccDhxwP/HA/8cD/xwP/HAAAAAAAAOAHA4AcDhxwOHHA4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/wAP/AA/8AD/wAAHAAAcAABwAAHAA//8D//wP//A//8AAAAAAAA/98D/3wP/fA/98DhxwOHHA4ccDhxwOH/A4f8Dh/wOH/AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccDh/wOH/A4f8Dh/wAAAAAAAD4AAPgAA+AADgAAOAAA4AADgAAP//A//8D//wP//AAAAAAAAP//A//8D//wP//A4ccDhxwOHHA4ccD//wP//A//8D//wAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA//8D//wP//A//8AAAAAAAAOA4A4DgDgOAOA4AAAAAAAAOA/A4H8DgfwOA/AAAAAAAAB4AAPwAA/AAD8AAf4ABzgAPPAA8cAHh4AAAAAAAAAAAAHHAAccABxwAHHAAccABxwAHHAAccABxwAHHAAAAAAAAAOHAA4cADzwAPPAAf4AB/gAD8AAPwAAeAAB4AAAAAAAAA+AAD4AAPgAA+ecDh9wOH3A4fcDhwAP/AA/8AD/wAP/AAAAAAAAAP//4///j//+P//44ADjn/OOf845/zjnHOP8c4//zj//OP/84AAAAAAAP//A//8D//wP//A4cADhwAOHAA4cAD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA//8D//wP9/A/j8AAAAAAAA//8D//wP//A//8DgBwOAHA4AcDgBwOAHA4AcDgBwOAHAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA8A8D//wH/+AP/wAf+AAAAAAAAD//wP//A//8D//wOHHA4ccDhxwOHHA4ccDhxwOAHA4AcAAAAAAAA//8D//wP//A//8DhwAOHAA4cADhwAOHAA4cADgAAOAAAAAAD//wP//A//8D//wOAHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA//8D//wP//A//8ABwAAHAAAcAABwAP//A//8D//wP//AAAAAAAAP//A//8D//wP//AAAAAAAAOAHA4AcDgBwOAHA4AcDgBwOAHA//8D//wP//A//8AAAAAAAA//8D//wP//A//8AHwAA/AAP8AB/wAPn/A8f8DB/wIH/AAAAAAAAP//A//8D//wP//AAAcAABwAAHAAAcAABwAAHAAAAAAAAP//A//8D//wP//Af8AAP+AAH/AAD8AAHwAD/AB/wAf8AP+AA//8D//wP//AAAAAAAAP//A//8D//wP//AfwAAfwAAfwAAfwAAfwP//A//8D//wAAAAAAAAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//wP//A//8D//wAAAAAAAD//wP//A//8D//wOHAA4cADhwAOHAA/8AD/wAP/AA/8AAAAAP//A//8D//wP//A4AcDgBwOAHA4AcD//+P//4///j//+AAA4AADgAAAP//A//8D//wP//A4eADh+AOH8A4f4D/3wP/HA/8MD/wQAAAAAAAD/xwP/HA/8cD/xwOHHA4ccDhxwOHHA4f8Dh/wOH/A4f8AAAAAAAA4AADgAAOAAA//8D//wP//A//8DgAAOAAA4AADgAAAAAA//8D//wP//A//8AABwAAHAAAcAABwP//A//8D//wP//AAAADAAAPgAA/wAD/4AB/8AA/8AAfwAB/AA/8Af+AP/AA/wAD4AAMAAA4AAD+AAP/gA//8AH/wAB/AAf8Af/wP/4A/4AD/gAP/4AH/8AB/wAB/AB/8D//wP/gA/gADgAAIABA4AcDwDwPw/Afn4Af+AA/wAD/AA//AH5+A/D8DwDwOAHAgAEAAAAP/AA/8AD/wAP/AAAf8AB/wAH/AAf8D/wAP/AA/8AD/wAAAAAAAADh/wOH/A4f8Dh/wOHHA4ccDhxwOHHA/8cD/xwP/HA/8cAAAAAAAAf//9///3///f//9wAA3AADcAAMAAAOAAA/gAD/wAH/8AB/8AA/wAAPAAAEAAAAHAADcAANwAB3///f//9///wAA"), 32, atob("BwYLDg4UDwYJCQwMBgkGCQ4MDg4ODg4NDg4GBgwMDA4PDg4ODg4NDg4GDQ4MEg8ODQ8ODgwODhQODg4ICQg="), 22+(scale<<8)+(1<<16));
}; };
const SETTINGS_FILE = "pebbleDistance.json"; const SETTINGS_FILE = "pbd.json";
let settings; let settings;
function loadSettings() { function loadSettings() {
@ -23,22 +23,22 @@ const ha = 2*h/5 - 11;
const h2 = 3*h/5 - 19; const h2 = 3*h/5 - 19;
const h3 = 7*h/8 - 10; const h3 = 7*h/8 - 10;
let batteryWarning = false; let batWarn = false;
function draw() { function draw() {
let date = new Date(); let date = new Date();
let da = date.toString().split(" "); let da = date.toString().split(" ");
let timeStr = da[4].substr(0,5); let timeStr = da[4].substr(0,5);
const t = 6; const t = 6;
const stps = getSteps(); const stp = getSteps();
// turn the warning on once we have dipped below 15% // turn the warning on once we have dipped below 15%
if (E.getBattery() < 15) if (E.getBattery() < 15)
batteryWarning = true; batWarn = true;
// turn the warning off once we have dipped above 20% // turn the warning off once we have dipped above 20%
if (E.getBattery() > 20) if (E.getBattery() > 20)
batteryWarning = false; batWarn = false;
g.reset(); g.reset();
g.setColor(settings.bg); g.setColor(settings.bg);
@ -57,16 +57,16 @@ function draw() {
g.setFontLECO1976Regular22(); g.setFontLECO1976Regular22();
g.setFontAlign(0, -1); g.setFontAlign(0, -1);
g.drawString(da[0].toUpperCase(), w/4, ha); // day of week g.drawString(da[0].toUpperCase(), w/4, ha); // day of week
g.drawString(stps, 3*w/4, ha); g.drawString(stp, 3*w/4, ha);
// time // time
// white on red for battery warning // white on red for battery warning
g.setColor(!batteryWarning ? g.theme.bg : '#f00'); g.setColor(!batWarn ? g.theme.bg : '#f00');
g.fillRect(0, h2, w, h3); g.fillRect(0, h2, w, h3);
g.setFontLECO1976Regular42(); g.setFontLECO1976Regular42();
g.setFontAlign(0, -1); g.setFontAlign(0, -1);
g.setColor(!batteryWarning ? g.theme.fg : '#fff'); g.setColor(!batWarn ? g.theme.fg : '#fff');
g.drawString(timeStr, w/2, h2 + 8); g.drawString(timeStr, w/2, h2 + 8);
// contrast bar // contrast bar
@ -80,7 +80,7 @@ function draw() {
g.setColor(settings.bg); g.setColor(settings.bg);
g.drawImage(img, w/2 + ((w/2) - 64)/2, -2, { scale: 1 }); g.drawImage(img, w/2 + ((w/2) - 64)/2, -2, { scale: 1 });
drawCalendar(((w/2) - 42)/2, 11, 42, 4, da[2]); drawCalendar(((w/2) - 42)/2, 11, 42, 4, da[2]);
g.drawString((stps / 1000 * settings.avStep).toFixed(2) + ' KM', w/2, ha + 107); g.drawString((stp / 1000 * settings.avStep).toFixed(2) + ' KM', w/2, ha + 107);
} }
// at x,y width:wi thicknes:th // at x,y width:wi thicknes:th

View File

@ -1 +1 @@
require("heatshrink").decompress(atob("q9XwgVShOZAAg+hFAwtiFJYsdFJwsbFKAAByBUnLDAqVFagpVQigqXFaJ/WQiYqbFZwqcFZoqdFZgqeFZYqfFZQqgFZIqhFZIqhyAqpFZAqiFY6siVw4qkFYoqlFYoqlVwgqlFYiBmQQYqnKwYqmFYZWnQQQqoFYQqoQQJWqFVIrBFVOQK35W/AAIqUmc5zOTmeYAoQGCAgQAbz/zAQP/xOP/4mC///NbwkByYCBzH/GIOZF4P5Kz4nBEQImB/CBBK0QqCFwM/QQIDBK0BRCKwP4KQIDDKzwABxJWCFAOT+ZWgFYRWC/KCB/+DKyKYCKxfzx/zKwRYCFwJWCLgIqMHpitBCAKuBQAJeBQYIYDHQIqMKxs5KIP5AQOJIIRWEFZYqOKwQeBnJWBFoM5KwgrLFRxWCbgWIKwOTQ4JWDFY8JFSQAQFYsAFUYrFyBWCFUIrFKwQqiFYhWCFQPzmYAgEgRWBhOP/4Al/EAgGYFU3/wBWBRAP/QMMzEgM5KwIrCcAQAffoQqBgDgEFUWQFcwqCzIqChIriFQxWBFcIqDQIYriFRCCBFb4qDQIgrF/Iqaz4qIFYhWdFRCuCAEKsEFcoqHFcQqIVwQAfFQ4riFRArhFRIrgFRQrfFRYreFRgrdFRorcFRwABFLGQFSArYFSSEXFKQrXFSiEUP6ZYVFLAsRFLQsOFLotKDKQA=")) require("heatshrink").decompress(atob("q9XwgVShOZAAg+hFAwtiFJYsdFJwsbFKAAByBUnLDAqVFagpVQigqXFaJ/WQiYqbFZwqcFZoqdFZgqeFZYqfFZQqgFZIqhFZIqhyAqpFZAqiFY6siVw4qkFYoqlFYoqlVwgqlFYiBmQQYqnKwYqmFYZWnQQQqoFYQqoQQJWqFVIrBFVOQK35W/AAIqUmc5zOTmeYAoQGCAgQAbz/zAQP/xOP/4mC///NbwkByYCBzH/GIOZF4P5Kz4nBEQImB/CBBK0QqCFwM/QQIDBK0BRCKwP4KQIDDKzwABxJWCFAOT+ZWgFYRWC/KCB/+DKyKYCKxfzx/zKwRYCFwJWCLgIqMHpitBCAKuBQAJeBQYIYDHQIqMKxs5KIP5AQOJIIRWEFZYqOKwQeBnJWBFoM5KwgrLFRxWCbgWIKwOTQ4JWDFY8JFSQAQFYsAFUYrFyBWCFUIrFKwQqiFYhWCFQPzmYAgEgRWBhOP/4Al/EAgGYFU3/wBWBRAP/QMMzEgM5KwIrCcAQAffoQqBgDgEFUWQFcwqCzIqChIriFQxWBFcIqDQIYriFRCCBFb4qDQIgrF/Iqaz4qIFYhWdFRCuCAEKsEFcoqHFcQqIVwQAfFQ4riFRArhFRIrgFRQrfFRYreFRgrdFRorcFRwABFLGQFSArYFSSEXFKQrXFSiEUP6ZYVFLAsRFLQsOFLotKDKQA="));

View File

@ -1,8 +1,8 @@
(function(back) { (function(back) {
const SETTINGS_FILE = "pebbleDistance.json"; const SETTINGS_FILE = "pbd.json";
// initialize with default settings... // initialize with default settings...
let s = {'bg': '#0f0', 'color': 'Green', 'avStep': 0.75}}; let s = {'bg': '#0f0', 'color': 'Green', 'avStep': 0.75};
// ...and overwrite them with any saved values // ...and overwrite them with any saved values
// This way saved values are preserved if a new version adds more settings // This way saved values are preserved if a new version adds more settings
@ -10,13 +10,13 @@
let settings = storage.readJSON(SETTINGS_FILE, 1) || s; let settings = storage.readJSON(SETTINGS_FILE, 1) || s;
const saved = settings || {}; const saved = settings || {};
for (const key in saved) { for (const key in saved) {
s[key] = saved[key] s[key] = saved[key];
}; }
function save() { function save() {
settings = s; settings = s;
storage.write(SETTINGS_FILE, settings); storage.write(SETTINGS_FILE, settings);
}; }
var color_options = ['Green','Orange','Cyan','Purple','Red','Blue']; var color_options = ['Green','Orange','Cyan','Purple','Red','Blue'];
var bg_code = ['#0f0','#ff0','#0ff','#f0f','#f00','#00f']; var bg_code = ['#0f0','#ff0','#0ff','#f0f','#f00','#00f'];