summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ble.cpp4
-rw-r--r--src/display.cpp8
-rw-r--r--src/main.cpp11
3 files changed, 19 insertions, 4 deletions
diff --git a/src/ble.cpp b/src/ble.cpp
index ff38b18..a7bb73b 100644
--- a/src/ble.cpp
+++ b/src/ble.cpp
@@ -127,9 +127,9 @@ de::uvok::badge::ble_poll_result_t de::uvok::badge::ble_poll(void)
{
const uint8_t val = value_changed.value;
value_changed.changed = false;
- return (ble_poll_result_t){.has_data = true, .new_template = val};
+ return (ble_poll_result_t){.action_type = BleActionType::Template, .new_template = val};
}
- return (ble_poll_result_t){.has_data = false};
+ return (ble_poll_result_t){.action_type = BleActionType::None};
}
void de::uvok::badge::ble_set_image(uint8_t image)
diff --git a/src/display.cpp b/src/display.cpp
index 74561f3..3a2d99f 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -190,11 +190,17 @@ void de::uvok::badge::display_direct(uint8_t num)
{
LOG_F("Display direct\n");
if (num >= image_count)
- return;
+ return;
displayed = num;
displayDo(DISPLAY_FULL);
}
+void de::uvok::badge::display_indicator(DisplayIndicator indicator)
+{
+
+}
+
+
/*
// ->
#include "output_h4x4a.xbm"
diff --git a/src/main.cpp b/src/main.cpp
index af388bd..0f6af57 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -83,11 +83,20 @@ void loop()
{
de::uvok::badge::ble_poll_result_t pollres = de::uvok::badge::ble_poll();
- if (pollres.has_data)
+ switch (pollres.action_type)
{
+ case de::uvok::badge::BleActionType::Template: {
+
de::uvok::badge::display_direct(pollres.new_template);
lastActivity = millis();
}
+ break;
+ case de::uvok::badge::BleActionType::Indicator: {
+ de::uvok::badge::display_indicator(pollres.new_indicator);
+ lastActivity = millis();
+ }
+ break;
+ }
}
if (millis() - lastActivity > SLEEP_TIME && !de::uvok::badge::ble_is_active())