From 3a6c62e2417607c2c712826a16711d90fa4f1d6c Mon Sep 17 00:00:00 2001 From: Minizbot2012 Date: Wed, 2 Feb 2022 00:45:35 -0500 Subject: [PATCH] ALL: Compartimentalize --- devices/{compiller => compiler}/compile.go | 4 +-- devices/devices.go | 37 +-------------------- devices/structs/structs.go | 37 +++++++++++++++++++++ devices/xdr/orbweaver.bin | Bin 544 -> 548 bytes hid/generated.bin | Bin 37912 -> 37912 bytes hid/generator/gen.go | 20 +++++------ hid/hid.go | 32 ++++-------------- hid/structs/structs.go | 20 +++++++++++ 8 files changed, 77 insertions(+), 73 deletions(-) rename devices/{compiller => compiler}/compile.go (82%) create mode 100755 devices/structs/structs.go create mode 100755 hid/structs/structs.go diff --git a/devices/compiller/compile.go b/devices/compiler/compile.go similarity index 82% rename from devices/compiller/compile.go rename to devices/compiler/compile.go index 33ef2d4..e29f7fc 100755 --- a/devices/compiller/compile.go +++ b/devices/compiler/compile.go @@ -6,14 +6,14 @@ import ( "strings" "github.com/Minizbot2012/minxdr" - "github.com/OrbTools/OrbCommon/devices" + "github.com/OrbTools/OrbCommon/devices/structs" ) func main() { files, _ := os.ReadDir("devices/json/") for _, file := range files { data, _ := os.ReadFile("devices/json/" + file.Name()) - DevDef := &devices.DeviceDef{} + DevDef := &structs.DeviceDef{} json.Unmarshal(data, DevDef) xdo, _ := os.Create("devices/xdr/" + strings.Split(file.Name(), ".")[0] + ".bin") minxdr.Marshal(xdo, DevDef) diff --git a/devices/devices.go b/devices/devices.go index 22c380e..3163160 100755 --- a/devices/devices.go +++ b/devices/devices.go @@ -4,6 +4,7 @@ import ( "bytes" "embed" "github.com/Minizbot2012/minxdr" + _ "github.com/OrbTools/OrbCommon/devices/structs" "io" "io/fs" "strings" @@ -14,42 +15,6 @@ var DeviceTypes map[string]*DeviceDef //go:embed xdr/* var df embed.FS -//KeyMap singular keymap -type KeyMap struct { - Device string - Keymap []uint16 - Color []byte -} - -//KeyMaps a set of keymaps -type KeyMaps struct { - Maps []*KeyMap - Currentmap int - MCount int -} - -type DeviceDef struct { - Backend string - IsColor bool - MaxMappings int - NumKeys int - NumColor int - Binding []byte - Device struct { - SystemFile string - VendorID int - ProdID int - } - GuiPages []struct { - Name string - Type string - Keys []struct { - KeyID int - KeyName string - } - } -} - func init() { DeviceTypes = make(map[string]*DeviceDef) files, _ := fs.ReadDir(df, "xdr") diff --git a/devices/structs/structs.go b/devices/structs/structs.go new file mode 100755 index 0000000..2231fa7 --- /dev/null +++ b/devices/structs/structs.go @@ -0,0 +1,37 @@ +package structs + +//KeyMap singular keymap +type KeyMap struct { + Device string + Keymap []uint16 + Color []byte +} + +//KeyMaps a set of keymaps +type KeyMaps struct { + Maps []*KeyMap + Currentmap int + MCount int +} + +type DeviceDef struct { + Backend string + IsColor bool + MaxMappings int + NumKeys int + NumColor int + Binding []byte + Device struct { + SystemFile string + VendorID int + ProdID int + } + GuiPages []struct { + Name string + Type string + Keys []struct { + KeyID int + KeyName string + } + } +} diff --git a/devices/xdr/orbweaver.bin b/devices/xdr/orbweaver.bin index fe77bfa9c88e096c067f3c54e41c743a9e8cd2eb..e4ae31a1a21db261530b9b7b99b10caeb2bc4d7a 100755 GIT binary patch delta 12 TcmZ3$vV>)VG$Zpy2@WOz7PJD- delta 10 RcmZ3&vVdiR^hSABCIAw~0?z;d diff --git a/hid/generated.bin b/hid/generated.bin index a429c56477694ccbd757b0906cb8976f1c4957fd..e2381828a0b68180779a7eb3b078ba2e2c3c97ab 100755 GIT binary patch delta 4370 zcmYM1ZA{hI9mhErQ4kdHqF`0dfpg&hM=stg_abVUpqGjk@KO;)YlU*P+Cl}nZLvOG zHnz2U6!|XMk}lDV7hCpXHQ_~y|drj3s-~rQC#VeX%B*kZdp7jD63!CVN40 zxew?39=^ZN_xJzN&jLUCSs*_rC+9Z*-bO@v2Qq<=DkO>w{6E1?m=*sDespkwlNG7irw- z_rwgwj#LM7YB0E6V>xKV)A+bfBDf)PYuSjSD0)t#H5fwfTIRFHU@G8?=kfTmMloNV z#p9NGtmG+Ciia_IYmVg#7^F)KW^+U0A+8OFML8x9Ng;7}RExdHT$6ZIsPIKuM4Z5+ z^u!SE_h@k*MO7Xa%6xGecQ$KuuJbV~SdWs3*p0SR8mUqr*yQ5@^Uj-zO3ZImVk_>~ zND)Eise18GMEX22j!kr1BC{`LLWhvWMI7!2NCJ<#C1$J zXz_Ps%Ik42-$#l)oZ`0@^VrjX5z|l&6w^i{HY4Im(TayJNNARHUKkV?DN%yEJEYi% zJ2mpwf)YKroAl6|=i{@|5aenlD)2Za5iM0>7c%Wy`~!n^o~T8H8HV!=a#^l{G9U2` z5qz;;;gfX?y}*dSplc?IVJ1;bL2QSr^~5N~z9+?N`0VtEKBDvB{! zu?oNK+$dglQ6#Gk8!(yHqJO4A;$Dps`4|jnvBy=Uqt=M`5Gjyi3Yk19&S0?26PsMP zbDj}xF4yoD1KI713z#g?D6I0un;5(4AyuU?wcTLxAa(62@k@+ckm9#4z&P4gODy|J zjNr~{54SfP@oP*Us0`$UZ2QC-46fH=7?b?ktPY89%&eAn81p@7{%RDFGaOiH#M^d2 zMft5RiN&Wv2yc&Is!QW1stR#m;ZZH;(l_E7rVBKsQ4;VlyNzx16jlx@aSwyMp_id9 zwi|K9HFK5;eYUwBvz118_+_L9G%O-Nd8H zV7WsFa=wkWGAT}F$8ZiKZ-kMIQy5Bdpa%;z=d^2`C%%R0?@NTGF9IlO(pY$w(%Ne9 z;T9tDcbS3b*IlXFBXaupb!M!xHj`O?dpG6km73n766p zW}~5sGy6TvhYwM0k?mpO5h;*STRDz5qD_WGn$%jvE$+nY_;{Oz1OX>}e7Rnd!x>WR z4_4;5*hStjXoa5sDQmbl6!s8 z=|*L?NkQ_o8mHiuM!L{Wg;cB6WMKok6@X8-Wha5zY9H_ zxMIuo{Q)kUn$HnxuHi&3UQw4b9JvJCNW4i;gz5<74@pF-Pb5N`+(ZI&0o5Lvy;Aj#;Cxly`gfhJx=WQ#_e@9uLD zEkaKbV`kx=!$TJPk0{BvG^2UY4J~ZjttXOXgdlXxAhk~s1C%A+WzWd!5TQ(IQ;0@FXl}9Q`cT(np0%2y+8)G|h&ikcJ5M=jO;-Fq z%e!f}VH8tWB^JGT-=)$W{RmHue;@S&nKQQX>`Hz)VMr+00k6cT`|F;JlLbPuTI0`M zb@W<0u6E>>dORHLu0rAf>v-6pcfYb@(O-*S9H`5V6_Q=V(IGF8sjz&_bv~YjjivUM z>MSG)AzG0|SCD6%b`&N;s1{4~<91OHuUKp#-XQ}y6K!opD_I_wgIgbG6wYw?}+ z&MerFCh)BdR0lFgt#8maEeD_MGR~pMX3VyEXgpZw{Krw=c|)9a`&wrmT}NW=b2U#4 zJFPW#^!OO+P&iXpm-VZxrDq)}<>rG1M6YLd-Il2TcOB<;wHV*uops8rty&+a?PT$8 zo!a5w*>v7ziZ$O+<%m;!?`fY{vy13OXKe|qaeOdTMQw4WIm>nzk`~UCf~|R{tr;O` z*Ur>2raNdi3Ar-xX$yE$<$Z`bG@;{2VqY#Iq_%%1W^k+o(l zoKWHolr_k*xJnZIez>$gZ)=US0dRt&c&oJ7B9Q2%laOE+p! zb)g!~uk-WP3jAjzg7+rKzt~aXHvoWO3h4OL_?rhF++eLhs zc)MZpR`vA`Q13BWu;xf#chCOzCf-uWUh?$RNDX4wHDt;QH0Icye3@BHjkVx?o7ws7 zuaCP`x_

R)1* zZ$<;GHx-OW?DN7oK4P)%7_LBim^WQ#k1y7&dge$wL*tSWy%e)0h_MA);yV|1C5Gh8R&=Bz_$lQx%5Q#h&0u(fD-K0?{!$B;W-8EI62f~I ze0b;RRIhSr9cSAvIZ5rxaW=nrs{->jt&8s6-AtUg{qMO3+???Fq{&SbCzx{hYHV&X Hy{GJdLVlHn delta 4369 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