Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Fix merge conflict

master
Ivor Hewitt 2021-12-30 06:08:22 +00:00
parent 233e94d1f7
commit 3b7f47d17b
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/coretemp/coretemp.js
View File

@ -20,11 +20,7 @@ var corelogo = {
function onCore(c) { function onCore(c) {
// Large or small font // Large or small font
<<<<<<< HEAD
var sz = ((process.env.HWVERSION == 1) ? 3 : 2); var sz = ((process.env.HWVERSION == 1) ? 3 : 2);
=======
sz = (process.env.HWVERSION == 1) ? 3 : 2;
>>>>>>> 9acf9c89e2a1e1bef8716d44661cf6dcf3ff232b
g.setFontAlign(0, 0); g.setFontAlign(0, 0);
g.clearRect(0, 32 + 48, g.getWidth(), 32 + 48 + 24 * 4); g.clearRect(0, 32 + 48, g.getWidth(), 32 + 48 + 24 * 4);
@ -60,11 +56,7 @@ Bangle.on('CoreTemp', onCore);
settings = require("Storage").readJSON("coretemp.json", 1) || {}; settings = require("Storage").readJSON("coretemp.json", 1) || {};
if (!settings.enabled) { if (!settings.enabled) {
<<<<<<< HEAD
drawBackground("Sensor off\nBTN" + drawBackground("Sensor off\nBTN" +
=======
drawBackground("Sensor disabled\nBTN" +
>>>>>>> 9acf9c89e2a1e1bef8716d44661cf6dcf3ff232b
((process.env.HWVERSION == 1) ? '2' : '1') + " to enable"); ((process.env.HWVERSION == 1) ? '2' : '1') + " to enable");
} else { } else {
drawBackground("Waiting for\ndata..."); drawBackground("Waiting for\ndata...");