muflax/ergodox-firmware
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
ergodox-firmware/src/keyboard/ergodox/layout.h

41 lines
1.3 KiB
C
Raw Normal View History

still working... - removed the comment about the RESET pin on the MCP23018: i think these chips reset on powerup - the partitioning of code into files is all wrong at the moment... i need to write some more and then fix that
2012-03-15 09:01:36 +01:00
/* ----------------------------------------------------------------------------
refactoring layout stuff - made short keycode macros for the USB keycodes (under "lib/...") - refactored "keyboard/.../layout.c", to make way for multiple layouts, and to make it easier to read (by using short keycode macros) - layout.h has a computed include line now, and the code (and layout specific header stuff) is in a subdirectory. the makefile should take care of which layout gets included and compiled - changed kbfun_press() and kbfun_release() to be able to handle the modifier keys (instead of requiring a separate function for the modifiers) - added a makefile variable for which keyboard gets compiled. even though there's only one right now
2012-04-25 08:22:20 +02:00
* ergoDOX layout : exports
*
* Different layouts are included by modifying a variable in the makefile.
working more on controller_init(), and file factoring
2012-03-17 02:31:36 +01:00
* ----------------------------------------------------------------------------
intermitent checkin; lots of stuff; i2c on hold; kb logic in progress
2012-03-27 12:06:52 +02:00
* Copyright (c) 2012 Ben Blazak <benblazak.dev@gmail.com>
* Released under The MIT License (MIT) (see "license.md")
* Project located at <https://github.com/benblazak/ergodox-firmware>
still working... - removed the comment about the RESET pin on the MCP23018: i think these chips reset on powerup - the partitioning of code into files is all wrong at the moment... i need to write some more and then fix that
2012-03-15 09:01:36 +01:00
* ------------------------------------------------------------------------- */
intermitent checkin; lots of stuff; i2c on hold; kb logic in progress
2012-03-27 12:06:52 +02:00
#ifndef LAYOUT_h
#define LAYOUT_h
still working... - removed the comment about the RESET pin on the MCP23018: i think these chips reset on powerup - the partitioning of code into files is all wrong at the moment... i need to write some more and then fix that
2012-03-15 09:01:36 +01:00
reorganized src/lib
2012-04-22 21:08:32 +02:00
#include "lib/_data-types.h"
moved the key-functions files
2012-04-28 00:39:26 +02:00
#include "lib/_key-functions.h" // for `kbfun_funptr_t`
lots and lots; now writing/debugging keyboard logic also, mcp23018_init() needs fixing: `twi_stop()` needs to be at the end of transmission blocks. i wouldn't think that would be necessary, but it seems to be the only thing that'll make it work, and it also seems consistent with the protocol diagram in the datasheet (lol, imagine that), so i think that's what i'll have to do. not as though it matters much i guess, since it's a single master / single slave system anyway, i was just hoping not to release the bus till i was finished..
2012-04-10 10:44:27 +02:00
refactoring layout stuff - made short keycode macros for the USB keycodes (under "lib/...") - refactored "keyboard/.../layout.c", to make way for multiple layouts, and to make it easier to read (by using short keycode macros) - layout.h has a computed include line now, and the code (and layout specific header stuff) is in a subdirectory. the makefile should take care of which layout gets included and compiled - changed kbfun_press() and kbfun_release() to be able to handle the modifier keys (instead of requiring a separate function for the modifiers) - added a makefile variable for which keyboard gets compiled. even though there's only one right now
2012-04-25 08:22:20 +02:00
#include "matrix.h" // for number of rows and columns
still working... - removed the comment about the RESET pin on the MCP23018: i think these chips reset on powerup - the partitioning of code into files is all wrong at the moment... i need to write some more and then fix that
2012-03-15 09:01:36 +01:00
changing how computed includes are handled
2012-04-28 10:23:51 +02:00
// include the appropriate keyboard layout header;
// for number of layers
#undef _str
#undef _expstr
#undef _inc
#define _str(s) #s // stringify
#define _expstr(s) _str(s) // expand -> stringify
#define _inc _expstr(layout/MAKEFILE_KEYBOARD_LAYOUT.h) // inc(lude)
#include _inc
#undef _str
#undef _expstr
#undef _inc
intermitent checkin; lots of stuff; i2c on hold; kb logic in progress
2012-03-27 12:06:52 +02:00
lots and lots; now writing/debugging keyboard logic also, mcp23018_init() needs fixing: `twi_stop()` needs to be at the end of transmission blocks. i wouldn't think that would be necessary, but it seems to be the only thing that'll make it work, and it also seems consistent with the protocol diagram in the datasheet (lol, imagine that), so i think that's what i'll have to do. not as though it matters much i guess, since it's a single master / single slave system anyway, i was just hoping not to release the bus till i was finished..
2012-04-10 10:44:27 +02:00
extern uint8_t
kb_layout [KB_LAYERS][KB_ROWS][KB_COLUMNS];
extern kbfun_funptr_t
kb_layout_press [KB_LAYERS][KB_ROWS][KB_COLUMNS];
extern kbfun_funptr_t
kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS];
intermitent checkin; lots of stuff; i2c on hold; kb logic in progress
2012-03-27 12:06:52 +02:00
#endif
still working... - removed the comment about the RESET pin on the MCP23018: i think these chips reset on powerup - the partitioning of code into files is all wrong at the moment... i need to write some more and then fix that
2012-03-15 09:01:36 +01:00
Reference in a new issue Copy permalink