Various improvements for the AnnePro2 (#16579)
This commit is contained in:
		
							parent
							
								
									6ab5a7d048
								
							
						
					
					
						commit
						dc67fd9b87
					
				
					 19 changed files with 526 additions and 304 deletions
				
			
		| 
						 | 
				
			
			@ -1,32 +1,31 @@
 | 
			
		|||
 /* Copyright 2021 OpenAnnePro community
 | 
			
		||||
  * 
 | 
			
		||||
  * This program is free software: you can redistribute it and/or modify 
 | 
			
		||||
  * it under the terms of the GNU General Public License as published by 
 | 
			
		||||
  * the Free Software Foundation, either version 2 of the License, or 
 | 
			
		||||
  * (at your option) any later version. 
 | 
			
		||||
  * 
 | 
			
		||||
  * This program is distributed in the hope that it will be useful, 
 | 
			
		||||
  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
 | 
			
		||||
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
 | 
			
		||||
  * GNU General Public License for more details. 
 | 
			
		||||
  * 
 | 
			
		||||
  * You should have received a copy of the GNU General Public License 
 | 
			
		||||
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
 | 
			
		||||
  */ 
 | 
			
		||||
  *
 | 
			
		||||
  * This program is free software: you can redistribute it and/or modify
 | 
			
		||||
  * it under the terms of the GNU General Public License as published by
 | 
			
		||||
  * the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
  * (at your option) any later version.
 | 
			
		||||
  *
 | 
			
		||||
  * This program is distributed in the hope that it will be useful,
 | 
			
		||||
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
  * GNU General Public License for more details.
 | 
			
		||||
  *
 | 
			
		||||
  * You should have received a copy of the GNU General Public License
 | 
			
		||||
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
  */
 | 
			
		||||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
enum anne_pro_layers {
 | 
			
		||||
    _BASE_LAYER,
 | 
			
		||||
    _FN1_LAYER,
 | 
			
		||||
    _FN2_LAYER,
 | 
			
		||||
    BASE,
 | 
			
		||||
    FN1,
 | 
			
		||||
    FN2,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
// clang-format off
 | 
			
		||||
 | 
			
		||||
// Key symbols are based on QMK. Use them to remap your keyboard
 | 
			
		||||
/*
 | 
			
		||||
* Layer _BASE_LAYER
 | 
			
		||||
* Layer BASE
 | 
			
		||||
* ,-----------------------------------------------------------------------------------------.
 | 
			
		||||
* | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
 | 
			
		||||
* |-----------------------------------------------------------------------------------------+
 | 
			
		||||
| 
						 | 
				
			
			@ -38,7 +37,7 @@ enum anne_pro_layers {
 | 
			
		|||
* |-----------------------------------------------------------------------------------------+
 | 
			
		||||
* | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
 | 
			
		||||
* \-----------------------------------------------------------------------------------------/
 | 
			
		||||
* Layer TAP in _BASE_LAYER
 | 
			
		||||
* Layer TAP in BASE
 | 
			
		||||
* ,-----------------------------------------------------------------------------------------.
 | 
			
		||||
* |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
 | 
			
		||||
* |-----------------------------------------------------------------------------------------+
 | 
			
		||||
| 
						 | 
				
			
			@ -52,15 +51,15 @@ enum anne_pro_layers {
 | 
			
		|||
* \-----------------------------------------------------------------------------------------/
 | 
			
		||||
*/
 | 
			
		||||
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
 [_BASE_LAYER] = LAYOUT( /* Base */
 | 
			
		||||
    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
 | 
			
		||||
    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
 | 
			
		||||
    LT(_FN1_LAYER,KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
 | 
			
		||||
    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_UP),
 | 
			
		||||
    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, LT(_FN1_LAYER,KC_LEFT), LT(_FN2_LAYER,KC_DOWN), RCTL_T(KC_RGHT)
 | 
			
		||||
 [BASE] = LAYOUT_60_ansi( /* Base */
 | 
			
		||||
    KC_ESC,           KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,             KC_MINS,          KC_EQL,        KC_BSPC,
 | 
			
		||||
    KC_TAB,           KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O,    KC_P,             KC_LBRC,          KC_RBRC,       KC_BSLS,
 | 
			
		||||
    LT(FN1, KC_CAPS), KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K, KC_L,    KC_SCLN,          KC_QUOT,          KC_ENT,
 | 
			
		||||
    KC_LSFT,                   KC_Z,    KC_X, KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,           KC_SLSH,          RSFT_T(KC_UP),
 | 
			
		||||
    KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,             KC_RALT, LT(FN1, KC_LEFT), LT(FN2, KC_DOWN), RCTL_T(KC_RGHT)
 | 
			
		||||
),
 | 
			
		||||
  /*
 | 
			
		||||
  * Layer _FN1_LAYER
 | 
			
		||||
  * Layer FN1
 | 
			
		||||
  * ,-----------------------------------------------------------------------------------------.
 | 
			
		||||
  * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
 | 
			
		||||
  * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
| 
						 | 
				
			
			@ -74,15 +73,15 @@ enum anne_pro_layers {
 | 
			
		|||
  * \-----------------------------------------------------------------------------------------/
 | 
			
		||||
  *
 | 
			
		||||
  */
 | 
			
		||||
 [_FN1_LAYER] = LAYOUT( /* Base */
 | 
			
		||||
    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_DEL,
 | 
			
		||||
    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
 | 
			
		||||
    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
 | 
			
		||||
    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
 | 
			
		||||
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2_LAYER), KC_TRNS
 | 
			
		||||
 [FN1] = LAYOUT_60_ansi( /* FN1 */
 | 
			
		||||
    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_DEL,
 | 
			
		||||
    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
 | 
			
		||||
    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
 | 
			
		||||
    _______,          KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
 | 
			
		||||
    _______, _______, _______,                            _______,                   _______, _______, MO(FN2), _______
 | 
			
		||||
),
 | 
			
		||||
  /*
 | 
			
		||||
  * Layer _FN2_LAYER
 | 
			
		||||
  * Layer FN2
 | 
			
		||||
  * ,-----------------------------------------------------------------------------------------.
 | 
			
		||||
  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
 | 
			
		||||
  * |-----------------------------------------------------------------------------------------+
 | 
			
		||||
| 
						 | 
				
			
			@ -96,24 +95,23 @@ enum anne_pro_layers {
 | 
			
		|||
  * \-----------------------------------------------------------------------------------------/
 | 
			
		||||
  *
 | 
			
		||||
  */
 | 
			
		||||
 [_FN2_LAYER] = LAYOUT( /* Base */
 | 
			
		||||
    KC_TRNS, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_AP_LED_OFF, KC_AP_LED_ON, KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_SPEED, KC_TRNS, KC_TRNS,
 | 
			
		||||
    MO(_FN2_LAYER), KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
 | 
			
		||||
    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
 | 
			
		||||
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
 | 
			
		||||
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN1_LAYER), MO(_FN2_LAYER), KC_TRNS
 | 
			
		||||
 [FN2] = LAYOUT_60_ansi( /* FN2 */
 | 
			
		||||
    _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, KC_AP_LED_OFF, KC_AP_LED_ON, _______, _______, _______, _______,
 | 
			
		||||
    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______,       _______,      KC_PSCR, KC_HOME, KC_END,  _______,
 | 
			
		||||
    _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______,       _______,      KC_PGUP, KC_PGDN, _______,
 | 
			
		||||
    _______,             _______,    _______,    _______,    _______, _______, _______, _______,       _______,      KC_INS,  KC_DEL,  _______,
 | 
			
		||||
    _______, _______,    _______,                                     _______,                         _______,      MO(FN1), MO(FN2), _______
 | 
			
		||||
 ),
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
// clang-format on
 | 
			
		||||
 | 
			
		||||
// The function to handle the caps lock logic
 | 
			
		||||
bool led_update_user(led_t leds) {
 | 
			
		||||
    if (leds.caps_lock) {
 | 
			
		||||
        // Set the leds to red
 | 
			
		||||
        annepro2LedSetForegroundColor(0xFF, 0x00, 0x00);
 | 
			
		||||
        ap2_led_set_foreground_color(0xFF, 0x00, 0x00);
 | 
			
		||||
    } else {
 | 
			
		||||
        annepro2LedResetForegroundColor();
 | 
			
		||||
        ap2_led_reset_foreground_color();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue