#include "sends.h"
-static uint32_t next_send(send_t *s) {
+static uint32_t next_send(press_t *s) {
return s->timestamp + (1 << s->send_count) - 1;
}
bool next_send_less_than(void *user_data, pheap_node_id_t a,
pheap_node_id_t b) {
- send_t *sends = (send_t *)user_data;
- return next_send(&sends[a]) < next_send(&sends[b]);
+ press_t *presses = (press_t *)user_data;
+ return next_send(&presses[a]) < next_send(&presses[b]);
}
-void create_send(send_t *sleeping_sends, pheap_t *sleeps_heap,
- uint32_t timestamp, u16_t seq) {
+void create_press(press_t *presses, pheap_t *sleeps_heap, uint32_t timestamp,
+ u16_t seq) {
pheap_node_id_t i = ph_new_node(sleeps_heap);
if (i == 0) {
/* TODO: Don't drop new presses just because sleeps_heap is full of old
* presses. */
return;
}
- sleeping_sends[i].timestamp = timestamp;
- sleeping_sends[i].seq = seq;
- sleeping_sends[i].send_count = 0;
+ presses[i].timestamp = timestamp;
+ presses[i].seq = seq;
+ presses[i].send_count = 0;
ph_insert_node(sleeps_heap, i);
}
-int32_t next_scheduled_send(send_t *sleeping_sends, pheap_t *sleeps_heap) {
+int32_t next_scheduled_send(press_t *presses, pheap_t *sleeps_heap) {
pheap_node_id_t i = ph_peek_head(sleeps_heap);
if (i == 0)
return -1;
- return next_send(&sleeping_sends[i]);
+ return next_send(&presses[i]);
}
uint32_t timestamp;
u16_t seq;
u8_t send_count;
-} send_t;
+} press_t;
bool next_send_less_than(void *user_data, pheap_node_id_t a, pheap_node_id_t b);
-void create_send(send_t *sleeping_sends, pheap_t *sleeps_heap,
- uint32_t timestamp, u16_t seq);
+void create_press(press_t *presses, pheap_t *sleeps_heap, uint32_t timestamp,
+ u16_t seq);
/* When do we next need to send something (in seconds since boot)?
* Returns -1 if there's nothing pending. */
-int32_t next_scheduled_send(send_t *sleeping_sends, pheap_t *sleeps_heap);
+int32_t next_scheduled_send(press_t *presses, pheap_t *sleeps_heap);
#endif
return;
}
-void service_sleeps(int alarm, send_t *sleeping_sends, pheap_t *sleeps_heap) {
+void service_sleeps(int alarm, press_t *presses, pheap_t *sleeps_heap) {
hardware_alarm_cancel(alarm);
while (1) {
uint32_t now = time_s();
- int32_t act_time = next_scheduled_send(sleeping_sends, sleeps_heap);
+ int32_t act_time = next_scheduled_send(presses, sleeps_heap);
if (act_time == -1)
return;
if (act_time > now) {
return;
}
pheap_node_id_t i = ph_remove_head(sleeps_heap, false);
- send_t *send = &sleeping_sends[i];
- uint32_t ago = now - send->timestamp;
- send_report_packet(send->seq, ago);
- send->send_count++;
- if (send->send_count < config_resend_count)
+ press_t *press = &presses[i];
+ uint32_t ago = now - press->timestamp;
+ send_report_packet(press->seq, ago);
+ press->send_count++;
+ if (press->send_count < config_resend_count)
ph_insert_node(sleeps_heap, i);
else
ph_free_node(sleeps_heap, i);
signal_error_by_blinking();
hardware_alarm_set_callback(alarm, time_to_send);
- send_t sleeping_sends[PICO_PHEAP_MAX_ENTRIES];
+ press_t presses[PICO_PHEAP_MAX_ENTRIES];
pheap_t *sleeps_heap =
- ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, sleeping_sends);
+ ph_create(PICO_PHEAP_MAX_ENTRIES, next_send_less_than, presses);
u16_t seq = 0;
while (1) {
- service_sleeps(alarm, sleeping_sends, sleeps_heap);
+ service_sleeps(alarm, presses, sleeps_heap);
event_t e;
queue_remove_blocking(&queue, &e);
switch (e.type) {
case NEW_BUTTON_PRESS: {
- create_send(sleeping_sends, sleeps_heap, e.buttonpress.timestamp, seq++);
+ create_press(presses, sleeps_heap, e.buttonpress.timestamp, seq++);
} break;
case RESEND_TIME: {
/* OK, we're awake. Cool. Thanks! (We actually do the sends in the