diff --git a/.gitmodules b/.gitmodules index 24fe182d73..f0fd7431a8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -199,6 +199,10 @@ path = Sming/Libraries/GoogleCast url = https://github.com/slaff/Sming-GoogleCast.git ignore = dirty +[submodule "Libraries.Graphics"] + path = Sming/Libraries/Graphics + url = https://github.com/mikee47/Sming-Graphics + ignore = dirty [submodule "Libraries.HardwareSPI"] path = Sming/Libraries/HardwareSPI url = https://github.com/mikee47/HardwareSPI diff --git a/Sming/Components/FlashString b/Sming/Components/FlashString index de5a90ea74..a443c0bc49 160000 --- a/Sming/Components/FlashString +++ b/Sming/Components/FlashString @@ -1 +1 @@ -Subproject commit de5a90ea74a8214a4b3b2001bcf64be38d40071f +Subproject commit a443c0bc49fbc74300d1082e1270400d7f6a9010 diff --git a/Sming/Components/Storage/Tools/hwconfig/common.py b/Sming/Components/Storage/Tools/hwconfig/common.py index 37ee625a89..8b644def8d 100644 --- a/Sming/Components/Storage/Tools/hwconfig/common.py +++ b/Sming/Components/Storage/Tools/hwconfig/common.py @@ -2,10 +2,12 @@ # Common functions and definitions # -import sys, json, platform -from rjsmin import jsmin +import os, sys, json, platform from collections import OrderedDict +sys.path.insert(1, os.path.expandvars('${SMING_HOME}/../Tools/Python')) +from rjsmin import jsmin + quiet = False def status(msg): diff --git a/Sming/Core/Data/Range.h b/Sming/Core/Data/Range.h index 136deb05e5..2a07c238b2 100644 --- a/Sming/Core/Data/Range.h +++ b/Sming/Core/Data/Range.h @@ -105,3 +105,8 @@ template struct TRange { return s; } }; + +template inline String toString(TRange range) +{ + return range.toString(); +} diff --git a/Sming/Libraries/Graphics b/Sming/Libraries/Graphics new file mode 160000 index 0000000000..2375f5fa3c --- /dev/null +++ b/Sming/Libraries/Graphics @@ -0,0 +1 @@ +Subproject commit 2375f5fa3c8cc92727968fa2c983a6d799220373 diff --git a/Sming/Libraries/HardwareSPI b/Sming/Libraries/HardwareSPI index 83d9b42dd2..7a5e89bf2d 160000 --- a/Sming/Libraries/HardwareSPI +++ b/Sming/Libraries/HardwareSPI @@ -1 +1 @@ -Subproject commit 83d9b42dd258ab41193aca47b7020c1ebd6458a9 +Subproject commit 7a5e89bf2dfcb189f7a4cc1ace86706aa5b0ead0 diff --git a/Sming/Libraries/TFT_S1D13781 b/Sming/Libraries/TFT_S1D13781 index 4940599366..673acb185c 160000 --- a/Sming/Libraries/TFT_S1D13781 +++ b/Sming/Libraries/TFT_S1D13781 @@ -1 +1 @@ -Subproject commit 49405993668fc4dfbd51109e836f3eaa7b0b838f +Subproject commit 673acb185c8e9a9d68e3d27367b39fa45e168dd3 diff --git a/Tools/Python/README.rst b/Tools/Python/README.rst new file mode 100644 index 0000000000..a8847b925a --- /dev/null +++ b/Tools/Python/README.rst @@ -0,0 +1,7 @@ +This directory is for commonly-used python modules. Example usage: + + import os, sys + + sys.path.insert(1, os.path.expandvars('${SMING_HOME}/../Tools/Python')) + + from rjsmin import jsmin diff --git a/Sming/Components/Storage/Tools/hwconfig/rjsmin.py b/Tools/Python/rjsmin.py similarity index 100% rename from Sming/Components/Storage/Tools/hwconfig/rjsmin.py rename to Tools/Python/rjsmin.py diff --git a/Tools/install.sh b/Tools/install.sh index 562035069a..e998967777 100755 --- a/Tools/install.sh +++ b/Tools/install.sh @@ -93,7 +93,12 @@ if [ -n "$APPVEYOR" ] || [ -n "$GITHUB_ACTION" ]; then $PKG_INSTALL \ clang-format-8 \ g++-9-multilib \ - python3-setuptools + python3-setuptools \ + fonts-ubuntu \ + fonts-noto-mono \ + xfonts-base \ + fonts-urw-base35 \ + fonts-droid-fallback sudo update-alternatives --set gcc /usr/bin/gcc-9 diff --git a/Tools/vscode/setup.py b/Tools/vscode/setup.py index 3576b36451..a183d6f18d 100644 --- a/Tools/vscode/setup.py +++ b/Tools/vscode/setup.py @@ -210,7 +210,7 @@ def main(): sys.exit(1) # So we can find rjsmin.py - sys.path.append(os.path.join(env['SMING_HOME'], 'Components/Storage/Tools/hwconfig')) + sys.path.append(os.path.join(env['SMING_HOME'], '../Tools/Python')) update_intellisense() update_tasks()