Macro Rewrite

headers/addons/display.h

@@ -187,6 +187,7 @@ class DisplayAddon : public GPAddon
 	virtual void process();
 	virtual std::string name() { return DisplayName; }
 private:
+    bool updateDisplayScreen();
 	void drawStatusBar(Gamepad*);
 	void initMenu(char**);
 	bool pressedUp();
@@ -202,14 +203,9 @@ class DisplayAddon : public GPAddon
 	uint32_t prevMillis;
 	std::string statusBar;
 	Gamepad* gamepad;
-	Gamepad* pGamepad;
 	bool configMode;
-
 	GPGFX* gpDisplay;
 	GPScreen* gpScreen;
-
-	std::map<DisplayMode, GPScreen*> loadedScreens;
-
 	DisplayMode currDisplayMode;
 	bool turnOffWhenSuspended;
 };

headers/addons/input_macro.h

@@ -38,23 +38,25 @@ class InputMacro : public GPAddon {
 	virtual void setup();       // Analog Setup
 	virtual void process() {};     // Analog Process
 	virtual void preprocess();
+    virtual void reinit();
     virtual std::string name() { return InputMacroName; }
 private:
-	int macroPosition = -1;
-	bool isMacroRunning = false;
-	bool isMacroTriggerHeld = false;
-
-	uint64_t macroStartTime = 0;
-	uint64_t macroTriggerDebounceStartTime = 0;
-
-	int macroInputPosition = 0;
-	bool macroInputPressed = false;
-	uint32_t macroInputHoldTime = INPUT_HOLD_US;
-	bool prevMacroInputPressed = false;
-	bool boardLedEnabled = false;
-
-	MacroOptions inputMacroOptions;
+	void checkMacroPress();
+	void checkMacroAction();
+	void runCurrentMacro();
 	void reset();
+	bool isMacroRunning;
+	bool isMacroTriggerHeld;
+	int macroPosition;
+	uint32_t macroButtonMask;
+	uint32_t macroPinMasks[6];
+	uint64_t macroStartTime;
+	int pressedMacro;
+	int macroInputPosition;
+	uint32_t macroInputHoldTime;
+	bool prevMacroInputPressed;
+	bool boardLedEnabled;
+	MacroOptions * inputMacroOptions;
 };
 
 #endif  // _InputMacro_H_

headers/display/GPGFX_UI.h

@@ -14,17 +14,11 @@ class GPGFX_UI {
     public:
         GPGFX_UI();
         GPGFX_UI(GPGFX* renderer) { setRenderer(renderer); }
-
         void setRenderer(GPGFX* renderer) { _renderer = renderer; }
         GPGFX* getRenderer() { return _renderer; }
-
         Gamepad* getGamepad();
         Gamepad* getProcessedGamepad();
-
         DisplayOptions getDisplayOptions();
-
-        bool getConfigMode();
-
         uint16_t map(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max);
     private:
         GPGFX* _renderer;

headers/display/ui/elements/GPButton.h

@@ -9,8 +9,7 @@
 class GPButton : public GPWidget {
     public:
         void draw();
-        GPButton* setSizeX(uint16_t sizeX) { this->_sizeX = sizeX; return this; }
-        GPButton* setSizeY(uint16_t sizeY) { this->_sizeY = sizeY; return this; }
+        GPButton* setSize(uint16_t sizeX, uint16_t sizeY) { this->_sizeX = sizeX; this->_sizeY = sizeY; return this; }
         GPButton* setInputMask(int16_t inputMask) { this->_inputMask = inputMask; return this; }
         GPButton* setInputDirection(bool inputDirection) { this->_inputDirection = inputDirection; return this; }
         GPButton* setInputType(GPElement inputType) { this->_inputType = inputType; return this; }

headers/display/ui/elements/GPScreen.h

@@ -3,30 +3,23 @@
 
 #include <vector>
 #include <cstring>
-#include <memory>
 #include "GPWidget.h"
 
 class GPScreen : public GPWidget {
     public:
         void draw();
-        std::string header = "";
-        std::string footer = "";
-        virtual int8_t update();
+        virtual int8_t update() = 0;
         void clear();
-
-        template<typename _GPWidget, typename... _GPArgs>
-        _GPWidget* addElement(_GPArgs&&... args) {
-            using GPW = std::unique_ptr<_GPWidget>;
-            GPW new_element = std::make_unique<_GPWidget>(std::forward<_GPArgs>(args)...);
-            GPWidget* raw_ptr = new_element.get();
-            displayList.emplace_back(std::move(new_element));
-            return static_cast<_GPWidget*>(raw_ptr);
-        }
+        virtual void init() = 0;
     protected:
         virtual void drawScreen() = 0;
-
+        GPWidget* addElement(GPWidget* element) {
+            displayList.push_back(element);
+            element->setID(displayList.size()-1);
+            return element;
+        }
     private:
-        std::vector<std::unique_ptr<GPWidget>> displayList;
+        std::vector<GPWidget*> displayList;
 };
 
 #endif

headers/display/ui/elements/GPShape.h

@@ -7,8 +7,7 @@
 class GPShape : public GPWidget {
     public:
         void draw();
-        GPShape* setSizeX(uint16_t sizeX) { this->_sizeX = sizeX; return this; }
-        GPShape* setSizeY(uint16_t sizeY) { this->_sizeY = sizeY; return this; }
+        GPShape* setSize(uint16_t sizeX, uint16_t sizeY) { this->_sizeX = sizeX; this->_sizeY = sizeY; return this; }
         GPShape* setAngle(double angle) { this->_angle = angle; return this; }
         GPShape* setAngleEnd(double angleEnd) { this->_angleEnd = angleEnd; return this; }
         GPShape* setClosed(bool closed) { this->_closed = closed; return this; }

headers/display/ui/elements/GPSprite.h

@@ -6,8 +6,7 @@
 class GPSprite : public GPWidget {
     public:
         void draw();
-        GPSprite* setSizeX(uint16_t sizeX) { this->_sizeX = sizeX; return this; }
-        GPSprite* setSizeY(uint16_t sizeY) { this->_sizeY = sizeY; return this; }
+        GPSprite* setSize(uint16_t sizeX, uint16_t sizeY) { this->_sizeX = sizeX; this->_sizeY = sizeY; return this; }
     private:
         uint16_t _sizeX = 0;
         uint16_t _sizeY = 0;

headers/display/ui/screens/ButtonLayoutScreen.h

@@ -40,20 +40,103 @@
 #define INPUT_HISTORY_MAX_INPUTS 22
 #define INPUT_HISTORY_MAX_MODES 11
 
+// Static to ensure memory is never doubled
+static const char * displayNames[INPUT_HISTORY_MAX_MODES][INPUT_HISTORY_MAX_INPUTS] = {
+    {		// HID / DINPUT
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            CHAR_CROSS, CHAR_CIRCLE, CHAR_SQUARE, CHAR_TRIANGLE,
+            "L1", "R1", "L2", "R2",
+            "SL", "ST", "L3", "R3", "PS", "A2"
+    },
+    {		// Switch
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            "B", "A", "Y", "X",
+            "L", "R", "ZL", "ZR",
+            "-", "+", "LS", "RS", CHAR_HOME_S, CHAR_CAP_S
+    },
+    {		// XInput
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            "A", "B", "X", "Y",
+            "LB", "RB", "LT", "RT",
+            CHAR_VIEW_X, CHAR_MENU_X, "LS", "RS", CHAR_HOME_X, "A2"
+    },
+    {		// Keyboard / HID-KB
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            "B1", "B2", "B3", "B4",
+            "L1", "R1", "L2", "R2",
+            "S1", "S2", "L3", "R3", "A1", "A2"
+    },
+    {		// PS4
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            CHAR_CROSS, CHAR_CIRCLE, CHAR_SQUARE, CHAR_TRIANGLE,
+            "L1", "R1", "L2", "R2",
+            CHAR_SHARE_P, "OP", "L3", "R3", CHAR_HOME_P, CHAR_TPAD_P
+    },
+    {		// GEN/MD Mini
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            "A", "B", "X", "Y",
+            "", "Z", "", "C",
+            "M", "S", "", "", "", ""
+    },
+    {		// Neo Geo Mini
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            "B", "D", "A", "C",
+            "", "", "", "",
+            "SE", "ST", "", "", "", ""
+    },
+    {		// PC Engine/TG16 Mini
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            "I", "II", "", "",
+            "", "", "", "",
+            "SE", "RUN", "", "", "", ""
+    },
+    {		// Egret II Mini
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            "A", "B", "C", "D",
+            "", "E", "", "F",
+            "CRD", "ST", "", "", "MN", ""
+    },
+    {		// Astro City Mini
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            "A", "B", "D", "E",
+            "", "C", "", "F",
+            "CRD", "ST", "", "", "", ""
+    },
+    {		// Original Xbox
+            CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
+            CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
+            "A", "B", "X", "Y",
+            "BL", "WH", "L", "R",
+            "BK", "ST", "LS", "RS", "", ""
+    }
+};
+
 class ButtonLayoutScreen : public GPScreen {
     public:
         ButtonLayoutScreen() {}
         ButtonLayoutScreen(GPGFX* renderer) { setRenderer(renderer); }
-        int8_t update();
+        virtual int8_t update();
+        virtual void init();
     protected:
-        void drawScreen();
+        virtual void drawScreen();
     private:
         // new layout methods
-        GPLever* drawLever(uint16_t startX, uint16_t startY, uint16_t sizeX, uint16_t sizeY, uint16_t strokeColor, uint16_t fillColor, uint16_t inputType);
-        GPButton* drawButton(uint16_t startX, uint16_t startY, uint16_t sizeX, uint16_t sizeY, uint16_t strokeColor, uint16_t fillColor, int16_t inputMask = -1);
-        GPSprite* drawSprite(uint16_t startX, uint16_t startY, uint16_t sizeX, uint16_t sizeY);
-        GPShape* drawShape(uint16_t startX, uint16_t startY, uint16_t sizeX, uint16_t sizeY, uint16_t strokeColor, uint16_t fillColor);
-        GPWidget* drawElement(GPButtonLayout element);
+        GPLever* addLever(uint16_t startX, uint16_t startY, uint16_t sizeX, uint16_t sizeY, uint16_t strokeColor, uint16_t fillColor, uint16_t inputType);
+        GPButton* addButton(uint16_t startX, uint16_t startY, uint16_t sizeX, uint16_t sizeY, uint16_t strokeColor, uint16_t fillColor, int16_t inputMask = -1);
+        GPSprite* addSprite(uint16_t startX, uint16_t startY, uint16_t sizeX, uint16_t sizeY);
+        GPShape* addShape(uint16_t startX, uint16_t startY, uint16_t sizeX, uint16_t sizeY, uint16_t strokeColor, uint16_t fillColor);
+        GPWidget* pushElement(GPButtonLayout element);
+        void generateHeader();
 
         const std::map<uint16_t, uint16_t> displayModeLookup = {
             {INPUT_MODE_HID, 0},
@@ -72,26 +155,28 @@ class ButtonLayoutScreen : public GPScreen {
             {INPUT_MODE_XBOXORIGINAL, 10},
         };
 
+        Gamepad* gamepad;
+        InputMode inputMode;
+        std::string statusBar;
+        std::string footer;
+
         bool isInputHistoryEnabled = false;
         uint16_t inputHistoryX = 0;
         uint16_t inputHistoryY = 0;
-        int16_t inputHistoryLength = 0;
+        size_t inputHistoryLength = 0;
         std::string historyString;
         std::deque<std::string> inputHistory;
         std::array<bool, INPUT_HISTORY_MAX_INPUTS> lastInput;
 
+        bool profileModeDisplay;
         uint8_t profileDelay = 2;
         int profileDelayStart = 0;
-        bool displayProfileBanner = true;
-
-        bool hasInitialized = false;
-
         uint16_t prevButtonState = 0;
         uint8_t prevLayoutLeft = 0;
         uint8_t prevLayoutRight = 0;
         uint8_t prevProfileNumber = 0;
 
-        void showProfileBanner();
+        bool macroEnabled;
 
         uint16_t map(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max);
         void processInputHistory();
@@ -103,86 +188,6 @@ class ButtonLayoutScreen : public GPScreen {
         bool pressedUpRight();
         bool pressedDownLeft();
         bool pressedDownRight();
-
-        const std::string displayNames[INPUT_HISTORY_MAX_MODES][INPUT_HISTORY_MAX_INPUTS] = {
-            {		// HID / DINPUT
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    CHAR_CROSS, CHAR_CIRCLE, CHAR_SQUARE, CHAR_TRIANGLE,
-                    "L1", "R1", "L2", "R2",
-                    "SL", "ST", "L3", "R3", "PS", "A2"
-            },
-            {		// Switch
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    "B", "A", "Y", "X",
-                    "L", "R", "ZL", "ZR",
-                    "-", "+", "LS", "RS", CHAR_HOME_S, CHAR_CAP_S
-            },
-            {		// XInput
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    "A", "B", "X", "Y",
-                    "LB", "RB", "LT", "RT",
-                    CHAR_VIEW_X, CHAR_MENU_X, "LS", "RS", CHAR_HOME_X, "A2"
-            },
-            {		// Keyboard / HID-KB
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    "B1", "B2", "B3", "B4",
-                    "L1", "R1", "L2", "R2",
-                    "S1", "S2", "L3", "R3", "A1", "A2"
-            },
-            {		// PS4
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    CHAR_CROSS, CHAR_CIRCLE, CHAR_SQUARE, CHAR_TRIANGLE,
-                    "L1", "R1", "L2", "R2",
-                    CHAR_SHARE_P, "OP", "L3", "R3", CHAR_HOME_P, CHAR_TPAD_P
-            },
-            {		// GEN/MD Mini
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    "A", "B", "X", "Y",
-                    "", "Z", "", "C",
-                    "M", "S", "", "", "", ""
-            },
-            {		// Neo Geo Mini
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    "B", "D", "A", "C",
-                    "", "", "", "",
-                    "SE", "ST", "", "", "", ""
-            },
-            {		// PC Engine/TG16 Mini
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    "I", "II", "", "",
-                    "", "", "", "",
-                    "SE", "RUN", "", "", "", ""
-            },
-            {		// Egret II Mini
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    "A", "B", "C", "D",
-                    "", "E", "", "F",
-                    "CRD", "ST", "", "", "MN", ""
-            },
-            {		// Astro City Mini
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    "A", "B", "D", "E",
-                    "", "C", "", "F",
-                    "CRD", "ST", "", "", "", ""
-            },
-            {		// Original Xbox
-                    CHAR_UP, CHAR_DOWN, CHAR_LEFT, CHAR_RIGHT,
-                    CHAR_UL, CHAR_UR, CHAR_DL, CHAR_DR,
-                    "A", "B", "X", "Y",
-                    "BL", "WH", "L", "R",
-                    "BK", "ST", "LS", "RS", "", ""
-            }
-        };
 };
 
 #endif