summaryrefslogtreecommitdiff
path: root/protocol
diff options
context:
space:
mode:
authortmk2015-01-03 12:02:48 +0900
committertmk2015-01-03 12:09:41 +0900
commit06527bde4f873ffc6eb8e359fb3b150e880b89ba (patch)
tree347b6886dc485091ff5ffcf211ab87b3c9ceda43 /protocol
parent22d99f26af757c0bedb31ba3f63d793e4b2d4ca3 (diff)
bluefruit, pjrc: Update protocols for new API
Diffstat (limited to 'protocol')
-rw-r--r--protocol/bluefruit/bluefruit.c4
-rw-r--r--protocol/bluefruit/main.c2
-rw-r--r--protocol/pjrc/main.c3
-rw-r--r--protocol/pjrc/usb_keyboard.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/protocol/bluefruit/bluefruit.c b/protocol/bluefruit/bluefruit.c
index f991e4d04..cf26b83df 100644
--- a/protocol/bluefruit/bluefruit.c
+++ b/protocol/bluefruit/bluefruit.c
@@ -36,7 +36,7 @@ static void bluefruit_serial_send(uint8_t);
void bluefruit_keyboard_print_report(report_keyboard_t *report)
{
if (!debug_keyboard) return;
- dprintf("keys: "); for (int i = 0; i < REPORT_KEYS; i++) { debug_hex8(report->keys[i]); dprintf(" "); }
+ dprintf("keys: "); for (int i = 0; i < KEYBOARD_REPORT_KEYS; i++) { debug_hex8(report->keys[i]); dprintf(" "); }
dprintf(" mods: "); debug_hex8(report->mods);
dprintf(" reserved: "); debug_hex8(report->reserved);
dprintf("\n");
@@ -99,7 +99,7 @@ static void send_keyboard(report_keyboard_t *report)
bluefruit_trace_header();
#endif
bluefruit_serial_send(0xFD);
- for (uint8_t i = 0; i < REPORT_SIZE; i++) {
+ for (uint8_t i = 0; i < KEYBOARD_REPORT_SIZE; i++) {
bluefruit_serial_send(report->raw[i]);
}
#ifdef BLUEFRUIT_TRACE_SERIAL
diff --git a/protocol/bluefruit/main.c b/protocol/bluefruit/main.c
index 871062ab1..094fdb366 100644
--- a/protocol/bluefruit/main.c
+++ b/protocol/bluefruit/main.c
@@ -104,7 +104,7 @@ int main(void)
dprintf("Starting main loop");
while (1) {
while (suspend) {
- suspend_power_down();
+ suspend_power_down(WDTO_120MS);
if (remote_wakeup && suspend_wakeup_condition()) {
usb_remote_wakeup();
}
diff --git a/protocol/pjrc/main.c b/protocol/pjrc/main.c
index 1ef87f865..4f87a1736 100644
--- a/protocol/pjrc/main.c
+++ b/protocol/pjrc/main.c
@@ -24,6 +24,7 @@
#include <stdbool.h>
#include <avr/io.h>
#include <avr/interrupt.h>
+#include <avr/wdt.h>
#include <util/delay.h>
#include "keyboard.h"
#include "usb.h"
@@ -60,7 +61,7 @@ int main(void)
#endif
while (1) {
while (suspend) {
- suspend_power_down();
+ suspend_power_down(WDTO_120MS);
if (remote_wakeup && suspend_wakeup_condition()) {
usb_remote_wakeup();
}
diff --git a/protocol/pjrc/usb_keyboard.c b/protocol/pjrc/usb_keyboard.c
index 758a4edc6..4b87b5d7b 100644
--- a/protocol/pjrc/usb_keyboard.c
+++ b/protocol/pjrc/usb_keyboard.c
@@ -74,7 +74,7 @@ void usb_keyboard_print_report(report_keyboard_t *report)
{
if (!debug_keyboard) return;
print("keys: ");
- for (int i = 0; i < REPORT_KEYS; i++) { phex(report->keys[i]); print(" "); }
+ for (int i = 0; i < KEYBOARD_REPORT_KEYS; i++) { phex(report->keys[i]); print(" "); }
print(" mods: "); phex(report->mods); print("\n");
}