Consolidate readme, set better debounce, remove tests

The tests never worked anyway
patosai · Jun 15, 2017 · 9c29708 · 9c29708
1 parent efeb995
commit 9c29708
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 123 deletions.
diff --git a/Keymaps.md b/Keymaps.md
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ flash:
 	$(DFU) erase; $(DFU) flash $(TARGET).hex
 
 launch:
-	$(DFU) launch
+	$(DFU) reset
 
 # Include LUFA build script makefiles
 include $(LUFA_PATH)/Build/lufa_core.mk

diff --git a/README.md b/README.md
@@ -20,5 +20,29 @@ Again, this firmware uses the LUFA USB stack so make sure you've got the LUFA bo
 `make flash` flashes the built firmware to the board.
 `make launch` will run the program on the board. You can also just power cycle your GH60; the bootloader will automatically run the firmware unless you've changed your fuses.
 
+## Keymaps
+On Windows and Linux, I like to use the regular keymap. Note I've moved Escape to the bottom right since I really need the tilde at the regular spot (going to home directories, etc.).
+
+```C
+{ KC_GRAVE,    KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,    KC_7,     KC_8,    KC_9,     KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE },
+{ KC_TAB,      KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,     KC_Y,    KC_U,     KC_I,    KC_O,     KC_P,      KC_LBRACKET, KC_RBRACKET, KC_BSLASH },
+{ KC_CAPSLOCK, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,     KC_H,    KC_J,     KC_K,    KC_L,     KC_SCOLON, KC_QUOTE,    KC_NONE,     KC_ENTER },
+{ KC_LSHIFT,   KC_NONE, KC_Z,    KC_X,     KC_C,    KC_V,     KC_B,    KC_N,     KC_M,    KC_COMMA, KC_DOT,    KC_SLASH,    KC_NONE,     KC_RSHIFT },
+{ KC_LCTRL,    KC_LGUI, KC_LALT, KC_NONE,  KC_NONE, KC_SPACE, KC_NONE, KC_NONE,  KC_NONE, KC_NONE,  KC_LAYER_0, KC_LAYER_1, KC_MUTE,     KC_ESCAPE }
+```
+
+On OS X, I swap the Alt (Alt) and Command (Win) keys so I don't need to stretch my fingers as far.
+
+```C
+{ KC_GRAVE,    KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,    KC_7,     KC_8,    KC_9,     KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE },
+{ KC_TAB,      KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,     KC_Y,    KC_U,     KC_I,    KC_O,     KC_P,      KC_LBRACKET, KC_RBRACKET, KC_BSLASH },
+{ KC_CAPSLOCK, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,     KC_H,    KC_J,     KC_K,    KC_L,     KC_SCOLON, KC_QUOTE,    KC_NONE,     KC_ENTER },
+{ KC_LSHIFT,   KC_NONE, KC_Z,    KC_X,     KC_C,    KC_V,     KC_B,    KC_N,     KC_M,    KC_COMMA, KC_DOT,    KC_SLASH,    KC_NONE,     KC_RSHIFT },
+{ KC_LCTRL,    KC_LALT, KC_LGUI, KC_NONE,  KC_NONE, KC_SPACE, KC_NONE, KC_NONE,  KC_NONE, KC_NONE,  KC_LAYER_0, KC_LAYER_1, KC_MUTE,     KC_ESCAPE }
+```
+
+You can find all the possible keys in `include/keycodes.h`
+
 ## License
 MIT
+
diff --git a/src/matrix.c b/src/matrix.c
@@ -4,7 +4,7 @@
 #include "matrix.h"
 
 #ifdef DEBOUNCE_ENABLED
-#define DEBOUNCE_AMOUNT 5
+#define DEBOUNCE_AMOUNT 15
 #endif
 
 

diff --git a/test/Makefile b/test/Makefile
diff --git a/test/Unity b/test/Unity
diff --git a/test/main.c b/test/main.c
diff --git a/test/mock/include/avr/io.h b/test/mock/include/avr/io.h
diff --git a/test/mock/include/avr/pgmspace.h b/test/mock/include/avr/pgmspace.h
diff --git a/test/mock/include/util/delay.h b/test/mock/include/util/delay.h