From 224a19758efff450b78dbba43c80f73e55599074 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 9 Oct 2022 12:49:07 -0500 Subject: input_common: have an unique vector in callback status --- src/input_common/input_poller.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/input_common/input_poller.cpp') diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp index 75705b67e..ca33fb4eb 100644 --- a/src/input_common/input_poller.cpp +++ b/src/input_common/input_poller.cpp @@ -691,9 +691,12 @@ public: } void OnChange() { + const auto camera_status = GetStatus(); + const Common::Input::CallbackStatus status{ .type = Common::Input::InputType::IrSensor, - .camera_status = GetStatus(), + .camera_status = camera_status.format, + .raw_data = camera_status.data, }; TriggerOnChange(status); @@ -732,9 +735,12 @@ public: } void OnChange() { + const auto nfc_status = GetStatus(); + const Common::Input::CallbackStatus status{ .type = Common::Input::InputType::Nfc, - .nfc_status = GetStatus(), + .nfc_status = nfc_status.state, + .raw_data = nfc_status.data, }; TriggerOnChange(status); -- cgit v1.2.3