Skip to content

Commit f399a42

Browse files
committed
reduce memory needs for main menu.
1 parent 8b3cd29 commit f399a42

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

lib/3rd_party_adapters/LVGL/GuiEngine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ void GuiEngine::refresh()
211211
*
212212
* @param menuList - list of items for the menu to display
213213
*/
214-
void GuiEngine::drawMenu(const MenuItemList *menuList)
214+
void GuiEngine::drawMenu(const MenuItemList &menuList)
215215
{
216-
CurrentScreen = std::make_shared<ScreenMenu>(*menuList);
216+
CurrentScreen = std::make_shared<ScreenMenu>(menuList);
217217
CurrentScreen->draw();
218218
}

lib/3rd_party_adapters/LVGL/GuiEngine.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class GuiEngine : public IGuiEngine
2323
GuiEngine(const Configuration &configuration, TwoWire &i2c);
2424
virtual void registerKeyPad(IKeypad *keypad) override;
2525
virtual void refresh() override;
26-
virtual void drawMenu(const MenuItemList *menuList) override;
26+
virtual void drawMenu(const MenuItemList &menuList) override;
2727

2828
Adafruit_SSD1306 display;
2929

lib/3rd_party_adapters/LVGL/Screen.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static void ScreenMenu_value_cb(lv_event_t *e)
130130
*
131131
* @param itemList - List of items to be drawn with this menu
132132
*/
133-
ScreenMenu::ScreenMenu(MenuItemList itemList)
133+
ScreenMenu::ScreenMenu(const MenuItemList &itemList)
134134
: _List{itemList}
135135
{
136136
}

lib/3rd_party_adapters/LVGL/Screen.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ class IScreen
2929
class ScreenMenu final : public IScreen
3030
{
3131
public:
32-
ScreenMenu(MenuItemList itemList);
32+
ScreenMenu(const MenuItemList &itemList);
3333
~ScreenMenu() override = default;
3434

3535
void draw() override;
3636

3737
private:
38-
const MenuItemList _List;
38+
const MenuItemList &_List;
3939
};
4040

4141
/**

lib/application_business_rules/user_interaction/IGuiEngine.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ class IGuiEngine
1212
public:
1313
virtual void registerKeyPad(IKeypad *keypad) = 0;
1414
virtual void refresh() = 0;
15-
virtual void drawMenu(const MenuItemList *menuList) = 0;
15+
virtual void drawMenu(const MenuItemList &menuList) = 0;
1616
};

lib/application_business_rules/user_interaction/Menu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Menu::Menu(IGuiEngine &guiEngineToUse, IKeypad &keypad)
5656
subMenu3.push_back(&Sub3Button2);
5757

5858
/* draw the main menu with GuiEngine */
59-
guiEngine.drawMenu(&mainMenu);
59+
guiEngine.drawMenu(mainMenu);
6060
}
6161

6262
/**

0 commit comments

Comments
 (0)