muflax
/
ergodox-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TEST: this works, but i think i'm going to simplify it

partial-rewrite
Ben Blazak 2013-05-26 01:11:37 -07:00
parent 79cda0e3c4
commit 1905f05263
3 changed files with 123 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/keyboard/ergodox/layout/qwerty-kinesis-mod.c
View File

@ -57,6 +57,17 @@ void kb__led__logical_off(char led) {
KEYS__LAYER__NUM_PUSH(10, 3);
KEYS__LAYER__NUM_POP(10);
// notes:
// - sizeof(wchar_t) == 2
#include <stddef.h>
#include <avr/pgmspace.h>
void P(u_yinyng)(void) {
static const uint8_t wrapper[] PROGMEM = { KEYBOARD__LeftAlt };
static const wchar_t string[] PROGMEM = L"☯ hello world :)";
key_functions__send_unicode_sequence(1, wrapper, string);
}
void R(u_yinyng)(void) {}
// ----------------------------------------------------------------------------
// layout
@ -74,7 +85,7 @@ static _layout_t _layout = {
K, nop,
// left hand ...... ......... ......... ......... ......... ......... .........
equal, 1, 2, 3, 4, 5, esc,
tab, q, w, e, r, t, lpu1l1,
tab, q, w, e, r, t, u_yinyng,
bkslash, a, s, d, f, g,
shL2kcap, z, x, c, v, b, lpupo1l1,
guiL, grave, bkslash, arrowL, arrowR,

7
firmware/lib/layout/key-functions.h
View File

@ -16,6 +16,7 @@
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
#include <stddef.h>
#include <stdint.h>
// ----------------------------------------------------------------------------
@ -29,7 +30,11 @@ void key_functions__toggle (uint8_t keycode);
void key_functions__jump_to_bootloader (void);
// special
void key_functions__toggle_capslock (void);
void key_functions__toggle_capslock (void);
// --- TODO ---
void key_functions__send_unicode_sequence ( uint8_t wrapper_length,
const uint8_t * wrapper,
const wchar_t * string );
// ----------------------------------------------------------------------------

116
firmware/lib/layout/key-functions/special.c
View File

@ -10,21 +10,75 @@
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <avr/pgmspace.h>
#include "../../../../firmware/lib/usb.h"
#include "../../../../firmware/lib/usb/usage-page/keyboard.h"
// ----------------------------------------------------------------------------
// TODO: documentation?
struct _modifier_state_t {
bool left_control : 1;
bool left_shift : 1;
bool left_alt : 1;
bool left_gui : 1;
bool right_control : 1;
bool right_shift : 1;
bool right_alt : 1;
bool right_gui : 1;
};
// ----------------------------------------------------------------------------
// TODO: documentation?
static struct _modifier_state_t _read_modifier_state(void) {
return (struct _modifier_state_t) {
.left_control = usb__kb__read_key( KEYBOARD__LeftControl ),
.left_shift = usb__kb__read_key( KEYBOARD__LeftShift ),
.left_alt = usb__kb__read_key( KEYBOARD__LeftAlt ),
.left_gui = usb__kb__read_key( KEYBOARD__LeftGUI ),
.right_control = usb__kb__read_key( KEYBOARD__RightControl ),
.right_shift = usb__kb__read_key( KEYBOARD__RightShift ),
.right_alt = usb__kb__read_key( KEYBOARD__RightAlt ),
.right_gui = usb__kb__read_key( KEYBOARD__RightGUI ),
};
}
// TODO: documentation?
static void _set_modifier_state(struct _modifier_state_t state) {
usb__kb__set_key( state.left_control , KEYBOARD__LeftControl );
usb__kb__set_key( state.left_shift , KEYBOARD__LeftShift );
usb__kb__set_key( state.left_alt , KEYBOARD__LeftAlt );
usb__kb__set_key( state.left_gui , KEYBOARD__LeftGUI );
usb__kb__set_key( state.right_control , KEYBOARD__RightControl );
usb__kb__set_key( state.right_shift , KEYBOARD__RightShift );
usb__kb__set_key( state.right_alt , KEYBOARD__RightAlt );
usb__kb__set_key( state.right_gui , KEYBOARD__RightGUI );
usb__kb__send_report();
}
// TODO: documentation?
static void _send_hex_digit(uint8_t digit) {
digit &= 0x0F;
if (digit == 0) digit = KEYBOARD__0_RightParenthesis;
else if (digit < 10) digit += KEYBOARD__1_Exclamation-1;
else digit += KEYBOARD__a_A-10;
usb__kb__set_key(true, digit);
usb__kb__send_report();
usb__kb__set_key(false, digit);
usb__kb__send_report();
}
// ----------------------------------------------------------------------------
void key_functions__toggle_capslock (uint16_t ignore) {
// save the state of left and right shift
bool lshift_pressed = usb__kb__read_key(KEYBOARD__LeftShift);
bool rshift_pressed = usb__kb__read_key(KEYBOARD__RightShift);
// disable both shifts
usb__kb__set_key(false, KEYBOARD__LeftShift);
usb__kb__set_key(false, KEYBOARD__RightShift);
struct _modifier_state_t state = _read_modifier_state();
_set_modifier_state( (struct _modifier_state_t){} );
// toggle capslock
usb__kb__set_key(true, KEYBOARD__CapsLock);
@ -32,8 +86,48 @@ void key_functions__toggle_capslock (uint16_t ignore) {
usb__kb__set_key(false, KEYBOARD__CapsLock);
usb__kb__send_report();
// restore the state of both shifts
if (lshift_pressed) usb__kb__set_key(true, KEYBOARD__LeftShift);
if (rshift_pressed) usb__kb__set_key(true, KEYBOARD__RightShift);
_set_modifier_state(state);
}
void key_functions__send_unicode_sequence ( uint8_t wrapper_length,
const uint8_t * wrapper,
const wchar_t * string ) {
struct _modifier_state_t state = _read_modifier_state();
_set_modifier_state( (struct _modifier_state_t){} );
typedef union {
wchar_t all;
struct {
uint8_t p3 : 4; //
uint8_t p2 : 4; // upside-down
uint8_t p1 : 4; // must be little endian, in this case
uint8_t p0 : 4; //
};
} char_t;
// send string
for ( char_t c = { .all = pgm_read_word(string) };
c.all; c.all = pgm_read_word(++string) ) {
// send start sequence
for (uint8_t i=0; i<wrapper_length; i++) {
usb__kb__set_key(true, pgm_read_byte(wrapper++));
usb__kb__send_report();
}
// send character
_send_hex_digit(c.p0);
_send_hex_digit(c.p1);
_send_hex_digit(c.p2);
_send_hex_digit(c.p3);
// send end sequence (reverse of start sequence)
for (uint8_t i=0; i<wrapper_length; i++) {
usb__kb__set_key(false, pgm_read_byte(--wrapper));
usb__kb__send_report();
}
}
_set_modifier_state(state);
}