More Annotated Files + Bugfixes (#51)

CMakeLists.txt

@@ -14,16 +14,19 @@ set(PROJECT_VERSION ${NUDELTA_VERSION})
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_OSX_ARCHITECTURES x86_64)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(BUILD_SHARED_LIBS FALSE)
 
+# Hidapi does not use `option`
 set(HIDAPI_WITH_LIBUSB FALSE)
 set(HIDAPI_WITH_HIDRAW TRUE)
-set(BUILD_SHARED_LIBS FALSE)
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+add_subdirectory(submodules/hidapi)
+
+option(YAML_CPP_BUILD_TOOLS OFF)
+add_subdirectory(submodules/yaml-cpp)
 
 add_subdirectory(submodules/scope_guard)
-add_subdirectory(submodules/hidapi)
 add_subdirectory(submodules/fmt)
-add_subdirectory(submodules/yaml-cpp)
 add_subdirectory(submodules/ssco)
 
 # Common

Changelog.md

@@ -1,3 +1,7 @@
+# 0.7.2
+- Fix internal indices for `n`, `o`, and `u`.
+- Add annotated hex dumps for more keyboards for future RE work
+
 # 0.7.1
 - Updates udev rules and instructions for Linux
 - More informative permissions-related error messages

package.json

@@ -1,7 +1,7 @@
 {
     "name": "nudelta",
     "author": "Mohamed Gaber <[email protected]>",
-    "version": "0.7.1",
+    "version": "0.7.2",
     "license": "GPL-3.0-or-later",
     "homepage": "https://github.com/donn/nudelta#readme",
     "description": "An open-source alternative to the NuPhy Console",

res/Air75/indices_mac.yml

@@ -47,14 +47,14 @@ j: 45
 k: 51
 l: 57
 m: 46
-"n": 11
-o: 12
+"n": 40
+o: 56
 p: 62
 q: 8
 r: 26
 s: 163
 t: 32
-u: 18
+u: 44
 v: 28
 w: 158
 x: 16

res/Air75/indices_win.yml

@@ -52,14 +52,14 @@ j: 45
 k: 51
 l: 57
 m: 46
-"n": 11
-o: 12
+"n": 40
+o: 56
 p: 62
 q: 157
 r: 26
 s: 163
 t: 32
-u: 18
+u: 44
 v: 28
 w: 158
 x: 16

res/Halo75/indices_mac.yml

@@ -49,13 +49,13 @@ k: 51
 l: 57
 m: 46
 "n": 170
-o: 12
+o: 56
 p: 62
 q: 8
 r: 26
 s: 15
 t: 32
-u: 18
+u: 44
 v: 163
 w: 14
 x: 161

res/Halo75/indices_win.yml

@@ -49,13 +49,13 @@ k: 51
 l: 57
 m: 46
 "n": 170
-o: 12
+o: 56
 p: 62
 q: 8
 r: 26
 s: 15
 t: 32
-u: 18
+u: 44
 v: 163
 w: 14
 x: 161
@@ -108,4 +108,4 @@ playpause: 187
 forward: 188
 mute: 189
 volumedown: 190
-volumeup: 191
+volumeup: 191

res/NuPhy/keycodes.yml

@@ -152,4 +152,7 @@ backlightup: 0x0001000c
 
 ## Keyboard Specific/Custom
 fnspace: 0x2f000002
-search: 0x2000000e
+
+halo_mac_search: 0x2000000e
+# air96_mac_search: 0x1700000e
+# air96_bell: 0x1d0b0000

util/usb/.gitignore

@@ -1,2 +1 @@
-!default.annotated.hex
-!default_mac.annotated.hex
+!*.annotated.hex

util/usb/Air96_mac.annotated.hex

@@ -0,0 +1,256 @@
+0000  00 00 00 29  -> esc
+0004  00 00 00 35  -> grave
+0008  00 00 00 2b  -> tab
+000c  00 00 00 39  -> capslock
+0010  06 00 00 e1  -> lshift
+0014  06 00 00 e0  -> lctrl
+0018  02 00 00 00 
+001c  02 00 00 0d 
+0020  00 00 00 14  -> q
+0024  00 00 00 04  -> a
+0028  00 00 00 1d  -> z
+002c  06 00 00 e2  -> lalt
+0030  02 00 00 01 
+0034  02 00 00 0e 
+0038  00 00 00 1a  -> w
+003c  00 00 00 16  -> s
+0040  00 00 00 1b  -> x
+0044  06 00 00 e3  -> lmeta
+0048  02 00 00 02 
+004c  02 00 00 0f 
+0050  00 00 00 08  -> e
+0054  00 00 00 07  -> d
+0058  02 00 00 1f 
+005c  00 00 00 00  -> none
+0060  02 00 00 03 
+0064  02 00 00 10 
+0068  00 00 00 15  -> r
+006c  02 00 00 22 
+0070  02 00 00 1a 
+0074  00 00 00 00  -> none
+0078  02 00 00 04 
+007c  00 00 00 22  -> num5
+0080  00 00 00 17  -> t
+0084  02 00 00 1e 
+0088  00 00 00 05  -> b
+008c  00 00 00 2c  -> space
+0090  02 00 00 05 
+0094  00 00 00 23  -> num6
+0098  00 00 00 1c  -> y
+009c  00 00 00 0b  -> h
+00a0  02 00 00 23 
+00a4  00 00 00 00  -> none
+00a8  02 00 00 06 
+00ac  00 00 00 24  -> num7
+00b0  00 00 00 18  -> u
+00b4  00 00 00 0d  -> j
+00b8  00 00 00 10  -> m
+00bc  00 00 00 00  -> none
+00c0  02 00 00 07 
+00c4  00 00 00 25  -> num8
+00c8  00 00 00 0c  -> i
+00cc  00 00 00 0e  -> k
+00d0  02 00 00 20 
+00d4  06 00 00 e7  -> rmeta
+00d8  02 00 00 08 
+00dc  00 00 00 26  -> num9
+00e0  00 00 00 12  -> o
+00e4  00 00 00 0f  -> l
+00e8  02 00 00 21 
+00ec  20 00 00 00  -> fn
+00f0  02 00 00 09 
+00f4  00 00 00 27  -> num0
+00f8  00 00 00 13  -> p
+00fc  00 00 00 33  -> semicolon
+0100  00 00 00 38  -> fwdslash
+0104  06 00 00 e4  -> rctrl
+0108  02 00 00 0a 
+010c  00 00 00 2d  -> minus
+0110  00 00 00 2f  -> lbracket
+0114  00 00 00 34  -> quote
+0118  00 00 00 87 
+011c  00 00 00 88 
+0120  02 00 00 0b 
+0124  00 00 00 2e  -> equal
+0128  02 00 00 1b 
+012c  02 00 00 1c 
+0130  00 00 00 64 
+0134  06 00 00 e7  -> rmeta
+0138  02 00 00 0c 
+013c  00 00 00 2a  -> backspace
+0140  02 00 00 1c 
+0144  00 00 00 28  -> enter
+0148  06 00 00 e5  -> rshift
+014c  02 00 00 13 
+0150  00 00 00 4c  -> del
+0154  00 00 00 00  -> none
+0158  00 00 00 00  -> none
+015c  00 00 00 00  -> none
+0160  02 00 00 11 
+0164  02 00 00 12 
+0168  00 00 00 4a  -> home
+016c  00 00 00 53  -> numlock
+0170  00 00 00 5f  -> numpad7
+0174  00 00 00 5c  -> numpad4
+0178  00 00 00 59  -> numpad1
+017c  02 00 00 14 
+0180  00 00 00 4d  -> end
+0184  00 00 00 54  -> numpad_div
+0188  00 00 00 60  -> numpad8
+018c  00 00 00 5d  -> numpad5
+0190  00 00 00 5a  -> numpad2
+0194  00 00 00 62  -> numpad0
+0198  00 00 00 4b  -> pgup
+019c  00 00 00 55  -> numpad_mul
+01a0  00 00 00 61  -> numpad9
+01a4  00 00 00 5e  -> numpad6
+01a8  00 00 00 5b  -> numpad3
+01ac  00 00 00 63  -> numpad_dot
+01b0  00 00 00 4e  -> pgdn
+01b4  00 00 00 56  -> numpad_sub
+01b8  00 00 00 57  -> numpad_add
+01bc  00 00 00 85  -> numpad_comma
+01c0  00 00 00 58  -> numpad_enter
+01c4  00 00 00 00  -> none
+01c8  00 00 00 00  -> none
+01cc  00 00 00 00  -> none
+01d0  00 00 00 00  -> none
+01d4  00 00 00 00  -> none
+01d8  00 00 00 00  -> none
+01dc  00 00 00 00  -> none
+01e0  00 00 00 00  -> none
+01e4  00 00 00 00  -> none
+01e8  00 00 00 00  -> none
+01ec  00 00 00 00  -> none
+01f0  00 00 00 00  -> none
+01f4  00 00 00 00  -> none
+01f8  00 00 00 00  -> none
+01fc  00 00 00 00  -> none
+0200  00 00 00 00  -> none
+0204  00 00 00 00  -> none
+0208  00 00 00 00  -> none
+020c  00 00 00 00  -> none
+0210  00 00 00 3a  -> f1
+0214  00 00 00 3b  -> f2
+0218  00 00 00 3c  -> f3
+021c  0e 00 00 17 
+0220  04 00 00 cf  -> voice_command
+0224  00 00 0b 1d 
+0228  00 00 00 40  -> f7
+022c  00 00 00 41  -> f8
+0230  00 00 00 42  -> f9
+0234  00 00 00 43  -> f10
+0238  00 00 00 44  -> f11
+023c  00 00 00 45  -> f12
+0240  00 00 0a 21 
+0244  00 00 00 1e  -> num1
+0248  00 00 00 1f  -> num2
+024c  00 00 00 20  -> num3
+0250  00 00 00 21  -> num4
+0254  00 00 00 52  -> up
+0258  00 00 00 51  -> down
+025c  00 00 00 50  -> left
+0260  00 00 00 4f  -> right
+0264  00 00 00 26  -> num9
+0268  00 00 00 27  -> num0
+026c  00 00 00 2d  -> minus
+0270  00 00 00 2e  -> equal
+0274  00 00 00 14  -> q
+0278  00 00 00 19  -> v
+027c  00 00 00 30  -> rbracket
+0280  00 00 00 31  -> backslash
+0284  00 00 00 4c  -> del
+0288  00 00 00 0a  -> g
+028c  00 00 00 06  -> c
+0290  00 00 00 36  -> comma
+0294  00 00 00 37  -> period
+0298  00 00 00 09  -> f
+029c  00 00 00 11  -> n
+02a0  00 00 00 00  -> none
+02a4  00 00 00 00  -> none
+02a8  00 00 00 00  -> none
+02ac  00 00 00 00  -> none
+02b0  00 00 00 00  -> none
+02b4  00 00 00 00  -> none
+02b8  00 00 00 00  -> none
+02bc  00 00 00 00  -> none
+02c0  00 00 00 00  -> none
+02c4  00 00 00 00  -> none
+02c8  00 00 00 00  -> none
+02cc  00 00 00 2c  -> space
+02d0  00 00 00 3a  -> f1
+02d4  00 00 00 3b  -> f2
+02d8  00 00 00 3c  -> f3
+02dc  00 00 00 3d  -> f4
+02e0  00 00 00 3e  -> f5
+02e4  00 00 00 3f  -> f6
+02e8  00 00 00 40  -> f7
+02ec  00 00 00 41  -> f8
+02f0  00 00 00 42  -> f9
+02f4  00 00 00 43  -> f10
+02f8  00 00 00 44  -> f11
+02fc  00 00 00 45  -> f12
+0300  00 00 0a 20 
+0304  0e 00 00 0c 
+0308  0e 00 00 0d 
+030c  0e 00 00 0e 
+0310  0e 00 00 0f 
+0314  0c 00 01 00  -> backlightup
+0318  0c 00 02 00  -> backlightdown
+031c  0b 00 03 00  -> backlighteffectup
+0320  12 00 03 00  -> backlightcolorup
+0324  00 00 00 26  -> num9
+0328  00 00 00 27  -> num0
+032c  00 00 00 2d  -> minus
+0330  00 00 00 2e  -> equal
+0334  00 00 00 14  -> q
+0338  0e 00 00 15 
+033c  0e 00 00 12 
+0340  0e 00 00 13 
+0344  00 00 00 4c  -> del
+0348  0e 00 00 11 
+034c  0e 00 00 14 
+0350  0d 00 02 00 
+0354  0d 00 01 00 
+0358  0e 00 00 16 
+035c  0e 00 00 18 
+0360  00 00 00 00  -> none
+0364  00 00 00 00  -> none
+0368  00 00 00 00  -> none
+036c  00 00 00 00  -> none
+0370  00 00 00 00  -> none
+0374  00 00 00 00  -> none
+0378  00 00 00 00  -> none
+037c  00 00 00 00  -> none
+0380  00 00 00 00  -> none
+0384  00 00 00 00  -> none
+0388  00 00 00 00  -> none
+038c  00 00 00 2c  -> space
+0390  00 00 00 00  -> none
+0394  00 00 00 00  -> none
+0398  00 00 00 00  -> none
+039c  00 00 00 00  -> none
+03a0  00 00 00 00  -> none
+03a4  00 00 00 00  -> none
+03a8  00 00 00 00  -> none
+03ac  00 00 00 00  -> none
+03b0  00 00 00 00  -> none
+03b4  00 00 00 00  -> none
+03b8  00 00 00 00  -> none
+03bc  00 00 00 00  -> none
+03c0  00 00 00 00  -> none
+03c4  00 00 00 00  -> none
+03c8  00 00 00 00  -> none
+03cc  00 00 00 00  -> none
+03d0  00 00 00 00  -> none
+03d4  00 00 00 00  -> none
+03d8  00 00 00 00  -> none
+03dc  00 00 00 00  -> none
+03e0  00 00 00 00  -> none
+03e4  00 00 00 00  -> none
+03e8  00 00 00 00  -> none
+03ec  00 00 00 00  -> none
+03f0  00 00 00 00  -> none
+03f4  00 00 00 00  -> none
+03f8  00 00 00 00  -> none
+03fc  00 00 00 00  -> none