Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

degree symbol replaced #3461

Merged
merged 5 commits into from
Jun 20, 2024
Merged

degree symbol replaced #3461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d75f9a
Update lcars.app.js
lawern Jun 19, 2024
5293aaa
Update version
lawern Jun 19, 2024
cabc4cf
Update ChangeLog
lawern Jun 19, 2024
dce1fcd
replace ° by '
lawern Jun 19, 2024
e81cf2a
Merge branch 'espruino:master' into master
lawern Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/lcars/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
0.28: Battery Vref implemented correctly.
0.29: Support fastload.
0.30: Add many new colors to the settings and allows random colors on startup if enabled.
0.31: Replace degree symbol in temperature by '.
2 changes: 1 addition & 1 deletion apps/lcars/lcars.app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@


//Colors to use
var color_options = [

Check warning on line 28 in apps/lcars/lcars.app.js

View workflow job for this annotation

GitHub Actions / build 

'color_options' is assigned a value but never used
'Green', 'Orange', 'Cyan', 'Purple', 'Red', 'Blue', 'Yellow', 'White',
'Purple', 'Pink', 'Light Green', 'Brown', 'Turquoise', 'Magenta', 'Lime',
'Gold', 'Sky Blue', 'Rose', 'Lavender', 'Amber', 'Indigo', 'Teal',
Expand Down Expand Up @@ -94,9 +94,9 @@
}

// Converting colors to the correct format.
color1C = convert24to16(color1);

Check warning on line 97 in apps/lcars/lcars.app.js

View workflow job for this annotation

GitHub Actions / build 

'color1C' is not defined
color2C = convert24to16(color2);

Check warning on line 98 in apps/lcars/lcars.app.js

View workflow job for this annotation

GitHub Actions / build 

'color2C' is not defined
color3C = convert24to16(color3);

Check warning on line 99 in apps/lcars/lcars.app.js

View workflow job for this annotation

GitHub Actions / build 

'color3C' is not defined
};

// Function to get a random color from the bg_code array.
Expand Down Expand Up @@ -153,10 +153,10 @@

let colorPalette = new Uint16Array([//Used to change the color of the image if the user selects a color that is diffrent than the default.
0x0000, // not used
color2C, // second

Check warning on line 156 in apps/lcars/lcars.app.js

View workflow job for this annotation

GitHub Actions / build 

'color2C' is not defined
color3C, // third

Check warning on line 157 in apps/lcars/lcars.app.js

View workflow job for this annotation

GitHub Actions / build 

'color3C' is not defined
0x0000, // not used
color1C, // first

Check warning on line 159 in apps/lcars/lcars.app.js

View workflow job for this annotation

GitHub Actions / build 

'color1C' is not defined
0x0000, // not used
0x0000, // not used
0x0000, // not used
Expand Down Expand Up @@ -290,9 +290,9 @@
g.drawString(text, 135, y);

// Plot text
width = g.stringWidth(value);

Check warning on line 293 in apps/lcars/lcars.app.js

View workflow job for this annotation

GitHub Actions / build 

'width' is not defined
g.setColor(cBlack);
g.fillRect(130-width-8, y-2, 130, y+18);

Check warning on line 295 in apps/lcars/lcars.app.js

View workflow job for this annotation

GitHub Actions / build 

'width' is not defined
g.setColor(c);
g.setFontAlign(1,-1,0);
g.drawString(value, 126, y);
Expand Down Expand Up @@ -678,7 +678,7 @@
let weather = weatherJson.weather;

// Temperature
weather.temp = locale.temp(weather.temp-273.15);
weather.temp = locale.temp(weather.temp-273.15).replace('°', '\'');

// Humidity
weather.hum = weather.hum + "%";
Expand Down
2 changes: 1 addition & 1 deletion apps/lcars/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "LCARS Clock",
"shortName":"LCARS",
"icon": "lcars.png",
"version":"0.30",
"version":"0.31",
"readme": "README.md",
"supports": ["BANGLEJS2"],
"description": "Library Computer Access Retrieval System (LCARS) clock.",
Expand Down
Loading