summaryrefslogtreecommitdiffstats
path: root/keyboards/infinity60/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/infinity60/keymaps')
-rw-r--r--keyboards/infinity60/keymaps/jpetermans/keymap.c28
-rw-r--r--keyboards/infinity60/keymaps/jpetermans/readme.md38
2 files changed, 29 insertions, 37 deletions
diff --git a/keyboards/infinity60/keymaps/jpetermans/keymap.c b/keyboards/infinity60/keymaps/jpetermans/keymap.c
index 630105017..8d19834b2 100644
--- a/keyboards/infinity60/keymaps/jpetermans/keymap.c
+++ b/keyboards/infinity60/keymaps/jpetermans/keymap.c
@@ -12,7 +12,7 @@
#define _TILDE 4
//IS31 chip has 8 available led pages, using 0 for all leds and 7 for single toggles
-#define max_pages 6
+#define max_pages 6
enum ic60_keycodes {
NUMPAD,
@@ -75,7 +75,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FNAV] = KEYMAP( \
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,KC_NO,\
KC_CAPS,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,_______,_______,KC_DEL, \
- _______,M(0),KC_BTN2,_______,_______,_______,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,_______,_______, \
+ _______,_______,KC_BTN2,_______,_______,_______,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,_______,_______, \
_______,KC_APP,KC_BTN1,KC_CALC,_______,_______,KC_END,_______,_______,_______,_______,_______,KC_NO, \
_______,_______,_______, _______, F(CTLALTDEL),KC_NLCK,_______,_______ \
),
@@ -119,7 +119,7 @@ enum macro_id {
ACTION_LEDS_DIM,
ACTION_LEDS_SINGLE,
ACTION_LEDS_PAGE,
- ACTION_LEDS_FLASH,
+ ACTION_LEDS_FLASH
};
/* ==================================
@@ -137,9 +137,8 @@ enum macro_id {
*/
//======== full page arrays =========
-//LED Page 1 - _Numpad
//any change in array size needs to be mirrored in matrix_init_user
-uint8_t led_numpad[16] = {
+uint8_t led_numpad[16] = {
18,21,22,23,
37,38,41,42,
55,56,57,58,
@@ -186,7 +185,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
case ACTION_LEDS_ALL:
if(record->event.pressed) {
led_mode_global = led_mode_global == ALL ? MODE_SINGLE : ALL;
- msg=(TOGGLE_ALL << 8) | 0;
+ msg=TOGGLE_ALL;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
}
break;
@@ -194,7 +193,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
case ACTION_LEDS_BACKLIGHT:
if(record->event.pressed) {
backlight_status_global ^= 1;
- msg=(TOGGLE_BACKLIGHT << 8) | (backlight_status_global);
+ msg=(backlight_status_global << 8) | TOGGLE_BACKLIGHT;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
}
break;
@@ -203,21 +202,21 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
if(record->event.pressed) {
led_mode_global = led_mode_global == GAME ? MODE_SINGLE : GAME;
- msg=(DISPLAY_PAGE << 8) | 4;
+ msg=(4 << 8) | DISPLAY_PAGE;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
}
break;
case ACTION_LEDS_BRIGHT:
if(record->event.pressed) {
- msg=(STEP_BRIGHTNESS << 8) | 1;
+ msg=(1 << 8) | STEP_BRIGHTNESS;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
}
break;
case ACTION_LEDS_DIM:
if(record->event.pressed) {
- msg=(STEP_BRIGHTNESS << 8) | 0;
+ msg=(0 << 8) | STEP_BRIGHTNESS;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
}
break;
@@ -282,26 +281,25 @@ void matrix_scan_user(void) {
switch(led_mode_global) {
case MODE_FLASH: //flash preset page leds then single indicator
page = biton32(layer_state) > max_pages ? 7 : biton32(layer_state);
- msg=(DISPLAY_PAGE << 8) | (page);
+ msg=(page << 8) | DISPLAY_PAGE;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
chThdSleepMilliseconds(500);
//flow to display single layer leds
case MODE_SINGLE: //light layer indicators for all active layers
led_pin_byte = layer_state & 0xFF;
- msg=(DISPLAY_PAGE << 8) | 7;
+ msg=(7 << 8) | DISPLAY_PAGE;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
- msg=(1<<16) | (SET_FULL_ROW << 8) | (led_pin_byte);
+ msg=(1<<16) | (led_pin_byte << 8) | SET_FULL_ROW;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
break;
case MODE_PAGE: //display pre-defined led page
page = biton32(layer_state) > max_pages ? 7 : biton32(layer_state);
- msg=(DISPLAY_PAGE << 8) | (page);
+ msg=(page << 8) | DISPLAY_PAGE;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
break;
}
led_layer_state = layer_state;
}
}
-
diff --git a/keyboards/infinity60/keymaps/jpetermans/readme.md b/keyboards/infinity60/keymaps/jpetermans/readme.md
index f50bee617..63fd88ec2 100644
--- a/keyboards/infinity60/keymaps/jpetermans/readme.md
+++ b/keyboards/infinity60/keymaps/jpetermans/readme.md
@@ -16,26 +16,24 @@ digits mean "row" and "col", i.e. 45 means pin 4, column 5 in the IS31 datasheet
```
*Unused in Alphabet Layout
-The IS31 includes 8 pages (or frames) 0-7 and each page consists of 0xB4 (144) bytes
-- **0 - 17**
- * LED control (on/off).
- * 18 pins which alternate between A and B matrices (CA1, CB1, CA2, CB2, ..).
+The IS31 includes 8 pages (or frames) 0-7 and each page consists of 144 bytes
+- **bytes 0 - 17** - LED control (on/off).
+ * 18 pins which alternate between A and B matrices (CA1, CB1, CA2, CB2, ..).
* Each byte controls the 8 leds on that pin with bits (8 to 1).
-- **18 - 35**
- * Blink control.
+- **bytes 8 - 35** - Blink control.
* Same as LED control above, but sets blink on/off.
-- **36 - 143**
- * PWM control. One byte per LED, sets PWM from 0 to 255.
+- **bytes 36 - 143** - PWM control.
+ * One byte per LED, sets PWM from 0 to 255.
* Same as above, the register alternates, every 8 *bytes* (not bits) between the A & B matrices.
## Led Controller Code
-In the Infinity60 project folder, led_controller.c sets up ability to write led layers at startup or control leds on demand as part of fn_actions. By default led_controller.c assumes page 0 will be used for full on/off and page 7 for controlling individual leds. The remaining 6 pages (1-6) are free to preset led maps at init or on demand. Communication with the IS31 is primarily done through the led_mailbox using chMBPost described further below under "Sending messages in Keymap.c"
+In the Infinity60 project folder, led_controller.c sets up ability to write led layers at startup or control leds on demand as part of fn_actions. By default led_controller.c assumes page 0 will be used for full on/off. The remaining 7 pages (1-7) are free for preset led maps or single led actions at init or on demand. Communication with the IS31 is primarily done through the led_mailbox using chMBPost described further below under "Sending messages in Keymap.c". This code is based on work matt3o and flabbergast did for tmk firmware on the [whitefox](https://github.com/tmk/whitefox).
One function is available to directly set leds without the mailbox:
```
write_led_page(page#, array of leds by address, # of leds in array)
```
-This function saves a full page using a supplied array of led locations such as:
+This function saves a full page to the controller using a supplied array of led locations such as:
```c
uint8_t led_numpad[16] = {
18,21,22,23,
@@ -48,13 +46,9 @@ write_led_page(5, led_numpad, 16);
Remaining led control is done through the led mailbox using these message types:
- **SET_FULL_ROW** (3 bytes) - row#, message type, 8-bit mask. Sets all leds on one pin per the bit mask.
-- **OFF_LED** (2 bytes) - message type, led address. Turn off specific led.
-- **ON_LED** (2 bytes) - message type, led address. Turn on specific led.
-- **TOGGLE_LED** (2 bytes) - message type, led address. Toggle specific led on/off.
-- **BLINK_OFF_LED** (2 bytes) - message type, led address. Set blink off for specific led.
-- **BLINK_ON_LED** (2 bytes) - message type, led address. Set blink on for specific led.
-- **BLINK_TOGGLE_LED** (2 bytes) - message type, led address. Toggle blink for specific led.
-- **TOGGLE_ALL** (2 bytes) - message type, not used. Turn on/off full backlight.
+- **OFF_LED, ON_LED, TOGGLE_LED** (3 bytes) - message type, led address, and page#. Off/on/toggle specific led.
+- **BLINK_OFF_LED, BLINK_ON_LED, BLINK_OFF_LED** (3 bytes) - message type, led address, and page#. Set blink Off/on/toggle for specific led.
+- **TOGGLE_ALL** (1 byte) - Turn on/off full backlight.
- **TOGGLE_BACKLIGHT** (2 bytes) - message type, on/off. Sets backlight completely off, no leds will display.
- **DISPLAY_PAGE** (2 bytes) - message type, page to display. Switch to specific pre-set page.
- **RESET_PAGE** (2 bytes) - message type, page to reset. Reset/erase specific page.
@@ -68,13 +62,13 @@ Sending an action to the led mailbox is done using chMBPost:
chMBPost(&led_mailbox, message, timeout);
```
- &led_mailbox - pointer to led mailbox
-- message - up to 4 bytes but most messages use only 2. First byte (LSB) is the message to process, the second byte is type. The third is only used to pass row information in SET_FULL_ROW. The fourth byte is currently unused.
--timeout is usually TIME_IMMEDIATE
+- message - up to 4 bytes but most messages use only 2. First byte (LSB) is the message type, the remaining three bytes are the message to process.
+- timeout is TIME_IMMEDIATE
An example:
```c
//set the message to be sent. First byte (LSB) is the led address, and second is the message type
-msg=(ON_LED << 8) | 42;
+msg=(42 << 8) | ON_LED
//send msg to the led mailbox
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
@@ -82,12 +76,12 @@ chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
Another:
```c
-msg=(BLINK_TOGGLE_LED << 8) | 46;
+msg=(46 << 8) | BLINK_TOGGLE_LED
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
```
Finally, SET_FULL_ROW requires an extra byte with row information in the message so sending this message looks like:
```c
-msg=(row<<16) | (SET_FULL_ROW << 8) | (led_pin_byte);
+msg=(row<<16) | (led_pin_byte << 8) | SET_FULL_ROW;
chMBPost(&led_mailbox, msg, TIME_IMMEDIATE);
```
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-05-28 04:06:24 +0200