aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authordiscip <[email protected]>2021-09-28 03:40:07 +0200
committerGitHub <[email protected]>2021-09-28 11:40:07 +1000
commit66cf63e0487364a79dae16a6dca3052a4dae2a55 (patch)
tree462390bf5acb82dcad10745c170ecbf6050366be
parentfa4b2fbe9bb845745e3d9e41027b84d2254ba86a (diff)
downloadIronOS-66cf63e0487364a79dae16a6dca3052a4dae2a55.tar.gz
IronOS-66cf63e0487364a79dae16a6dca3052a4dae2a55.zip
jpg -> png | fixed value alignment for PD timeout (#1086)
* Delete Development Resources/Images directory * jpg -> png * fix value alignment for PD timeout * Delete 001_TS80.png * replace TS80 logo
-rw-r--r--Bootup Logo/Logos/001_TS80.pngbin15423 -> 231 bytes
-rw-r--r--Development Resources/Images/Calibration.jpgbin687 -> 0 bytes
-rw-r--r--Development Resources/Images/Calibration.pngbin0 -> 168 bytes
-rw-r--r--Development Resources/Images/Calibration_II.pngbin0 -> 2839 bytes
-rw-r--r--Development Resources/Images/Power.jpgbin1082 -> 0 bytes
-rw-r--r--Development Resources/Images/Power.pngbin0 -> 204 bytes
-rw-r--r--Development Resources/Images/Settings.jpgbin704 -> 0 bytes
-rw-r--r--Development Resources/Images/Settings.pngbin0 -> 168 bytes
-rw-r--r--Development Resources/Images/Sleep.jpgbin736 -> 0 bytes
-rw-r--r--Development Resources/Images/Sleep.pngbin0 -> 168 bytes
-rw-r--r--Development Resources/Images/Soldering.jpgbin713 -> 0 bytes
-rw-r--r--Development Resources/Images/Soldering.pngbin0 -> 174 bytes
-rw-r--r--Development Resources/Images/UI.jpgbin722 -> 0 bytes
-rw-r--r--Development Resources/Images/UI.pngbin0 -> 144 bytes
-rw-r--r--source/Core/Src/gui.cpp2
15 files changed, 1 insertions, 1 deletions
diff --git a/Bootup Logo/Logos/001_TS80.png b/Bootup Logo/Logos/001_TS80.png
index c3322812..98bef1b8 100644
--- a/Bootup Logo/Logos/001_TS80.png
+++ b/Bootup Logo/Logos/001_TS80.png
Binary files differ
diff --git a/Development Resources/Images/Calibration.jpg b/Development Resources/Images/Calibration.jpg
deleted file mode 100644
index 5ecf35a8..00000000
--- a/Development Resources/Images/Calibration.jpg
+++ /dev/null
Binary files differ
diff --git a/Development Resources/Images/Calibration.png b/Development Resources/Images/Calibration.png
new file mode 100644
index 00000000..6216d913
--- /dev/null
+++ b/Development Resources/Images/Calibration.png
Binary files differ
diff --git a/Development Resources/Images/Calibration_II.png b/Development Resources/Images/Calibration_II.png
new file mode 100644
index 00000000..0456271d
--- /dev/null
+++ b/Development Resources/Images/Calibration_II.png
Binary files differ
diff --git a/Development Resources/Images/Power.jpg b/Development Resources/Images/Power.jpg
deleted file mode 100644
index 340b2bce..00000000
--- a/Development Resources/Images/Power.jpg
+++ /dev/null
Binary files differ
diff --git a/Development Resources/Images/Power.png b/Development Resources/Images/Power.png
new file mode 100644
index 00000000..89ccae7c
--- /dev/null
+++ b/Development Resources/Images/Power.png
Binary files differ
diff --git a/Development Resources/Images/Settings.jpg b/Development Resources/Images/Settings.jpg
deleted file mode 100644
index eca8e3ea..00000000
--- a/Development Resources/Images/Settings.jpg
+++ /dev/null
Binary files differ
diff --git a/Development Resources/Images/Settings.png b/Development Resources/Images/Settings.png
new file mode 100644
index 00000000..c5c33c78
--- /dev/null
+++ b/Development Resources/Images/Settings.png
Binary files differ
diff --git a/Development Resources/Images/Sleep.jpg b/Development Resources/Images/Sleep.jpg
deleted file mode 100644
index 0ed234c4..00000000
--- a/Development Resources/Images/Sleep.jpg
+++ /dev/null
Binary files differ
diff --git a/Development Resources/Images/Sleep.png b/Development Resources/Images/Sleep.png
new file mode 100644
index 00000000..4f6e3ac8
--- /dev/null
+++ b/Development Resources/Images/Sleep.png
Binary files differ
diff --git a/Development Resources/Images/Soldering.jpg b/Development Resources/Images/Soldering.jpg
deleted file mode 100644
index 9f5ae3ba..00000000
--- a/Development Resources/Images/Soldering.jpg
+++ /dev/null
Binary files differ
diff --git a/Development Resources/Images/Soldering.png b/Development Resources/Images/Soldering.png
new file mode 100644
index 00000000..4d71ef73
--- /dev/null
+++ b/Development Resources/Images/Soldering.png
Binary files differ
diff --git a/Development Resources/Images/UI.jpg b/Development Resources/Images/UI.jpg
deleted file mode 100644
index 65805621..00000000
--- a/Development Resources/Images/UI.jpg
+++ /dev/null
Binary files differ
diff --git a/Development Resources/Images/UI.png b/Development Resources/Images/UI.png
new file mode 100644
index 00000000..843a3864
--- /dev/null
+++ b/Development Resources/Images/UI.png
Binary files differ
diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp
index c1d25689..9c023816 100644
--- a/source/Core/Src/gui.cpp
+++ b/source/Core/Src/gui.cpp
@@ -344,7 +344,7 @@ static void settings_displayPDNegTimeout(void) {
if (value == 0) {
OLED::print(translatedString(Tr->OffString), FontStyle::LARGE);
} else {
- OLED::printNumber(value, 2, FontStyle::LARGE);
+ OLED::printNumber(value, 3, FontStyle::LARGE);
}
}
#endif