tweak constants for CardKB2.

Author: TinyuZhao

src/unit/unit_CardKB2.cpp

@@ -393,11 +393,11 @@ void UnitCardKB2::update(const bool force)
         if (state == KEY_STATE_PRESSED) {
             _now |= bit;
 
-            if (kidx == 34) {  // sym pressed
+            if (kidx == KEY_SYM) {  // sym pressed
                 _sym_was_pressed = !_sym_was_pressed;
             }
 
-            if (kidx == 22) {  // caps key
+            if (kidx == KEY_AA) {  // caps key
                 _caps_pressing   = true;
                 _caps_pressed_at = at;
             } else {
@@ -420,7 +420,7 @@ void UnitCardKB2::update(const bool force)
         } else if (state == KEY_STATE_RELEASED) {
             _now &= ~bit;
 
-            if (kidx == 22 && _caps_pressing) {
+            if (kidx == KEY_AA && _caps_pressing) {
                 _caps_pressing = false;
 
                 if (_caps_hold_active) {

src/unit/unit_CardKB2.hpp

@@ -41,38 +41,38 @@ class UnitCardKB2 : public UnitKeyboardBitwise {
     static constexpr keyboard::key_index_t KEY_8{7};
     static constexpr keyboard::key_index_t KEY_9{8};
     static constexpr keyboard::key_index_t KEY_0{9};
-    static constexpr keyboard::key_index_t KEY_Q{10};
-    static constexpr keyboard::key_index_t KEY_W{11};
-    static constexpr keyboard::key_index_t KEY_E{12};
-    static constexpr keyboard::key_index_t KEY_R{13};
-    static constexpr keyboard::key_index_t KEY_T{14};
-    static constexpr keyboard::key_index_t KEY_Y{15};
-    static constexpr keyboard::key_index_t KEY_U{16};
-    static constexpr keyboard::key_index_t KEY_I{17};
-    static constexpr keyboard::key_index_t KEY_O{18};
-    static constexpr keyboard::key_index_t KEY_P{19};
-    static constexpr keyboard::key_index_t KEY_DELETE{20};
-    static constexpr keyboard::key_index_t KEY_AA{21};
-    static constexpr keyboard::key_index_t KEY_A{22};
-    static constexpr keyboard::key_index_t KEY_S{23};
-    static constexpr keyboard::key_index_t KEY_D{24};
-    static constexpr keyboard::key_index_t KEY_F{25};
-    static constexpr keyboard::key_index_t KEY_G{26};
-    static constexpr keyboard::key_index_t KEY_H{27};
-    static constexpr keyboard::key_index_t KEY_J{28};
-    static constexpr keyboard::key_index_t KEY_K{29};
-    static constexpr keyboard::key_index_t KEY_L{30};
-    static constexpr keyboard::key_index_t KEY_ENTER{31};
-    static constexpr keyboard::key_index_t KEY_FN{32};
-    static constexpr keyboard::key_index_t KEY_SYM{33};
-    static constexpr keyboard::key_index_t KEY_Z{34};
-    static constexpr keyboard::key_index_t KEY_X{35};
-    static constexpr keyboard::key_index_t KEY_C{36};
-    static constexpr keyboard::key_index_t KEY_V{37};
-    static constexpr keyboard::key_index_t KEY_B{38};
-    static constexpr keyboard::key_index_t KEY_N{39};
-    static constexpr keyboard::key_index_t KEY_M{40};
-    static constexpr keyboard::key_index_t KEY_SPACE{41};
+    static constexpr keyboard::key_index_t KEY_Q{11};
+    static constexpr keyboard::key_index_t KEY_W{12};
+    static constexpr keyboard::key_index_t KEY_E{13};
+    static constexpr keyboard::key_index_t KEY_R{14};
+    static constexpr keyboard::key_index_t KEY_T{15};
+    static constexpr keyboard::key_index_t KEY_Y{16};
+    static constexpr keyboard::key_index_t KEY_U{17};
+    static constexpr keyboard::key_index_t KEY_I{18};
+    static constexpr keyboard::key_index_t KEY_O{19};
+    static constexpr keyboard::key_index_t KEY_P{20};
+    static constexpr keyboard::key_index_t KEY_DELETE{21};
+    static constexpr keyboard::key_index_t KEY_AA{22};
+    static constexpr keyboard::key_index_t KEY_A{23};
+    static constexpr keyboard::key_index_t KEY_S{24};
+    static constexpr keyboard::key_index_t KEY_D{25};
+    static constexpr keyboard::key_index_t KEY_F{26};
+    static constexpr keyboard::key_index_t KEY_G{27};
+    static constexpr keyboard::key_index_t KEY_H{28};
+    static constexpr keyboard::key_index_t KEY_J{29};
+    static constexpr keyboard::key_index_t KEY_K{30};
+    static constexpr keyboard::key_index_t KEY_L{31};
+    static constexpr keyboard::key_index_t KEY_ENTER{32};
+    static constexpr keyboard::key_index_t KEY_FN{33};
+    static constexpr keyboard::key_index_t KEY_SYM{34};
+    static constexpr keyboard::key_index_t KEY_Z{35};
+    static constexpr keyboard::key_index_t KEY_X{36};
+    static constexpr keyboard::key_index_t KEY_C{37};
+    static constexpr keyboard::key_index_t KEY_V{38};
+    static constexpr keyboard::key_index_t KEY_B{39};
+    static constexpr keyboard::key_index_t KEY_N{40};
+    static constexpr keyboard::key_index_t KEY_M{41};
+    static constexpr keyboard::key_index_t KEY_SPACE{42};
     ///@}
 
     ///@name Character code for special keys