bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update app.js 

Added default 'none' for when there is no tolerance value provided
Added back missing code for using multiplied value from menu for generating colors
master
stweedo 2023-05-15 22:49:15 -05:00 committed by GitHub
parent 32c27fb918
commit 7cc763db1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/rescalc/app.js
View File

@ -83,7 +83,7 @@ function colorBandsToResistance(colorBands) {
let firstBand = colorBands[0]; let firstBand = colorBands[0];
let secondBand = colorBands[1]; let secondBand = colorBands[1];
let multiplierBand = colorBands[2]; let multiplierBand = colorBands[2];
let toleranceBand = colorBands[3]; let toleranceBand = colorBands[3] || 'none'; // Add a default value for toleranceBand
let significantDigits = colorData[firstBand].value * 10 + colorData[secondBand].value; let significantDigits = colorData[firstBand].value * 10 + colorData[secondBand].value;
let multiplier = colorData[multiplierBand].multiplier; let multiplier = colorData[multiplierBand].multiplier;
let resistance = significantDigits * multiplier; let resistance = significantDigits * multiplier;
@ -225,7 +225,7 @@ function drawResistance(resistance, tolerance) {
tolerance = 20; tolerance = 20;
} }
var toleranceStr = "±" + tolerance + "%"; var toleranceStr = "±" + tolerance + "%";
var toleranceX = tolerance.toString().replace('.', '').length > 2 ? 10 : 14; var toleranceX = tolerance.toString().replace('.', '').length > 2 ? 10 : 14;
g.drawString(toleranceStr.padEnd(4), 176 - toleranceX, y); g.drawString(toleranceStr.padEnd(4), 176 - toleranceX, y);
} }
@ -419,9 +419,9 @@ function drawResistance(resistance, tolerance) {
E.showMenu(toleranceMenu); E.showMenu(toleranceMenu);
} }
function drawResistorAndResistance(resistance, tolerance) { function drawResistorAndResistance(resistance, tolerance, multipliedResistance) {
console.log('Draw Resistor clicked'); console.log('Draw Resistor clicked');
let colorBands = resistanceToColorBands((settings.resistance * settings.multiplier), settings.tolerance); let colorBands = resistanceToColorBands(multipliedResistance || resistance, tolerance);
drawResistor(colorBands, tolerance); drawResistor(colorBands, tolerance);
drawResistance(resistance, tolerance); drawResistance(resistance, tolerance);
resetSettings(); resetSettings();
@ -462,7 +462,7 @@ function drawResistance(resistance, tolerance) {
let formattedResistance = formatResistance(multipliedValue); let formattedResistance = formatResistance(multipliedValue);
let resistanceString = `${formattedResistance.value}${formattedResistance.unit}`; let resistanceString = `${formattedResistance.value}${formattedResistance.unit}`;
if (settings.tolerance) { if (settings.tolerance) {
return `${resistanceString}, ± ${settings.tolerance}%`; return `${resistanceString}, ± ${settings.tolerance}%`;
} else { } else {
return v ? `${resistanceString}` : ''; return v ? `${resistanceString}` : '';
} }
@ -508,4 +508,4 @@ function drawResistance(resistance, tolerance) {
}, },
}; };
E.showMenu(mainMenu); E.showMenu(mainMenu);
})(load); })(load);