diff --git a/Design/Layout.xlsx b/Design/Layout.xlsx index a41c733..85d63ca 100644 Binary files a/Design/Layout.xlsx and b/Design/Layout.xlsx differ diff --git a/Design/~$Layout.xlsx b/Design/~$Layout.xlsx deleted file mode 100644 index 907910c..0000000 Binary files a/Design/~$Layout.xlsx and /dev/null differ diff --git a/firmware/keyboard/keyboard.ino b/firmware/keyboard/keyboard.ino index b9ad27f..3bfd59e 100644 --- a/firmware/keyboard/keyboard.ino +++ b/firmware/keyboard/keyboard.ino @@ -20,11 +20,13 @@ Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, ROWS, COLS ); #define ledpin 11 +char ctrlKey = KEY_LEFT_GUI; + void setup() { Keyboard.begin(); pinMode(ledpin,OUTPUT); digitalWrite(ledpin, HIGH); - Serial.begin(9600); +// Serial.begin(9600); } //funcs: @@ -38,12 +40,12 @@ void fmgdr() {Keyboard.print(":/mnt/GIT/gitFolder/");} void fmezg() {Keyboard.print("ezgit");}//Keyboard.printlnm("ezgit"); void fmsbr() {Keyboard.print("source ~/.bashrc");} void fmszr() {Keyboard.print("source ~/.zshrc");} -void fmclb() {} -void fmglp() {Keyboard.print("ezgit");} -void fmcbh() {} -void fmcbv() {} -void fmcbs() {} -void fmexr() {} +void fmclb() {Keyboard.press(ctrlKey);delay(5);Keyboard.press("b");delay(5);Keyboard.releaseAll();} +void fmglp() {Keyboard.print("git log --pretty --color --graph --oneline --decorate --histogram");} +void fmcbh() {Keyboard.press(ctrlKey);delay(5);Keyboard.press("b");delay(5);Keyboard.releaseAll();delay(5);Keyboard.print("h");} +void fmcbv() {Keyboard.press(ctrlKey);delay(5);Keyboard.press("b");delay(5);Keyboard.releaseAll();delay(5);Keyboard.print("v");} +void fmcbs() {Keyboard.press(ctrlKey);delay(5);Keyboard.press("b");delay(5);Keyboard.releaseAll();delay(5);Keyboard.print("s");} +void fmexr() {Keyboard.print("exit");delay(5);}//ln @@ -100,8 +102,8 @@ void loop() { case 'f': fmexr(); break; - default: - Serial.println(key); +// default: +// Serial.println(key); } delay(100); }