clockworkpi/DevTerm
1
0
Fork 0
mirror of https://github.com/clockworkpi/DevTerm.git synced 2025-12-13 18:58:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
cuu 2022-11-13 13:55:29 +08:00
parent 2204b6dfd4
commit 64330ea01f
2 changed files with 73 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Code/devterm_keyboard_mini/devterm_keyboard_mini.ino
View File

@ -103,7 +103,9 @@ void check_keyboard_lock(KEYBOARD_LOCK*lock){
} }
if( lock->time > 200){ if( lock->time > 200){
dev_term.Keyboard->release(lock->begin); if(lock->begin != _FN_KEY) {
dev_term.Keyboard->release(lock->begin);
}
lock->time = 0; lock->time = 0;
lock->lock = 0; lock->lock = 0;
lock->begin = 0; lock->begin = 0;

91
Code/devterm_keyboard_mini/keymaps.ino
View File

@ -146,6 +146,27 @@ void dt_kbd_restore_layer(DEVTERM*dv) {
} }
void press_any_key_to_release_lock(DEVTERM*dv, KEYBOARD_LOCK*lock, uint16_t k,uint8_t mode) {
if( lock->lock > 0 ) {
if(mode == KEY_RELEASED
&& k != _LEFT_CTRL_KEY && k!= KEY_RIGHT_CTRL
&& k != _LEFT_ALT && k!= KEY_RIGHT_ALT
&& k != _LEFT_SHIFT_KEY && k!= KEY_RIGHT_SHIFT
&& k != _FN_KEY) {
lock->lock = 0;
if(lock->begin!= _FN_KEY) {
dv->Keyboard->release(lock->begin);
}
lock->begin = 0;
lock->time = 0;
//dv->_Serial->println("ctrl lock released");
}
}
}
void keyboard_action(DEVTERM*dv,uint8_t row,uint8_t col,uint8_t mode) { void keyboard_action(DEVTERM*dv,uint8_t row,uint8_t col,uint8_t mode) {
uint16_t k; uint16_t k;
@ -255,18 +276,25 @@ void keyboard_action(DEVTERM*dv,uint8_t row,uint8_t col,uint8_t mode) {
}break; }break;
case _FN_KEY: case _FN_KEY:
if(mode == KEY_PRESSED){ if(mode == KEY_PRESSED){
dv->Keyboard_state.fn_on = FN_LAYER; if(dv->Keyboard_state.fn.lock == 0){
dv->Keyboard_state.fn_on = FN_LAYER;
dv->Keyboard_state.fn.begin = k;
}
}else if(mode == KEY_RELEASED ) { }else if(mode == KEY_RELEASED ) {
for(int i=0;i<64;i++) { if(dv->Keyboard_state.fn.lock == 0){
if(fn_actions[i] !=0) { for(int i=0;i<64;i++) {
k = keyboard_maps[dv->Keyboard_state.fn_on][i]; if(fn_actions[i] !=0) {
dv->Keyboard->release(k); k = keyboard_maps[dv->Keyboard_state.fn_on][i];
fn_actions[i] = 0; dv->Keyboard->release(k);
fn_actions[i] = 0;
}
} }
dv->Keyboard_state.fn_on = 0;
} }
dv->Keyboard_state.fn_on = 0; dv->Keyboard_state.fn.begin =0;
} dv->Keyboard_state.fn.time = 0;
}
break; break;
default: default:
@ -282,6 +310,10 @@ void keyboard_action(DEVTERM*dv,uint8_t row,uint8_t col,uint8_t mode) {
break; break;
} }
press_any_key_to_release_lock(dv,&dv->Keyboard_state.ctrl,k,mode);
press_any_key_to_release_lock(dv,&dv->Keyboard_state.alt,k,mode);
press_any_key_to_release_lock(dv,&dv->Keyboard_state.shift,k,mode);
press_any_key_to_release_lock(dv,&dv->Keyboard_state.fn,k,mode);
} }
@ -308,9 +340,16 @@ void keypad_action(DEVTERM*dv,uint8_t col,uint8_t mode) {
case _LEFT_SHIFT_KEY: case _LEFT_SHIFT_KEY:
case KEY_RIGHT_SHIFT: case KEY_RIGHT_SHIFT:
if(mode == KEY_PRESSED) { if(mode == KEY_PRESSED) {
dv->Keyboard->press(k); if(dv->Keyboard_state.shift.lock == 0){
dv->Keyboard->press(k);
dv->Keyboard_state.shift.begin=k;
}
}else if(mode == KEY_RELEASED) { }else if(mode == KEY_RELEASED) {
dv->Keyboard->release(k); if(dv->Keyboard_state.shift.lock == 0){
dv->Keyboard->release(k);
dv->Keyboard_state.shift.begin = 0;
dv->Keyboard_state.shift.time = 0;
}
} }
break; break;
@ -470,9 +509,24 @@ void keypad_action(DEVTERM*dv,uint8_t col,uint8_t mode) {
} }
} }
break; break;
case _CMD_KEY:
case _LEFT_ALT: case _LEFT_ALT:
case KEY_RIGHT_ALT: case KEY_RIGHT_ALT:
if(mode == KEY_PRESSED){
if(dv->Keyboard_state.alt.lock == 0){
dv->Keyboard->press(k);
dv->Keyboard_state.alt.begin=k;
}
}else {
if(dv->Keyboard_state.alt.lock == 0){
dv->Keyboard->release(k);
dv->Keyboard_state.alt.begin = 0;
dv->Keyboard_state.alt.time = 0;
}
}
break;
case _CMD_KEY:
if(mode == KEY_PRESSED){ if(mode == KEY_PRESSED){
dv->Keyboard->press(k); dv->Keyboard->press(k);
}else { }else {
@ -491,15 +545,8 @@ void keypad_action(DEVTERM*dv,uint8_t col,uint8_t mode) {
} }
press_any_key_to_release_lock(dv,&dv->Keyboard_state.ctrl,k,mode);
if(dv->Keyboard_state.ctrl.lock > 0 ) { press_any_key_to_release_lock(dv,&dv->Keyboard_state.alt,k,mode);
if(mode == KEY_RELEASED && k != _LEFT_CTRL_KEY && k!= KEY_RIGHT_CTRL){ press_any_key_to_release_lock(dv,&dv->Keyboard_state.shift,k,mode);
dv->Keyboard_state.ctrl.lock = 0; press_any_key_to_release_lock(dv,&dv->Keyboard_state.fn,k,mode);
dv->Keyboard->release(dv->Keyboard_state.ctrl.begin);
dv->Keyboard_state.ctrl.begin = 0;
dv->Keyboard_state.ctrl.time = 0;
//dv->_Serial->println("ctrl lock released");
}
}
} }