fuzzyw: .replace change

master
aGoodUsername 2024-05-08 10:22:50 +02:00 committed by GitHub
parent 6aa0dc2c5a
commit bb57dfcd63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 12 deletions

View File

@ -58,20 +58,14 @@
let getTimeString = function(date) { let getTimeString = function(date) {
let segment = Math.round((date.getMinutes()*60 + date.getSeconds() + 1)/300); let segment = Math.round((date.getMinutes()*60 + date.getSeconds() + 1)/300);
let hour = date.getHours() + Math.floor(segment/12); let hour = date.getHours() + Math.floor(segment/12);
let f_string = fuzzy_string.minutes[segment % 12]; // add "" to load into RAM due to 2v21 firmware .replace on flashstring issue
for (let i = 0; i < f_string.length; i++) { f_string = ""+fuzzy_string.minutes[segment % 12];
if (f_string.charAt(i) == '$') {
if (f_string.charAt(i+1) == '1') return f_string.slice(0, i) + fuzzy_string.hours[hour % 12] + f_string.slice(i+2);
return f_string.slice(0, i) + fuzzy_string.hours[(hour+1) % 12] + f_string.slice(i+2);
}
}
// the more elegant solution that unfortunately gets optimized to smithereens
/*
if (f_string.includes('$1')) { if (f_string.includes('$1')) {
//return f_string.replace('$1', fuzzy_string.hours[hour % 12]); f_string = f_string.replace('$1', fuzzy_string.hours[(hour) % 12]);
} else { } else {
//return f_string.replace('$2', fuzzy_string.hours[(hour + 1) % 12]); f_string = f_string.replace('$2', fuzzy_string.hours[(hour + 1) % 12]);
}*/ }
return f_string;
}; };
let draw = function() { let draw = function() {