summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/input_default.cpp2
-rw-r--r--main/input_default.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp
index 734fdf5afa..226656d8f4 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -173,6 +173,7 @@ void InputDefault::joy_connection_changed(int p_idx, bool p_connected, String p_
for (int i=0; i < map_db.size(); i++) {
if (js.uid == map_db[i].uid) {
mapping = i;
+ js.name = map_db[i].name;
//printf("found mapping\n");
};
};
@@ -826,6 +827,7 @@ void InputDefault::parse_mapping(String p_mapping) {
uid.resize(17);
mapping.uid = entry[0];
+ mapping.name = entry[1];
int idx = 1;
while (++idx < entry.size()) {
diff --git a/main/input_default.h b/main/input_default.h
index 2f98d279d6..471ae9e692 100644
--- a/main/input_default.h
+++ b/main/input_default.h
@@ -102,6 +102,7 @@ private:
struct JoyDeviceMapping {
String uid;
+ String name;
Map<int,JoyEvent> buttons;
Map<int,JoyEvent> axis;
JoyEvent hat[HAT_MAX];