Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 42 additions & 5 deletions src/android/src/Usbserial.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ public class Usbserial {
"/dev/ttyS2",
"/dev/ttyS3"
};
static final String[] hydrowSerialCandidates = {
"/dev/ttyMT1",
"/dev/ttyUSB0",
"/dev/ttyACM0"
};

public static void open(Context context) {
open(context, 2400); // Default baud rate for Computrainer
Expand Down Expand Up @@ -134,6 +139,11 @@ public void onReceive(Context context, Intent intent) {
}
}

public static void openHydrow(Context context, int baudRate) {
QLog.d("QZ", "UsbSerial Hydrow local serial candidate scan");
openLocalSerialCandidates(baudRate, hydrowSerialCandidates);
}

private static void openLocalSerial(String devicePath, int baudRate) {
QLog.d("QZ","UsbSerial local serial open " + devicePath + " with baud rate: " + baudRate);
port = null;
Expand All @@ -142,18 +152,22 @@ private static void openLocalSerial(String devicePath, int baudRate) {
lastReadLen = 0;

if (devicePath.equalsIgnoreCase("auto")) {
for (String candidate : localSerialCandidates) {
if (openLocalSerialPath(candidate, baudRate)) {
return;
}
}
openLocalSerialCandidates(baudRate, localSerialCandidates);
QLog.d("QZ","UsbSerial local serial auto open failed");
return;
}

openLocalSerialPath(devicePath, baudRate);
}

private static void openLocalSerialCandidates(int baudRate, String[] candidates) {
for (String candidate : candidates) {
if (openLocalSerialPath(candidate, baudRate)) {
return;
}
}
}

private static boolean openLocalSerialPath(String devicePath, int baudRate) {
try {
configureLocalSerial(devicePath, baudRate);
Expand Down Expand Up @@ -190,6 +204,29 @@ private static void configureLocalSerial(String devicePath, int baudRate) {
}
}

public static void close() {
if(localSerialMode && localSerialFd != null) {
try {
Os.close(localSerialFd);
}
catch (ErrnoException e) {
QLog.d("QZ","UsbSerial local serial close failed: " + e.getMessage());
}
}
localSerialFd = null;
localSerialMode = false;
lastReadLen = 0;
if(port != null) {
try {
port.close();
}
catch (IOException e) {
QLog.d("QZ","UsbSerial close failed: " + e.getMessage());
}
port = null;
}
}

public static void write (byte[] bytes) {
if(localSerialMode) {
if(localSerialFd == null)
Expand Down
26 changes: 25 additions & 1 deletion src/devices/bluetooth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,10 @@ void bluetooth::finished() {
bool fakedevice_treadmill =
settings.value(QZSettings::fakedevice_treadmill, QZSettings::default_fakedevice_treadmill).toBool();
bool waterrower_usb = settings.value(QZSettings::waterrower_usb, QZSettings::default_waterrower_usb).toBool();
QString hydrow_serialport =
settings.value(QZSettings::hydrow_serialport, QZSettings::default_hydrow_serialport).toString();
// wifi devices on windows
if (!nordictrack_2950_ip.isEmpty() || !tdf_10_ip.isEmpty() || fake_bike || fakedevice_elliptical || fakedevice_rower || fakedevice_treadmill || !proform_elliptical_ip.isEmpty() || !proform_rower_ip.isEmpty() || antbike || android_antbike || waterrower_usb) {
if (!nordictrack_2950_ip.isEmpty() || !tdf_10_ip.isEmpty() || fake_bike || fakedevice_elliptical || fakedevice_rower || fakedevice_treadmill || !proform_elliptical_ip.isEmpty() || !proform_rower_ip.isEmpty() || antbike || android_antbike || waterrower_usb || !hydrow_serialport.isEmpty()) {
// faking a bluetooth device for non-BLE devices
qDebug() << "faking a bluetooth device for non-BLE device";
deviceDiscovered(QBluetoothDeviceInfo());
Expand Down Expand Up @@ -629,6 +631,8 @@ void bluetooth::deviceDiscovered(const QBluetoothDeviceInfo &device) {
settings.value(QZSettings::kettler_usb_serialport, QZSettings::default_kettler_usb_serialport).toString();
QString freebeatSerialPort =
settings.value(QZSettings::freebeat_serialport, QZSettings::default_freebeat_serialport).toString();
QString hydrowSerialPort =
settings.value(QZSettings::hydrow_serialport, QZSettings::default_hydrow_serialport).toString();
QString csaferowerSerialPort = settings.value(QZSettings::csafe_rower, QZSettings::default_csafe_rower).toString();
bool waterrowerUSBEnabled = settings.value(QZSettings::waterrower_usb, QZSettings::default_waterrower_usb).toBool();
QString csafeellipticalSerialPort =
Expand Down Expand Up @@ -969,6 +973,19 @@ void bluetooth::deviceDiscovered(const QBluetoothDeviceInfo &device) {
emit searchingStop();
}
this->signalBluetoothDeviceConnected(freebeatBike);
} else if (!hydrowSerialPort.isEmpty() && !hydrowRower) {
qDebug() << QStringLiteral("Hydrow serial enabled on") << hydrowSerialPort;
this->stopDiscovery();
hydrowRower = new hydrowrower(noWriteResistance, noHeartService, false);
emit deviceConnected(b);
connect(hydrowRower, &bluetoothdevice::connectedAndDiscovered, this,
&bluetooth::connectedAndDiscovered);
connect(hydrowRower, &hydrowrower::debug, this, &bluetooth::debug);
hydrowRower->deviceDiscovered(b);
if (this->discoveryAgent && !this->discoveryAgent->isActive()) {
emit searchingStop();
}
this->signalBluetoothDeviceConnected(hydrowRower);
} else if (!csaferowerSerialPort.isEmpty() && !csafeRower) {
this->stopDiscovery();
csafeRower = new csaferower(noWriteResistance, noHeartService, false);
Expand Down Expand Up @@ -4305,6 +4322,11 @@ void bluetooth::restart() {
delete freebeatBike;
freebeatBike = nullptr;
}
if (hydrowRower) {

delete hydrowRower;
hydrowRower = nullptr;
}
if (csafeRower) {

delete csafeRower;
Expand Down Expand Up @@ -4593,6 +4615,8 @@ bluetoothdevice *bluetooth::device() {
return smartrowRower;
} else if (waterRowerUSB) {
return waterRowerUSB;
} else if (hydrowRower) {
return hydrowRower;
} else if (yesoulBike) {
return yesoulBike;
} else if (proformBike) {
Expand Down
2 changes: 2 additions & 0 deletions src/devices/bluetooth.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "devices/computrainerbike/computrainerbike.h"
#include "devices/kettlerusbbike/kettlerusbbike.h"
#include "devices/freebeatbike/freebeatbike.h"
#include "devices/hydrowrower/hydrowrower.h"
#include "devices/csaferower/csaferower.h"
#include "devices/csafeelliptical/csafeelliptical.h"
#endif
Expand Down Expand Up @@ -206,6 +207,7 @@ class bluetooth : public QObject, public SignalHandler {
computrainerbike *computrainerBike = nullptr;
kettlerusbbike *kettlerUsbBike = nullptr;
freebeatbike *freebeatBike = nullptr;
hydrowrower *hydrowRower = nullptr;
csaferower *csafeRower = nullptr;
csafeelliptical *csafeElliptical = nullptr;
#endif
Expand Down
Loading
Loading