Remove pl_PL keyboard layout make an alias to en_US

pr3y · Jan 29, 2025 · b555cea · b555cea
1 parent 494192d
commit b555cea
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 151 deletions.
diff --git a/lib/Bad_Usb_Lib/BleKeyboard.h b/lib/Bad_Usb_Lib/BleKeyboard.h
@@ -142,7 +142,6 @@ extern const uint8_t KeyboardLayout_sv_SE[];
 extern const uint8_t KeyboardLayout_da_DK[];
 extern const uint8_t KeyboardLayout_hu_HU[];
 extern const uint8_t KeyboardLayout_tr_TR[];
-extern const uint8_t KeyboardLayout_pl_PL[];
 
 //  Low level key report: up to 6 keys and shift, ctrl etc at once
 typedef struct

diff --git a/lib/Bad_Usb_Lib/CH9329_Keyboard.h b/lib/Bad_Usb_Lib/CH9329_Keyboard.h
@@ -125,7 +125,6 @@ extern const uint8_t KeyboardLayout_sv_SE[];
 extern const uint8_t KeyboardLayout_da_DK[];
 extern const uint8_t KeyboardLayout_hu_HU[];
 extern const uint8_t KeyboardLayout_tr_TR[];
-extern const uint8_t KeyboardLayout_pl_PL[];
 
 // Low level key report: up to 6 keys and shift, ctrl etc at once
 typedef struct CH9329_KeyReport 

diff --git a/lib/Bad_Usb_Lib/KeyboardLayout_pl_PL.cpp b/lib/Bad_Usb_Lib/KeyboardLayout_pl_PL.cpp
diff --git a/lib/Bad_Usb_Lib/USBHIDKeyboard.h b/lib/Bad_Usb_Lib/USBHIDKeyboard.h
@@ -123,7 +123,6 @@ extern const uint8_t KeyboardLayout_sv_SE[];
 extern const uint8_t KeyboardLayout_da_DK[];
 extern const uint8_t KeyboardLayout_hu_HU[];
 extern const uint8_t KeyboardLayout_tr_TR[];
-extern const uint8_t KeyboardLayout_pl_PL[];
 
 //  Low level key report: up to 6 keys and shift, ctrl etc at once
 typedef struct

diff --git a/src/modules/ble/bad_ble.cpp b/src/modules/ble/bad_ble.cpp
@@ -271,7 +271,7 @@ void ble_setup() {
         {"da-DK",       [=]() { chooseKb_ble(KeyboardLayout_da_DK); }},
         {"hu-HU",       [=]() { chooseKb_ble(KeyboardLayout_hu_HU); }},
         {"tr-TR",       [=]() { chooseKb_ble(KeyboardLayout_tr_TR); }},
-        {"pl-PL",       [=]() { chooseKb_ble(KeyboardLayout_pl_PL); }},
+        {"pl-PL",       [=]() { chooseKb_ble(KeyboardLayout_en_US); }},
         {"Main Menu",   [=]() { returnToMenu=true; }},
       };
       index=loopOptions(options,false,true,"Keyboard Layout",index); // It will ask for the keyboard each time, but will save the last chosen to be faster
@@ -361,7 +361,7 @@ void ble_keyboard() {
     {"da-DK",       [=]() { chooseKb_ble(KeyboardLayout_da_DK); }},
     {"hu-HU",       [=]() { chooseKb_ble(KeyboardLayout_hu_HU); }},
     {"tr-TR",       [=]() { chooseKb_ble(KeyboardLayout_tr_TR); }},
-    {"pl-PL",       [=]() { chooseKb_ble(KeyboardLayout_pl_PL); }},
+    {"pl-PL",       [=]() { chooseKb_ble(KeyboardLayout_en_US); }},
     {"Main Menu",   [=]() { returnToMenu = true; }},
   };
   loopOptions(options,false,true,"Keyboard Layout");

diff --git a/src/modules/others/bad_usb.cpp b/src/modules/others/bad_usb.cpp
@@ -280,7 +280,7 @@ void usb_setup() {
         {"Danish (Denmark)", [=]() { chooseKb(KeyboardLayout_da_DK); }},
         {"Hungarian (Hungary)", [=]() { chooseKb(KeyboardLayout_hu_HU); }},
         {"Turkish (Turkey)", [=]() { chooseKb(KeyboardLayout_tr_TR); }},
-        {"Polish (Poland)",  [=]() { chooseKb(KeyboardLayout_pl_PL); }},
+        {"Polish (Poland)",  [=]() { chooseKb(KeyboardLayout_en_US); }},
       };
       loopOptions(options,false,true,"Keyboard Layout");
 
@@ -382,7 +382,7 @@ void usb_keyboard() {
     {"da-DK",       [=]() { chooseKb(KeyboardLayout_da_DK); }},
     {"hu-HU",       [=]() { chooseKb(KeyboardLayout_hu_HU); }},
     {"tr-TR",       [=]() { chooseKb(KeyboardLayout_tr_TR); }},
-    {"pl-PL",       [=]() { chooseKb(KeyboardLayout_pl_PL); }},
+    {"pl-PL",       [=]() { chooseKb(KeyboardLayout_en_US); }},
     {"Main Menu",   [=]() { returnToMenu=true; }},
   };