dominic/Tactiliest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TactilityC: Add context to Radio HAL callbacks?

Browse Source
This commit is contained in:
Dominic Höglinger 2025-09-27 21:18:11 +02:00
parent bf62c9670d
commit 65f450a0e0
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TactilityC/Include/tt_hal_radio.h
View File

@ -68,7 +68,7 @@ struct RadioTxPacket {
uint32_t address; uint32_t address;
}; };
typedef void (*RadioStateCallback)(DeviceId id, RadioState state); typedef void (*RadioStateCallback)(DeviceId id, RadioState state, void* ctx);
typedef void (*RadioTxStateCallback)(RadioTxId id, RadioTxState state); typedef void (*RadioTxStateCallback)(RadioTxId id, RadioTxState state);
typedef void (*RadioOnReceiveCallback)(DeviceId id, const RadioRxPacket* packet); typedef void (*RadioOnReceiveCallback)(DeviceId id, const RadioRxPacket* packet);
@ -209,9 +209,10 @@ RadioRxSubscriptionId tt_hal_radio_subscribe_receive(RadioHandle handle, RadioOn
* Subscribe for any state change of the radio driver object. * Subscribe for any state change of the radio driver object.
* @param[in] handle the radio driver handle * @param[in] handle the radio driver handle
* @param[in] callback function to call when the state of the radio changes * @param[in] callback function to call when the state of the radio changes
* @param[in] ctx context which will be passed to the callback function
* @return the identifier for the subscription * @return the identifier for the subscription
*/ */
RadioStateSubscriptionId tt_hal_radio_subscribe_state(RadioHandle handle, RadioStateCallback callback); RadioStateSubscriptionId tt_hal_radio_subscribe_state(RadioHandle handle, RadioStateCallback callback, void* ctx);
/** /**
* Unsubscribe for any received packet that the radio driver object receives. * Unsubscribe for any received packet that the radio driver object receives.
@ -220,6 +221,13 @@ RadioStateSubscriptionId tt_hal_radio_subscribe_state(RadioHandle handle, RadioS
*/ */
void tt_hal_radio_unsubscribe_receive(RadioHandle handle, RadioRxSubscriptionId id); void tt_hal_radio_unsubscribe_receive(RadioHandle handle, RadioRxSubscriptionId id);
/**
* Unsubscribe for any state change of the radio driver object.
* @param[in] handle the radio driver handle
* @param[in] id the identifier for the subscription
*/
void tt_hal_radio_unsubscribe_state(RadioHandle handle, RadioStateSubscriptionId id);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

11
TactilityC/Source/tt_hal_radio.cpp
View File

@ -129,11 +129,11 @@ extern "C" {
}); });
} }
RadioStateSubscriptionId tt_hal_radio_subscribe_state(RadioHandle handle, RadioStateCallback callback) { RadioStateSubscriptionId tt_hal_radio_subscribe_state(RadioHandle handle, RadioStateCallback callback, void* ctx) {
auto wrapper = static_cast<DeviceWrapper*>(handle); auto wrapper = static_cast<DeviceWrapper*>(handle);
return wrapper->device->subscribeStateChange([callback](tt::hal::Device::Id id, tt::hal::radio::RadioDevice::State state) { return wrapper->device->subscribeStateChange([callback, ctx](tt::hal::Device::Id id, tt::hal::radio::RadioDevice::State state) {
if (callback) { if (callback) {
callback(id, fromCpp(state)); callback(id, fromCpp(state), ctx);
} }
}); });
} }
@ -157,6 +157,11 @@ extern "C" {
auto wrapper = static_cast<DeviceWrapper*>(handle); auto wrapper = static_cast<DeviceWrapper*>(handle);
wrapper->device->unsubscribeRx(id); wrapper->device->unsubscribeRx(id);
} }
void tt_hal_radio_unsubscribe_state(RadioHandle handle, RadioStateSubscriptionId id) {
auto wrapper = static_cast<DeviceWrapper*>(handle);
wrapper->device->unsubscribeStateChange(id);
}
} }
static RadioState fromCpp(tt::hal::radio::RadioDevice::State state) { static RadioState fromCpp(tt::hal::radio::RadioDevice::State state) {