From f44aadf9016ca14974f7ec6d4393360f5f4703b0 Mon Sep 17 00:00:00 2001 From: Deon Spengler Date: Mon, 17 May 2021 19:53:06 +0200 Subject: [PATCH] Changed keymap_version to fw_version --- keyboards/handwired/adept42/adept42.h | 2 ++ keyboards/handwired/adept42/keymaps/default/keymap.c | 3 +-- keyboards/handwired/adept42/keymaps/micro/keymap.c | 3 +-- lib/googletest | 2 +- lib/lufa | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/handwired/adept42/adept42.h b/keyboards/handwired/adept42/adept42.h index 6c3609f283..206ddeb483 100644 --- a/keyboards/handwired/adept42/adept42.h +++ b/keyboards/handwired/adept42/adept42.h @@ -16,3 +16,5 @@ { R20, R21, R22, R23, R24, R25 }, \ { R30, R31, R32, KC_NO, KC_NO, KC_NO } \ } + +#define FW_VERSION "2.18" diff --git a/keyboards/handwired/adept42/keymaps/default/keymap.c b/keyboards/handwired/adept42/keymaps/default/keymap.c index 0463ed7117..a0ab741884 100644 --- a/keyboards/handwired/adept42/keymaps/default/keymap.c +++ b/keyboards/handwired/adept42/keymaps/default/keymap.c @@ -8,7 +8,6 @@ #define _L2 2 #define _L3 3 #define _L4 4 -#define KEYMAP_VERSION "2.17" enum { SINGLE_TAP, @@ -325,7 +324,7 @@ void matrix_scan_user(void) { // display adept42 firmware version SEQ_TWO_KEYS(KC_K, KC_V) { uint8_t msg[RAW_EPSIZE] = {0}; - sprintf((char *)msg, "V:%s", KEYMAP_VERSION); + sprintf((char *)msg, "V:%s", FW_VERSION); raw_hid_send(msg, RAW_EPSIZE); } diff --git a/keyboards/handwired/adept42/keymaps/micro/keymap.c b/keyboards/handwired/adept42/keymaps/micro/keymap.c index 378200e9ca..47db3c94c5 100644 --- a/keyboards/handwired/adept42/keymaps/micro/keymap.c +++ b/keyboards/handwired/adept42/keymaps/micro/keymap.c @@ -8,7 +8,6 @@ #define _L2 2 #define _L3 3 #define _L4 4 -#define KEYMAP_VERSION "2.17" enum { SINGLE_TAP, @@ -216,7 +215,7 @@ void matrix_scan_user(void) { // display adept42 firmware version SEQ_TWO_KEYS(KC_K, KC_V) { uint8_t msg[RAW_EPSIZE] = {0}; - sprintf((char *)msg, "V:%s", KEYMAP_VERSION); + sprintf((char *)msg, "V:%s", FW_VERSION); raw_hid_send(msg, RAW_EPSIZE); } diff --git a/lib/googletest b/lib/googletest index ec44c6c167..0eea2e9fc6 160000 --- a/lib/googletest +++ b/lib/googletest @@ -1 +1 @@ -Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 +Subproject commit 0eea2e9fc63461761dea5f2f517bd6af2ca024fa diff --git a/lib/lufa b/lib/lufa index ce10f7642b..07bea4f0c7 160000 --- a/lib/lufa +++ b/lib/lufa @@ -1 +1 @@ -Subproject commit ce10f7642b0459e409839b23cc91498945119b4d +Subproject commit 07bea4f0c7a2770a6e4f23779893524d3452881b