mirrors/lqml
1
Fork 0
mirror of https://gitlab.com/eql/lqml.git synced 2025-12-06 02:30:38 -08:00
Code Issues Projects Releases Packages Wiki Activity

revisions

Browse source
This commit is contained in:
pls.153 2024-05-22 18:15:13 +02:00
parent 04e511326a
commit f02422ddfe
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/cl-repl/app.pro
View file

@ -55,7 +55,7 @@ win32 {
android { android {
QT += androidextras QT += androidextras
DEFINES += NO_TEXT_HANDLES DEFINES += NO_TEXT_HANDLES NO_USB
DEFINES -= DESKTOP_APP DEFINES -= DESKTOP_APP
INCLUDEPATH = $$ECL/include INCLUDEPATH = $$ECL/include
ECL_VERSION = $$lower($$system($$ECL/../ecl-android-host/bin/ecl -v)) ECL_VERSION = $$lower($$system($$ECL/../ecl-android-host/bin/ecl -v))
@ -87,7 +87,7 @@ android {
} }
ios { ios {
DEFINES += NO_TEXT_HANDLES DISABLE_SMART_QUOTES DEFINES += NO_TEXT_HANDLES DISABLE_SMART_QUOTES NO_USB
DEFINES -= DESKTOP_APP DEFINES -= DESKTOP_APP
INCLUDEPATH = $$(ECL_IOS)/include INCLUDEPATH = $$(ECL_IOS)/include
ECL_VERSION = $$lower($$system($ECL_IOS/../ecl-ios-host/bin/ecl -v)) ECL_VERSION = $$lower($$system($ECL_IOS/../ecl-ios-host/bin/ecl -v))

4
examples/cl-repl/cpp/qt.cpp
View file

@ -6,7 +6,7 @@
#include <QNetworkInterface> #include <QNetworkInterface>
#include <QHostAddress> #include <QHostAddress>
#ifdef Q_OS_UNIX #if (defined Q_OS_UNIX) && !(defined NO_USB)
#include "usb/usb.h" #include "usb/usb.h"
#endif #endif
@ -341,7 +341,7 @@ QVariant QT::localIp() {
// USB // USB
#ifdef Q_OS_UNIX #if (defined Q_OS_UNIX) && !(defined NO_USB)
QVariant QT::connectUsb() { QVariant QT::connectUsb() {
if (usb == nullptr) { if (usb == nullptr) {
usb = new USB(); usb = new USB();

4
examples/cl-repl/cpp/qt.h
View file

@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE
extern "C" { LIB_EXPORT QObject* ini(); } extern "C" { LIB_EXPORT QObject* ini(); }
#ifdef Q_OS_UNIX #if (defined Q_OS_UNIX) && !(defined NO_USB)
class USB; class USB;
#endif #endif
@ -111,7 +111,7 @@ public:
Q_INVOKABLE QVariant localIp(); Q_INVOKABLE QVariant localIp();
// USB // USB
#ifdef Q_OS_UNIX #if (defined Q_OS_UNIX) && !(defined NO_USB)
Q_INVOKABLE QVariant connectUsb (); Q_INVOKABLE QVariant connectUsb ();
Q_INVOKABLE QVariant sendToUlisp (const QVariant&); Q_INVOKABLE QVariant sendToUlisp (const QVariant&);

8
examples/meshtastic/cpp/connection/usb/usb_me.cpp
View file

@ -28,7 +28,7 @@ void USB_ME::connectToRadio() {
} }
const auto infos = QSerialPortInfo::availablePorts(); const auto infos = QSerialPortInfo::availablePorts();
// tested with HELTEC v3, LILYGO T-Beam, RAK 4631 // tested with Heltec v3, LILYGO T-Beam, RAK 4631
const QStringList supported = { "RAK", "UART", "USB" }; const QStringList supported = { "RAK", "UART", "USB" };
for (auto info : infos) { for (auto info : infos) {
QString name(info.manufacturer() + " | " + info.description()); QString name(info.manufacturer() + " | " + info.description());
@ -54,9 +54,7 @@ void USB_ME::connectToRadio() {
} }
done: done:
if (!open(QIODevice::ReadWrite)) { if (open(QIODevice::ReadWrite)) {
qDebug() << "USB: unable to open port" << portName();
} else {
ready = true; ready = true;
setDataTerminalReady(true); setDataTerminalReady(true);
setRequestToSend(true); setRequestToSend(true);
@ -64,6 +62,8 @@ done:
con->setReady(QVariant(QVariantList() << true)); con->setReady(QVariant(QVariantList() << true));
} }
qDebug() << "USB open"; qDebug() << "USB open";
} else {
qDebug() << "USB: unable to open port" << portName();
} }
} }

2
examples/meshtastic/platforms/windows/setup.nsi
View file

@ -1,7 +1,7 @@
Unicode True Unicode True
!include "MUI2.nsh" !include "MUI2.nsh"
Name "Mesh SMS" Name "Mesh SMS"
OutFile "out\Setup-Mesh-SMS-0.9.0.exe" OutFile "out\Setup-Mesh-SMS-0.9.1.exe"
InstallDir "$PROGRAMFILES\Mesh SMS" InstallDir "$PROGRAMFILES\Mesh SMS"
Var STARTMENU_FOLDER Var STARTMENU_FOLDER
!define MUI_ABORTWARNING !define MUI_ABORTWARNING