From 42f408a2266d4df10a071cd2f9605bff0f028826 Mon Sep 17 00:00:00 2001 From: Max Hunt Date: Thu, 27 Sep 2018 15:17:30 +0100 Subject: [PATCH] Keyboard/pad part Done --- Design/Layout.xlsx | Bin 9027 -> 9038 bytes Design/~$Layout.xlsx | Bin 165 -> 0 bytes firmware/keyboard/keyboard.ino | 20 +++++++++++--------- 3 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 Design/~$Layout.xlsx diff --git a/Design/Layout.xlsx b/Design/Layout.xlsx index a41c7337392d5676cf4fe11e922a5de6be4ace56..85d63ca5fb86086f8deb076500178d5dae673f67 100644 GIT binary patch delta 2466 zcmV;T30?NXM$SgC{Rn@=TTZ+Z0{{T-1^@sL0001ZY%h0ja%*C5Z)+}iZEUPnO>f&c z5WN@Ze-LW)gohX0MqcG^*#oIUMJEiZ} zO5J+^(3t|&*7iBZhS#EH=1ldX1ItF~mRT6;EjGOttTMF_wry}gNQ_%1J9I$E^=mNH zW+S;M6(3sB*#n3c4YNSs)Ur1dTFYMp*D`%S^gdT@4-jkFNc%W~BCqB7)wWZbts8KA zPa|)y;fdi-2{eDfv=f+4wrVBU%BYP!18968ed0eQn9`p@us@B#>ySdM#e;M?JhIa9 zZ?cMySn&%OC4Y=YL0Y3$atPjUqD4n;0lGNf$VPlQNY`V1|2J!0rW)im%-B^Wt*8o= zz)NXE*2PqaUgtn|1~hcTj!HBudVjr z{i^%`>G^-e9w1pDiR!tQuUs}}cOBO`y?eThOPZ0@(x>xf=qFK_`e{rPe;zDImW5#w zr;G34jE-}z*kJ2t9XRL$%^>L~rjKktSt!W|S-sGBBF{hH^}jTe?Ync>op@iQ*qIl_ zxS_ZID!WSU3KS$MIQ2LUX%xe7HyXdn%GR(VCExJOhfQJD+51^=h0#@3!`LKj*RdRl*Y3asExhXjrH)!owpPYao3MQMxM^y z9{Q@HV-ly&IBPiQ-*w}{ILPSCtq^qi02Px$3@LwGwt)~rZ8=Qh#svWq$1L@lh%_#-Gd2!9J3&YwwcE+g z_uFy)$kpAx53s|;o?@+*^MwM8mRcXXT0KAA&u$d3nAn;?5o>ioR(H+$S;Z_+dL!4$ zi43<|vvt@Tp3{J_C|gRsk#bC(<{_bJ*&#|F^lGuV*1hpjfu$U!R;zz21v&cnjO#zp zRP38dng_HF-taJ(7J@lY7I=a3&`L{F>7Sb4x<~pLqcw#w%Dfq)r#|n;jM?eV%LFHT z0XyHr)(7OVY9$5OfIGo=C-~$Z+W8_(&dk`( z^y-`@&XEeqcs4`W^^rrfkVh=r&CrkU%gzWnQjsho3D4*ZJyVIU=AS=JPh337J*CP4 zgiOxRUa5TIc{1G7lt`E7Gy_Y_e?>|Zyo#MCb3sW|IHidf`2N643CmE4FcEDqcpS5k z-th2{(oB^gf+j>k{BqB7S)rw28@QB+r$gQed71;nmL*I*7of;V!^wJ=aY42T=sx2f z37xZmPXJH1qABKIF{LaNT=H1Cfb5kqzm`At#vTc4q}Tde!Qh@J=#l9He>PCT$3nvW z8Y^hPx*r4^)L=SYVsc>74EYnbu@QWgs| zBncHe(rcO|Gql0F$A1?re|iiQUd?eiuK1QkPk#~4mPmTdlV2=Sdmx3q6VaF)67`jz zR+R1b3T6kOT{q7pdcL7Dgsz2P+(6TWJONDjc2Wkr55h>vx%fT3K=xe>2^s`_GKuf{e zFj@jOhS6&5d&7vW&VDegP328>y?3dD)wK+}{uq9gvP}+Fhq_h z?+M?9vEsSD9ENb*Z@GfwzIxlkA14Z@pYOu)7;~mWzL!<-4aSzW$`OfT6oBHjDAguMZ>vQ(MS*op30Bn#a&!QT=Ee0@#x>=&ffrM2 zFs=j}c#^V|>l|&J(-dRNw;-8~yhC|$T^q@NoIjck){K9#4d5h>Cs=}Gf;om;V5kQo zIwA!hka}mT4j?#&3M43JF^LHN^*S)p{&}HOMow9}gZ7<{amQ@IdvS2@Z8;d5riq%g zi{bMV{IPs~?W%^QYInr}6`A0a8(^+B#nVo?n_$WIrOfbX-tMqs)-Cqi02KoO02BZK0000000000 z0000klh+|Z0kxAEB0vE&lUgDm1S3XLJd=JR76Jqqla?YX8&X?pPDcR%0A~UK01*HH g00000000000001VliMOb0rHa?BO?a5AOHXW08rMKJ^%m! delta 2479 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 diff --git a/Design/~$Layout.xlsx b/Design/~$Layout.xlsx deleted file mode 100644 index 907910cb14d8533b09fd68b7b7bf502d13a0db8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 wcmd<~D9tO;QSeQy$jntB9&j^wFqAUnF_bXqFeotiG9)roFk~|10@<{H0H@#*r2qf` 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); }