Fix console build and create new image

diff --git a/Console/Makefile b/Console/Makefile
index 4b7f7d8b537bfa5ef77d5ff61eaaaf73acec23a6..e782db05c362da7be9e49abe15a7f759f2c06ee2 100644 (file)
--- a/Console/Makefile
+++ b/Console/Makefile
@@ -1,5 +1,6 @@
+# These paths will have to be changed according to where you store these directories on your system
 PATH_RETICULUM_WEBSITE=../../sites/reticulum.network
-PATH_PACKAGES=../../dist_archive
+PATH_PACKAGES=../../../rns_build
 
 clean:
        @echo Cleaning...
@@ -21,7 +22,7 @@ pages-debug:
 
 sourcepack:
        @echo Packing firmware sources...
-       cd .. && zip -r build/pkg/rnode_firmware.zip * -x Builds/\* Console/\* Documentation/images/\* Documentation/RNode_v1_Manual.pdf Graphics/\* Python\ Module/\* Release/\* build/\* partition_hashes
+       cd .. && zip -r Console/build/pkg/rnode_firmware.zip * -x Builds/\* Console/\* Documentation/images/\* Documentation/RNode_v1_Manual.pdf Documentation/rnfw_1.jpg Graphics/\* Python\ Module/\* Release/\* build/\* partition_hashes
        
 data:
        @echo Including assets...
@@ -29,7 +30,7 @@ data:
        @cp assets/gfx/* build/gfx/
        @cp assets/images/* build/images/
        @cp assets/stl/* build/3d/
-       #@cp assets/pkg/* build/pkg/
+       # @cp assets/pkg/* build/pkg/
        # @cp assets/scripts/* build/scripts/
        # @cp -r ../../Reticulum/docs/manual/* build/reticulum_manual/
        # @cp -r ../../Reticulum/docs/Reticulum\ Manual.pdf build/reticulum_manual/

diff --git a/Console/build.py b/Console/build.py
index a3a6b0bb98ba1a6c235f3112f3edd74393e4f215..a3f3225e96e950d515a7848ea44b366b8caf36f0 100644 (file)
--- a/Console/build.py
+++ b/Console/build.py
@@ -5,16 +5,19 @@ import shutil
 
 packages = {
     "rns": "rns-0.9.1-py3-none-any.whl",
-    "nomadnet": "nomadnet-0.5.7-py3-none-any.whl",
-    "lxmf": "lxmf-0.6.0-py3-none-any.whl",
+    "nomadnet": "nomadnet-0.6.0-py3-none-any.whl",
+    "lxmf": "lxmf-0.6.2-py3-none-any.whl",
     "rnsh": "rnsh-0.1.5-py3-none-any.whl",
 }
 
 DEFAULT_TITLE = "RNode Bootstrap Console"
 SOURCES_PATH="./source"
 BUILD_PATH="./build"
-PACKAGES_PATH = "../../dist_archive"
+
+# These paths may have to be changed depending on where you store these directories on your system
+PACKAGES_PATH = "../../../rns_build"
 RNS_SOURCE_PATH = "../../Reticulum"
+
 INPUT_ENCODING="utf-8"
 OUTPUT_ENCODING="utf-8"
 
@@ -174,7 +177,7 @@ mf.write(help_redirect)
 mf.close()
 
 def optimise_manual(path):
-    pm = 90
+    pm = 45
     scale_imgs = [
         ("_images/board_rnodev2.png", pm),
         ("_images/board_rnode.png", pm),

diff --git a/Release/console_image.bin b/Release/console_image.bin
index 8fb621b57760363a5fa878a17ce9a0143576fde5..09d355d1f02d0b862adb0d1b5ff64d583008f636 100644 (file)
Binary files a/Release/console_image.bin and b/Release/console_image.bin differ