Issue #54: Expand macro keys (14->16)

dhowland · Feb 11, 2018 · b135ff7 · b135ff7
1 parent 8a390db
commit b135ff7
Show file tree

Hide file tree

Showing 18 changed files with 8,567 additions and 8,538 deletions.
diff --git a/build_log.txt b/build_log.txt
@@ -6,7 +6,7 @@ Parsing MAP file
 Checking RAM usage
 Used 1159 bytes of 2560 (45.3 % full)
 Checking Flash usage
-Used 27666 bytes of 28672 (96.5 % full)
+Used 27658 bytes of 28672 (96.5 % full)
 Updating config source
 
 ATmega32U4_16MHz_TKL.hex
@@ -16,7 +16,7 @@ Parsing MAP file
 Checking RAM usage
 Used 1163 bytes of 2560 (45.4 % full)
 Checking Flash usage
-Used 28286 bytes of 28672 (98.7 % full)
+Used 28298 bytes of 28672 (98.7 % full)
 Updating config source
 
 ATmega32U4_16MHz_SIXTY.hex
@@ -26,7 +26,7 @@ Parsing MAP file
 Checking RAM usage
 Used 1028 bytes of 2560 (40.2 % full)
 Checking Flash usage
-Used 27462 bytes of 28672 (95.8 % full)
+Used 27474 bytes of 28672 (95.8 % full)
 Updating config source
 
 ATmega32U4_16MHz_PAD.hex
@@ -36,7 +36,7 @@ Parsing MAP file
 Checking RAM usage
 Used 833 bytes of 2560 (32.5 % full)
 Checking Flash usage
-Used 26232 bytes of 28672 (91.5 % full)
+Used 26244 bytes of 28672 (91.5 % full)
 Updating config source
 
 ATmega32U4_16MHz_CARD.hex
@@ -46,7 +46,7 @@ Parsing MAP file
 Checking RAM usage
 Used 496 bytes of 2560 (19.4 % full)
 Checking Flash usage
-Used 16428 bytes of 28672 (57.3 % full)
+Used 16440 bytes of 28672 (57.3 % full)
 Updating config source
 
 ATmega32U2_16MHz_COSTAR.hex
@@ -56,7 +56,7 @@ Parsing MAP file
 Checking RAM usage
 Used 777 bytes of 1024 (75.9 % full)
 Checking Flash usage
-Used 27830 bytes of 28672 (97.1 % full)
+Used 27822 bytes of 28672 (97.0 % full)
 Updating config source
 
 ATmega16U2_16MHz_CARD.hex
@@ -66,7 +66,7 @@ Parsing MAP file
 Checking RAM usage
 Used 308 bytes of 512 (60.2 % full)
 Checking Flash usage
-Used 12164 bytes of 12288 (99.0 % full)
+Used 12158 bytes of 12288 (98.9 % full)
 Updating config source
 
 AT90USB1286_16MHz_COSTAR.hex
@@ -76,7 +76,7 @@ Parsing MAP file
 Checking RAM usage
 Used 1552 bytes of 8192 (18.9 % full)
 Checking Flash usage
-Used 33644 bytes of 122880 (27.4 % full)
+Used 33656 bytes of 122880 (27.4 % full)
 Updating config source
 
 AT90USB1286_16MHz_FULLSIZE.hex
@@ -86,7 +86,7 @@ Parsing MAP file
 Checking RAM usage
 Used 1492 bytes of 8192 (18.2 % full)
 Checking Flash usage
-Used 33316 bytes of 122880 (27.1 % full)
+Used 33328 bytes of 122880 (27.1 % full)
 Updating config source
 
 AT90USB1286_16MHz_JUMBO.hex
@@ -96,7 +96,7 @@ Parsing MAP file
 Checking RAM usage
 Used 1672 bytes of 8192 (20.4 % full)
 Checking Flash usage
-Used 34412 bytes of 122880 (28.0 % full)
+Used 34424 bytes of 122880 (28.0 % full)
 Updating config source
 
 AT90USB1286_8MHz_FULLSIZE.hex
@@ -106,7 +106,7 @@ Parsing MAP file
 Checking RAM usage
 Used 1492 bytes of 8192 (18.2 % full)
 Checking Flash usage
-Used 33318 bytes of 122880 (27.1 % full)
+Used 33330 bytes of 122880 (27.1 % full)
 Updating config source
 
 ATmega32U4_8MHz_TKL.hex
@@ -116,5 +116,5 @@ Parsing MAP file
 Checking RAM usage
 Used 1177 bytes of 2560 (46.0 % full)
 Checking Flash usage
-Used 28502 bytes of 28672 (99.4 % full)
+Used 28514 bytes of 28672 (99.4 % full)
 Updating config source
diff --git a/firmware/src/config_keymap.h b/firmware/src/config_keymap.h
@@ -130,6 +130,8 @@
 #define SCANCODE_KEYLOCK 0xC8
 #define SCANCODE_WINLOCK 0xC9
 #define SCANCODE_ESCGRAVE 0xCA
+#define SCANCODE_MRAM_RECORD 0xCC
+#define SCANCODE_MRAM_PLAY 0xCD
 #define SCANCODE_BOOT 0xCE
 #define SCANCODE_CONFIG 0xCF
 
@@ -147,8 +149,8 @@
 #define SCANCODE_M12 0xDB
 #define SCANCODE_M13 0xDC
 #define SCANCODE_M14 0xDD
-#define SCANCODE_MRAM_RECORD 0xDE
-#define SCANCODE_MRAM_PLAY 0xDF
+#define SCANCODE_M15 0xDE
+#define SCANCODE_M16 0xDF
 
 /* Must be larger than the 0xE0 range */
 #define SCANCODE_FN0 0xF0
@@ -180,7 +182,7 @@
 #define MACRO_RAM_SIZE (160)
 #endif /* Larger ATmega Devices */
 
-#define NUMBER_OF_MACROS (14)
+#define NUMBER_OF_MACROS (16)
 
 /* Action word definition
 Gui

diff --git a/firmware/src/keymap.c b/firmware/src/keymap.c
@@ -857,6 +857,8 @@ void handle_code_actuate(const uint8_t code, const uint8_t action, const uint8_t
 	case SCANCODE_M12:
 	case SCANCODE_M13:
 	case SCANCODE_M14:
+	case SCANCODE_M15:
+	case SCANCODE_M16:
 		play_macro(code);
 		break;
 #ifdef MACRO_RAM_SIZE
@@ -1125,6 +1127,8 @@ void handle_code_deactuate(const uint8_t code, const uint8_t action, const uint8
 	case SCANCODE_M12:
 	case SCANCODE_M13:
 	case SCANCODE_M14:
+	case SCANCODE_M15:
+	case SCANCODE_M16:
 	case SCANCODE_MRAM_RECORD:
 	case SCANCODE_MRAM_PLAY:
 		break;