diff --git a/examples/meshtastic/app.pro b/examples/meshtastic/app.pro index a137762..2ea6f63 100644 --- a/examples/meshtastic/app.pro +++ b/examples/meshtastic/app.pro @@ -48,6 +48,7 @@ win32: LIBS += -L../../../platforms/windows/lib macx { QMAKE_INFO_PLIST = platforms/macos/Info.plist + ICON = platforms/macos/Icon.icns } win32 { diff --git a/examples/meshtastic/platforms/macos/Icon.icns b/examples/meshtastic/platforms/macos/Icon.icns new file mode 100644 index 0000000..9af1dc2 Binary files /dev/null and b/examples/meshtastic/platforms/macos/Icon.icns differ diff --git a/examples/meshtastic/platforms/macos/Info.plist b/examples/meshtastic/platforms/macos/Info.plist index 055a24b..3b1ef40 100644 --- a/examples/meshtastic/platforms/macos/Info.plist +++ b/examples/meshtastic/platforms/macos/Info.plist @@ -2,10 +2,12 @@ + CFBundleDisplayName + Mesh SMS CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile - ${ASSETCATALOG_COMPILER_APPICON_NAME} + Icon CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundlePackageType @@ -21,6 +23,6 @@ NSSupportsAutomaticGraphicsSwitching NSBluetoothAlwaysUsageDescription - For connecting to meshtastic radio devices. + For communicating with meshtastic radio devices. diff --git a/examples/meshtastic/qml/ext/common/Help.qml b/examples/meshtastic/qml/ext/common/Help.qml index 3af5a06..110a71f 100644 --- a/examples/meshtastic/qml/ext/common/Help.qml +++ b/examples/meshtastic/qml/ext/common/Help.qml @@ -124,7 +124,7 @@ Eventual backups are saved in above path under backups/. On the des

To autmatically restore data from a backup on the desktop, put the backup files directly in above path (that is, under .../cl-meshtastic/) and restart the app. The data will be restored and the (obsolete) backup files will be deleted.

".arg((Qt.platform.os === "android") - ? "

N.B: If you previously used a radio with the official app, you'll need to set the radio to 'None (disabled)' in the official app first, otherwise it will not show up in this app.

" + ? "

On some older devices it may be necessary to first unpair your radio, then press-and-hold on the radio icon, in order to restart device discovery.

N.B: If you previously used a radio with the official app, you'll need to set the radio to 'None (disabled)' in the official app first, otherwise it will not show up in this app.

" : "") } diff --git a/examples/meshtastic/readme.md b/examples/meshtastic/readme.md index 0943d9f..d233e6c 100644 --- a/examples/meshtastic/readme.md +++ b/examples/meshtastic/readme.md @@ -64,9 +64,8 @@ Tested Tested on Linux, macOS, Windows 10+, android, iOS, SailfishOS. -The macOS version must be compiled first, moved to `/Applications/` and started -from Finder (not the console), otherwise BLE permissions will not work (if run -from console, the app will show a BLE exception and consume 100% CPU). +The macOS version currently crashes when built with Qt5, so a (future proof) +port to Qt6 of this example is underway. The iOS version also runs on older devices, like the 'iPod touch', as long as they are 64 bit and run at least iOS 12. @@ -89,9 +88,9 @@ On Windows it didn't work for me if not paired previously. It may occur that your radio device is sometimes not found; some suggestions: +* try to disable the radio in any other app that used it previously * try to unpair your radio from current device -* try to turn bluetooth off and on again -* try to reboot your radio +* press-and-hold on the radio icon to restart device discovery A generic bluetooth app like **nRF Connect** may help in order to see if the devices themselves work and are able to connect. diff --git a/src/cpp/ecl_ext.cpp b/src/cpp/ecl_ext.cpp index 7de1a84..dcc676a 100644 --- a/src/cpp/ecl_ext.cpp +++ b/src/cpp/ecl_ext.cpp @@ -322,7 +322,11 @@ cl_object qload_rc(cl_object l_file) { QFile file(toQString(l_file).prepend(":/")); if (file.open(QIODevice::ReadOnly)) { QTextStream ts(&file); +#if QT_VERSION < 0x060000 ts.setCodec("UTF-8"); +#else + ts.setEncoding(QStringConverter::Utf8); +#endif QString text = ts.readAll(); file.close(); if (!text.isEmpty()) {