feat(cpn): visual and audible feedback for haptic in simulator (#7322)
This commit is contained in:
@@ -191,6 +191,7 @@ class SimulatorInterface : public QObject
|
||||
void auxSerialStart(const quint8 port_num);
|
||||
void auxSerialStop(const quint8 port_num);
|
||||
void txBatteryVoltageChanged(const int voltage);
|
||||
void hapticChanged(int intensity);
|
||||
void fsColorChange(quint8 index, qint32 color);
|
||||
};
|
||||
|
||||
|
||||
@@ -38,6 +38,9 @@
|
||||
#include <QDir>
|
||||
#include <QLabel>
|
||||
#include <QMessageBox>
|
||||
#include <QTimer>
|
||||
#include <QGraphicsOpacityEffect>
|
||||
#include <QPropertyAnimation>
|
||||
|
||||
extern AppData g; // ensure what "g" means
|
||||
|
||||
@@ -173,6 +176,7 @@ SimulatorMainWindow::SimulatorMainWindow(QWidget *parent, const QString & simula
|
||||
connect(m_simulator, &SimulatorInterface::auxSerialStart, hostSerialConnector, &HostSerialConnector::serialStart);
|
||||
connect(m_simulator, &SimulatorInterface::auxSerialStop, hostSerialConnector, &HostSerialConnector::serialStop);
|
||||
connect(m_simulator, &SimulatorInterface::txBatteryVoltageChanged, this, &SimulatorMainWindow::onTxBatteryVoltageChanged);
|
||||
connect(m_simulator, &SimulatorInterface::hapticChanged, this, &SimulatorMainWindow::onHapticChanged);
|
||||
}
|
||||
|
||||
SimulatorMainWindow::~SimulatorMainWindow()
|
||||
@@ -613,3 +617,33 @@ void SimulatorMainWindow::onTxBatteryVoltageChanged(const unsigned int voltage)
|
||||
{
|
||||
m_batVoltage = voltage;
|
||||
}
|
||||
|
||||
// Haptic feedback handler: provides visual and audible substitutes
|
||||
// for physical vibration when running in the simulator.
|
||||
void SimulatorMainWindow::onHapticChanged(int intensity) {
|
||||
Q_UNUSED(intensity);
|
||||
|
||||
// AUDIBLE: system beep as substitute for haptic motor sound
|
||||
QApplication::beep();
|
||||
|
||||
// VISUAL: animate opacity to simulate vibration
|
||||
// Uses QGraphicsEffect which works on Wayland without moving the window
|
||||
if (m_simulatorWidget) {
|
||||
QGraphicsOpacityEffect* effect = new QGraphicsOpacityEffect(m_simulatorWidget);
|
||||
m_simulatorWidget->setGraphicsEffect(effect);
|
||||
|
||||
QPropertyAnimation* anim = new QPropertyAnimation(effect, "opacity", effect);
|
||||
anim->setDuration(200);
|
||||
anim->setKeyValueAt(0.0, 1.0);
|
||||
anim->setKeyValueAt(0.25, 0.5);
|
||||
anim->setKeyValueAt(0.5, 1.0);
|
||||
anim->setKeyValueAt(0.75, 0.5);
|
||||
anim->setKeyValueAt(1.0, 1.0);
|
||||
anim->start(QAbstractAnimation::DeleteWhenStopped);
|
||||
|
||||
connect(anim, &QPropertyAnimation::finished, this, [this, effect]() {
|
||||
if (m_simulatorWidget && m_simulatorWidget->graphicsEffect() == effect)
|
||||
m_simulatorWidget->setGraphicsEffect(nullptr);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,6 +89,7 @@ class SimulatorMainWindow : public QMainWindow
|
||||
// TODO: detect if changed via ui as currently event only on GeneralSettings (re)load
|
||||
void onSettingsBatteryChanged(const int batMin, const int batMax, const unsigned int batWarn);
|
||||
void onTxBatteryVoltageChanged(const unsigned int voltage); // something else changed voltage
|
||||
void onHapticChanged(int intensity);
|
||||
|
||||
protected:
|
||||
void createDockWidgets();
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <QDebug>
|
||||
#include <QFile>
|
||||
#include <QElapsedTimer>
|
||||
#include <QTimer>
|
||||
|
||||
// WAMR native callback: called by WASM module to get analog values in
|
||||
// ADC range (0..4096, center=2048). The WASM ADC driver does a direct
|
||||
@@ -131,7 +132,8 @@ WasmSimulatorInterface::WasmSimulatorInterface(const QString & wasmPath,
|
||||
: SimulatorInterface(),
|
||||
m_wasmPath(wasmPath),
|
||||
m_boardName(boardName),
|
||||
m_boardType(boardType)
|
||||
m_boardType(boardType),
|
||||
m_lastHaptic(0)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -392,6 +394,9 @@ bool WasmSimulatorInterface::resolveExports()
|
||||
m_fnAuxSerialReceive =
|
||||
wasm_runtime_lookup_function(m_moduleInst, "simuAuxSerialReceive");
|
||||
|
||||
// Haptic feedback polling
|
||||
m_fnGetHaptic = wasm_runtime_lookup_function(m_moduleInst, "simuGetHaptic");
|
||||
|
||||
m_fnMalloc = wasm_runtime_lookup_function(m_moduleInst, "malloc");
|
||||
m_fnFree = wasm_runtime_lookup_function(m_moduleInst, "free");
|
||||
|
||||
@@ -481,6 +486,7 @@ void WasmSimulatorInterface::init()
|
||||
|
||||
m_lastOutputs.clear();
|
||||
m_resetOutputsData = true;
|
||||
m_lastHaptic = 0;
|
||||
|
||||
qDebug() << "WASM simulator" << m_boardName << "initialized: LCD"
|
||||
<< m_lcdWidth << "x" << m_lcdHeight << "depth" << m_lcdDepth;
|
||||
@@ -1010,6 +1016,23 @@ void WasmSimulatorInterface::run()
|
||||
if (!(loops % 5)) {
|
||||
QMutexLocker lckr(&m_mutex);
|
||||
checkOutputsChanged();
|
||||
|
||||
// 1. Read the global variable from the WASM module
|
||||
// "simuHapticValue" must match exactly what you wrote in simulib.cpp
|
||||
// Poll haptic state from WASM every 50ms.
|
||||
// When haptic fires, emit hapticChanged() to trigger
|
||||
// visual (window jitter) and audible (beep) feedback in the simulatormainwindow.cpp
|
||||
// as a substitute for physical vibration hardware.
|
||||
if (m_fnGetHaptic) {
|
||||
uint32_t argv[1] = {0};
|
||||
if (wasm_runtime_call_wasm(m_execEnv, m_fnGetHaptic, 0, argv)) {
|
||||
uint32_t currentHapticValue = argv[0];
|
||||
if (currentHapticValue != m_lastHaptic) {
|
||||
m_lastHaptic = currentHapticValue;
|
||||
emit hapticChanged((int)currentHapticValue);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -189,6 +189,7 @@ class WasmSimulatorInterface : public SimulatorInterface
|
||||
wasm_function_inst_t m_fnGetMaxTrainerChannels = nullptr;
|
||||
wasm_function_inst_t m_fnCopyTrainerInput = nullptr;
|
||||
wasm_function_inst_t m_fnSetTrainerTimeout = nullptr;
|
||||
wasm_function_inst_t m_fnGetHaptic = nullptr;
|
||||
|
||||
// Backlight and function switch LEDs
|
||||
wasm_function_inst_t m_fnGetBacklightState = nullptr;
|
||||
@@ -208,6 +209,8 @@ class WasmSimulatorInterface : public SimulatorInterface
|
||||
// Aux serial: host -> firmware data injection
|
||||
wasm_function_inst_t m_fnAuxSerialReceive = nullptr;
|
||||
|
||||
uint32_t m_lastHaptic = 0;
|
||||
|
||||
wasm_function_inst_t m_fnMalloc = nullptr;
|
||||
wasm_function_inst_t m_fnFree = nullptr;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user