added layer hold

Author: Galzai

README.md

@@ -23,4 +23,3 @@ Please refer to the [MK32 Wiki page](https://github.com/Galzai/MK32/wiki) for in
 - Connection switching.
 - Modify keymap via webserver (in progress) .
 - Security (?)
-- layer hold

main/keyboard_config.h

@@ -70,6 +70,9 @@
 #define REPORT_LEN (MOD_LED_BYTES+MACRO_LEN+MATRIX_ROWS*KEYMAP_COLS) //size of hid reports with NKRO and room for 3 key macro
 #define REPORT_COUNT_BYTES (MATRIX_ROWS*KEYMAP_COLS+MACRO_LEN)
 
+
+#define LAYER_HOLD_MAX_VAL 0x134
+#define LAYER_HOLD_BASE_VAL 0x123
 #define MACRO_BASE_VAL 0x103
 #define LAYERS_BASE_VAL 0xFF
 

main/keymap.c

@@ -17,6 +17,12 @@ enum custom_keycodes {
 //  DVORAK,
 };
 
+//Set these for each layer and use when layers are needed in a hold-to use layer
+enum layer_holds {
+  QWERTY_H = LAYER_HOLD_BASE_VAL ,
+  NUM_H,
+};
+
 
 // array to hold names of layouts for oled
 char default_layout_names[LAYERS][MAX_LAYOUT_NAME_LENGTH] ={
@@ -89,7 +95,7 @@ uint16_t default_slave_encoder_map[LAYERS][ENCODER_SIZE] ={
 			  {KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC },
 			  {KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT },
 			  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT } ,
-			  {KC_LCTRL,KC_LGUI, KC_LALT, DEFAULT,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT }
+			  {KC_LCTRL,KC_LGUI, KC_LALT, DEFAULT, NUM_H,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT }
 
 	};
 

main/keypress_handles.c

@@ -26,6 +26,7 @@
 #include "matrix.h"
 #include "HID_kbdmousejoystick.h"
 #include "oled_tasks.h"
+#include "nvs_keymaps.h"
 
 #define KEY_PRESS_TAG "KEY_PRESS"
 
@@ -45,6 +46,10 @@ uint8_t current_report[REPORT_LEN] = {0};
 // Array to send when releasing macros
 uint8_t macro_release[3] = {0};
 
+// Flag in order to know when to ignore layer change on layer hold
+uint8_t layer_hold_flag = 0;
+uint8_t prev_layout = 0;
+
 // checking if a modifier key was pressed
 uint16_t check_modifier( uint16_t key ){
 
@@ -95,6 +100,7 @@ void media_control_release(uint16_t keycode ){
 // adjust current layer
 void layer_adjust( uint16_t keycode ){
 
+	if(layer_hold_flag == 0){
 	switch(keycode){
 	case DEFAULT:
 		current_layout=0;
@@ -121,6 +127,7 @@ void layer_adjust( uint16_t keycode ){
 #endif
 	vTaskDelay(125/portTICK_PERIOD_MS);
 	ESP_LOGI(KEY_PRESS_TAG,"Layer modified!, Current layer: %d ",current_layout);
+	}
 }
 
 
@@ -151,14 +158,23 @@ uint8_t *check_key_state( uint16_t **keymap){
 				led_status=check_led_status(keycode);
 				if(matrix_state[row][col-MATRIX_COLS*pad]==1){
 
+					//checking for layer hold
+					if((keycode >=LAYER_HOLD_BASE_VAL)&&(keycode <= LAYER_HOLD_MAX_VAL)){
+						prev_layout = current_layout;
+						current_layout = (keycode-LAYER_HOLD_BASE_VAL);
+						layer_hold_flag = 1;
+						continue;
+
+					}
+
 					// checking for layer adjust keycodes
 					if((keycode>=LAYERS_BASE_VAL)&&(keycode<MACRO_BASE_VAL)){
 						layer_adjust(keycode);
 						continue;
 					}
 
 					// checking for macros
-					if(keycode>=MACRO_BASE_VAL){
+					if((keycode>=MACRO_BASE_VAL)&&(keycode<=LAYER_HOLD_BASE_VAL)){
 						for(uint8_t i=0; i < 3; i++){
 							uint16_t key=macros[MACRO_BASE_VAL-keycode][i];
 							current_report[REPORT_LEN-1-i]=key;
@@ -187,8 +203,14 @@ uint8_t *check_key_state( uint16_t **keymap){
 				}
 				if(matrix_state[row][col-MATRIX_COLS*pad]==0){
 
+					//checking for layer hold release
+					if((layouts[prev_layout][row][col] >=LAYER_HOLD_BASE_VAL)&&(keycode <= LAYER_HOLD_MAX_VAL)){
+						current_layout = 0;
+						layer_hold_flag = 0;
+					}
+
 					//checking if macro was released
-					if(keycode>=MACRO_BASE_VAL){
+					if((keycode>=MACRO_BASE_VAL)&&(keycode<=LAYER_HOLD_BASE_VAL)){
 						for(uint8_t i=0; i < 3; i++){
 							uint16_t key=macros[MACRO_BASE_VAL-keycode][i];
 							current_report[REPORT_LEN-1-i]=0;

plugins/plugin_components/hid_keycode_conv/keycode_conv.c

@@ -12,7 +12,6 @@
 // Sizing the report for N-key rollover
 uint8_t current_report[REPORT_LEN] = {0};
 
-
 void enable_key_to_char(void){
 	vTaskSuspend(xKeyreportTask);
 	ESP_LOGI(TAG,"Suspending hid reports");

sdkconfig.old

@@ -36,7 +36,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0"
+CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB1"
 CONFIG_ESPTOOLPY_BAUD_115200B=y
 CONFIG_ESPTOOLPY_BAUD_230400B=
 CONFIG_ESPTOOLPY_BAUD_921600B=