From 59ea5e02f76a37e5021c5f9d02af149e48e7c07c Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 19 Jul 2014 02:33:23 +0900 Subject: Mkdir rn42 --- keyboard/hhkb_rn42/rn42/main.c | 102 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 keyboard/hhkb_rn42/rn42/main.c (limited to 'keyboard/hhkb_rn42/rn42/main.c') diff --git a/keyboard/hhkb_rn42/rn42/main.c b/keyboard/hhkb_rn42/rn42/main.c new file mode 100644 index 0000000000..a3a37c0747 --- /dev/null +++ b/keyboard/hhkb_rn42/rn42/main.c @@ -0,0 +1,102 @@ +#include +#include +#include +#include "lufa.h" +#include "print.h" +#include "sendchar.h" +#include "rn42.h" +#include "rn42_task.h" +#include "serial.h" +#include "keyboard.h" +#include "keycode.h" +#include "action.h" +#include "action_util.h" +#include "wait.h" +#include "suart.h" +#include "suspend.h" + +static int8_t sendchar_func(uint8_t c) +{ + sendchar(c); // LUFA + xmit(c); // SUART + return 0; +} + +static void SetupHardware(void) +{ + /* Disable watchdog if enabled by bootloader/fuses */ + MCUSR &= ~(1 << WDRF); + wdt_disable(); + + /* Disable clock division */ + clock_prescale_set(clock_div_1); + + // Leonardo needs. Without this USB device is not recognized. + USB_Disable(); + + USB_Init(); + + // for Console_Task + USB_Device_EnableSOFEvents(); + print_set_sendchar(sendchar_func); + + // SUART PD0:output, PD1:input + DDRD |= (1<<0); + PORTD |= (1<<0); + DDRD &= ~(1<<1); + PORTD |= (1<<1); +} + +int main(void) __attribute__ ((weak)); +int main(void) +{ + SetupHardware(); + sei(); + + /* wait for USB startup to get ready for debug output */ + uint8_t timeout = 255; // timeout when USB is not available(Bluetooth) + while (timeout-- && USB_DeviceState != DEVICE_STATE_Configured) { + wait_ms(4); +#if defined(INTERRUPT_CONTROL_ENDPOINT) + ; +#else + USB_USBTask(); +#endif + } + print("USB configured.\n"); + + rn42_init(); + rn42_task_init(); + print("RN-42 init\n"); + + /* init modules */ + keyboard_init(); + + if (!rn42_rts()) { + host_set_driver(&rn42_driver); + } else { + host_set_driver(&lufa_driver); + } + +#ifdef SLEEP_LED_ENABLE + sleep_led_init(); +#endif + + print("Keyboard start.\n"); + while (1) { + while (USB_DeviceState == DEVICE_STATE_Suspended) { + suspend_power_down(); + if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) { + USB_Device_SendRemoteWakeup(); + } + } + + keyboard_task(); + +#if !defined(INTERRUPT_CONTROL_ENDPOINT) + USB_USBTask(); +#endif + + rn42_task(); + } +} -- cgit v1.2.3 From 608ebe2686bdb3fdbd0426731cabdf6082c57b53 Mon Sep 17 00:00:00 2001 From: tmk Date: Sun, 23 Nov 2014 13:08:05 +0900 Subject: Matrix power saving --- common/keyboard.c | 23 +++++++++++++++++++++++ common/keyboard.h | 3 +++ common/matrix.h | 5 +++++ keyboard/hhkb_rn42/hhkb_avr.h | 5 ++--- keyboard/hhkb_rn42/matrix.c | 28 ++++++++++++++++++++++++++-- keyboard/hhkb_rn42/rn42/main.c | 2 +- 6 files changed, 60 insertions(+), 6 deletions(-) (limited to 'keyboard/hhkb_rn42/rn42/main.c') diff --git a/common/keyboard.c b/common/keyboard.c index 9a809ff4a1..dde91a2968 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ #include +#include +#include #include "keyboard.h" #include "matrix.h" #include "keymap.h" @@ -30,12 +32,14 @@ along with this program. If not, see . #include "bootmagic.h" #include "eeconfig.h" #include "backlight.h" +#include "suspend.h" #ifdef MOUSEKEY_ENABLE # include "mousekey.h" #endif #ifdef PS2_MOUSE_ENABLE # include "ps2_mouse.h" #endif +#include "lufa.h" #ifdef MATRIX_HAS_GHOST @@ -83,7 +87,25 @@ void keyboard_task(void) static uint8_t led_status = 0; matrix_row_t matrix_row = 0; matrix_row_t matrix_change = 0; + static uint32_t last_key_time = 0; +/* +#define SLEEP_TIME_MS 10000 + // (USB_DeviceState == DEVICE_STATE_Suspended) { + //if (timer_elapsed32(last_key_time) > SLEEP_TIME_MS) { + // TODO: remove LUFA dependent code + if (!USB_IsInitialized && timer_elapsed32(last_key_time) > SLEEP_TIME_MS) { + matrix_power_down(); + // TODO: power down only when no USB connection + // Or it makes USB connection lost or suspended + suspend_power_down(WDTO_15MS); + matrix_power_up(); + } + else { + matrix_power_down(); + matrix_power_up(); + } +*/ matrix_scan(); for (uint8_t r = 0; r < MATRIX_ROWS; r++) { matrix_row = matrix_get_row(r); @@ -105,6 +127,7 @@ void keyboard_task(void) }); // record a processed key matrix_prev[r] ^= ((matrix_row_t)1<. #include "timer.h" #include "matrix.h" #include "hhkb_avr.h" +#include +#include "suspend.h" +#include "lufa.h" +// matrix power saving +#define MATRIX_POWER_SAVE 10000 +static uint32_t matrix_last_modified = 0; +static bool matrix_power = true; + // matrix state buffer(1:on, 0:off) static matrix_row_t *matrix; static matrix_row_t *matrix_prev; @@ -72,7 +80,7 @@ uint8_t matrix_scan(void) matrix_prev = matrix; matrix = tmp; - KEY_POWER_ON(); + matrix_power_up(); for (uint8_t row = 0; row < MATRIX_ROWS; row++) { for (uint8_t col = 0; col < MATRIX_COLS; col++) { KEY_SELECT(row, col); @@ -126,8 +134,9 @@ uint8_t matrix_scan(void) // This takes 25us or more to make sure KEY_STATE returns to idle state. _delay_us(75); } + if (matrix[row] ^ matrix_prev[row]) matrix_last_modified = timer_read32(); } - KEY_POWER_OFF(); + matrix_power_down(); return 1; } @@ -165,3 +174,18 @@ void matrix_print(void) xprintf("%02X: %08b\n", row, bitrev(matrix_get_row(row))); } } + +void matrix_power_up(void) { + if (matrix_power) return; + KEY_POWER_ON(); + matrix_power = true; +} +void matrix_power_down(void) { + if (!matrix_power) return; + // doesn't power save while USB connection is active + if (USB_DeviceState == DEVICE_STATE_Configured) return; + if (timer_elapsed32(matrix_last_modified) <= MATRIX_POWER_SAVE) return; + KEY_POWER_OFF(); + suspend_power_down(WDTO_15MS); + matrix_power = false; +} diff --git a/keyboard/hhkb_rn42/rn42/main.c b/keyboard/hhkb_rn42/rn42/main.c index a3a37c0747..43d887067d 100644 --- a/keyboard/hhkb_rn42/rn42/main.c +++ b/keyboard/hhkb_rn42/rn42/main.c @@ -85,7 +85,7 @@ int main(void) print("Keyboard start.\n"); while (1) { while (USB_DeviceState == DEVICE_STATE_Suspended) { - suspend_power_down(); + suspend_power_down(WDTO_120MS); if (USB_Device_RemoteWakeupEnabled && suspend_wakeup_condition()) { USB_Device_SendRemoteWakeup(); } -- cgit v1.2.3