diff --git a/Console/build.py b/Console/build.py index 3200d63..a6932a8 100644 --- a/Console/build.py +++ b/Console/build.py @@ -4,9 +4,9 @@ import sys import shutil packages = { - "rns": "rns-1.0.0-py3-none-any.whl", - "nomadnet": "nomadnet-0.8.0-py3-none-any.whl", - "lxmf": "lxmf-0.8.0-py3-none-any.whl", + "rns": "rns-1.0.3-py3-none-any.whl", + "nomadnet": "nomadnet-0.9.1-py3-none-any.whl", + "lxmf": "lxmf-0.9.3-py3-none-any.whl", "rnsh": "rnsh-0.1.5-py3-none-any.whl", } @@ -37,7 +37,7 @@ document_start = """ document_end = """""" -menu_md = """
[Start]({CONTENT_PATH}index.html) | [Replicate]({CONTENT_PATH}replicate.html) | [Software]({CONTENT_PATH}software.html) | [Learn]({CONTENT_PATH}learn.html) | [Help](help.html) | [Contribute]({CONTENT_PATH}contribute.html)
""" +menu_md = """
[Start]({CONTENT_PATH}index.html) | [Replicate]({CONTENT_PATH}replicate.html) | [Software]({CONTENT_PATH}software.html) | [Learn]({CONTENT_PATH}learn.html) | [Help](help.html) | [Contribute]({CONTENT_PATH}contribute.html)
""" manual_redirect = """ @@ -150,8 +150,8 @@ def generate_html(f, root_path): print("Found topic: "+str(topic)+", rt "+str(rt)) md = md.replace(rt, tl) - menu_html = markdown.markdown(menu_md.replace("{CONTENT_PATH}", root_path), extensions=["markdown.extensions.fenced_code", "sane_lists"]).replace("

", "") - page_html = markdown.markdown(md, extensions=["markdown.extensions.fenced_code"]).replace("{ASSET_PATH}", root_path) + menu_html = markdown.markdown(menu_md.replace("{CONTENT_PATH}", root_path), extensions=["md_in_html", "markdown.extensions.fenced_code", "sane_lists"]).replace("

", "") + page_html = markdown.markdown(md, extensions=["md_in_html", "markdown.extensions.fenced_code"]).replace("{ASSET_PATH}", root_path) page_html = page_html.replace("{LXMF_ADDRESS}", LXMF_ADDRESS) for pkg_name in packages: page_html = page_html.replace("{PKG_"+pkg_name+"}", "pkg/"+pkg_name+".zip") @@ -174,12 +174,13 @@ mf.write(help_redirect) mf.close() def optimise_manual(path): - pm = 200 + pm = 180 scale_imgs = [ ("_images/board_rnodev2.png", pm), ("_images/board_rnode.png", pm), ("_images/board_heltec32v20.png", pm), ("_images/board_heltec32v30.png", pm), + ("_images/board_heltec32v4.png", pm), ("_images/board_t3v21.png", pm), ("_images/board_t3v20.png", pm), ("_images/board_t3v10.png", pm), diff --git a/Console/source/s_sideband.md b/Console/source/s_sideband.md index f903e5e..5b06d2f 100644 --- a/Console/source/s_sideband.md +++ b/Console/source/s_sideband.md @@ -1,8 +1,8 @@ [title]: <> (Sideband) ## Sideband -Sideband is an LXMF client for Android, Linux and macOS. It has built-in support for communicating over RNodes, and many other mediums, such as Packet Radio, WiFi, I2P, or anything else Reticulum supports. +Sideband is an LXMF client for Android, Linux, Windows and macOS. It has built-in support for communicating over RNodes, and many other mediums, such as Packet Radio, WiFi, I2P, or anything else Reticulum supports. -Sideband also supports exchanging messages through encrypted QR-codes on paper, or through messages embedded directly in lxm:// links. +Sideband also supports voice calls, file transfers, and exchanging messages through encrypted QR-codes on paper, or through messages embedded directly in lxm:// links. ![Screenshot]({ASSET_PATH}gfx/sideband.webp) @@ -10,4 +10,3 @@ The installation files for the Sideband program is too large to be included on t - The [Sideband page](https://unsigned.io/sideband/) on [unsigned.io](https://unsigned.io/) - The [GitHub release page for Sideband](https://github.com/markqvist/Sideband/releases/latest) -- The [IzzyOnDroid repository for F-Droid](https://android.izzysoft.de/repo/apk/io.unsigned.sideband) diff --git a/Makefile b/Makefile index 758f664..8ba24a9 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ spiffs-image: upload-spiffs: @echo Deploying SPIFFS image... - python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyACM0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin + python ./Release/esptool/esptool.py --chip esp32s3 --port /dev/ttyACM0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin check_bt_buffers: @./esp32_btbufs.py ~/.arduino15/packages/esp32/hardware/esp32/$(ARDUINO_ESP_CORE_VER)/libraries/BluetoothSerial/src/BluetoothSerial.cpp @@ -169,8 +169,8 @@ upload-tbeam_sx1262: arduino-cli upload -p /dev/ttyACM0 --fqbn esp32:esp32:t-beam @sleep 1 rnodeconf /dev/ttyACM0 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.t-beam/RNode_Firmware.ino.bin) - #@sleep 3 - #python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyACM0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin + @sleep 3 + python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyACM0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin upload-lora32_v10: arduino-cli upload -p /dev/ttyUSB0 --fqbn esp32:esp32:ttgo-lora32 @@ -280,9 +280,7 @@ upload-xiao_s3: release: release-all -# release-all: release-heltec_t114 release-techo release-rak4631 release-hashes -# release-all: release-tbeam release-tbeam_sx1262 release-lora32_v10 release-lora32_v20 release-lora32_v21 release-lora32_v10_extled release-lora32_v20_extled release-lora32_v21_extled release-lora32_v21_tcxo release-featheresp32 release-genericesp32 release-heltec32_v2 release-heltec32_v3 release-heltec32_v4 release-heltec32_v2_extled release-rnode_ng_20 release-rnode_ng_21 release-t3s3 release-t3s3_sx127x release-t3s3_sx1280_pa release-tdeck release-tbeam_supreme release-xiao_s3 release-hashes -release-all: release-tbeam release-tbeam_sx1262 release-lora32_v10 release-lora32_v20 release-lora32_v21 release-lora32_v10_extled release-lora32_v20_extled release-lora32_v21_extled release-lora32_v21_tcxo release-featheresp32 release-genericesp32 release-heltec32_v2 release-heltec32_v3 release-heltec32_v4 release-heltec32_v2_extled release-heltec_t114 release-techo release-rnode_ng_20 release-rnode_ng_21 release-t3s3 release-t3s3_sx127x release-t3s3_sx1280_pa release-tdeck release-tbeam_supreme release-rak4631 release-xiao_s3 release-hashes +release-all: console-site spiffs-image release-tbeam release-tbeam_sx1262 release-lora32_v10 release-lora32_v20 release-lora32_v21 release-lora32_v10_extled release-lora32_v20_extled release-lora32_v21_extled release-lora32_v21_tcxo release-featheresp32 release-genericesp32 release-heltec32_v2 release-heltec32_v3 release-heltec32_v4 release-heltec32_v2_extled release-heltec_t114 release-techo release-rnode_ng_20 release-rnode_ng_21 release-t3s3 release-t3s3_sx127x release-t3s3_sx1280_pa release-tdeck release-tbeam_supreme release-rak4631 release-xiao_s3 release-hashes release-hashes: python ./release_hashes.py > ./Release/release.json diff --git a/Release/console_image.bin b/Release/console_image.bin index 264d234..6c39d31 100644 Binary files a/Release/console_image.bin and b/Release/console_image.bin differ