Merge branch 'master' into profiles

2019-01-07 10:39:44 -05:00
parent df02ea48d2 941d241e7d
commit 62b40e9155
18 changed files with 132 additions and 50 deletions
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -39,6 +39,8 @@ enum Values {
    R,
    Start,
    Select,
+    Debug,
+    Gpio14,

    ZL,
    ZR,
@@ -73,6 +75,8 @@ static const std::array<const char*, NumButtons> mapping = {{
    "button_r",
    "button_start",
    "button_select",
+    "button_debug",
+    "button_gpio14",
    "button_zl",
    "button_zr",
    "button_home",