Skip to content

Commit 1fa920b

Browse files
mvladicmvladic
committed
refactoring
1 parent eeb8b21 commit 1fa920b

File tree

117 files changed

+367
-661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+367
-661
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ set(src_eez_gui
278278
)
279279
list (APPEND src_files ${src_eez_gui})
280280
set(header_eez_gui
281-
src/eez/gui/action.h
282281
src/eez/gui/app_context.h
283282
src/eez/gui/assets.h
284283
src/eez/gui/data.h

‎src/eez/debug.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@
3030
// TODO these includes should not be inside apps/psu
3131
#include <eez/modules/psu/psu.h>
3232
#include <eez/modules/psu/datetime.h>
33+
3334
#if OPTION_DISPLAY
34-
#include <eez/gui/assets.h>
35+
#include <eez/gui/gui.h>
3536
#endif
3637

3738
using namespace eez::psu;

‎src/eez/gui/action.h‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/eez/gui/action_impl.cpp‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222

2323
#include <eez/firmware.h>
2424
#include <eez/system.h>
25+
#include <eez/sound.h>
26+
#include <eez/index.h>
2527

26-
#include <eez/gui/dialogs.h>
2728
#include <eez/gui/gui.h>
2829

29-
#include <eez/modules/psu/psu.h>
30+
#include <eez/scpi/scpi.h>
3031

32+
#include <eez/modules/psu/psu.h>
3133
#include <eez/modules/psu/channel_dispatcher.h>
3234
#include <eez/modules/psu/event_queue.h>
3335
#include <eez/modules/psu/persist_conf.h>
34-
#include <eez/sound.h>
3536
#include <eez/modules/psu/trigger.h>
3637
#include <eez/modules/psu/dlog_record.h>
3738
#include <eez/modules/psu/dlog_view.h>
3839

3940
#include <eez/modules/psu/gui/psu.h>
40-
4141
#include <eez/modules/psu/gui/animations.h>
4242
#include <eez/modules/psu/gui/calibration.h>
4343
#include <eez/modules/psu/gui/data.h>
@@ -55,21 +55,15 @@
5555
#include <eez/modules/psu/gui/data.h>
5656
#include <eez/modules/psu/gui/touch_calibration.h>
5757
#include <eez/modules/psu/gui/file_manager.h>
58+
#if OPTION_SD_CARD
59+
#include <eez/modules/psu/sd_card.h>
60+
#endif
5861

5962
#if OPTION_ENCODER
6063
#include <eez/modules/mcu/encoder.h>
6164
#endif
6265

63-
#include <eez/index.h>
64-
6566
#include <eez/modules/bp3c/eeprom.h>
66-
67-
#include <eez/scpi/scpi.h>
68-
69-
#if OPTION_SD_CARD
70-
#include <eez/modules/psu/sd_card.h>
71-
#endif
72-
7367
#include <eez/modules/bp3c/flash_slave.h>
7468
#include <eez/modules/bp3c/io_exp.h>
7569

‎src/eez/gui/app_context.cpp‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,22 @@
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19+
#if OPTION_DISPLAY
20+
1921
#include <math.h>
2022
#include <assert.h>
2123

22-
#include <eez/gui/app_context.h>
24+
#include <eez/index.h>
25+
#include <eez/sound.h>
26+
#include <eez/system.h>
2327

24-
#if OPTION_DISPLAY
28+
#include <eez/gui/gui.h>
29+
#include <eez/gui/widgets/button.h>
2530

26-
// TODO this must be removed from here
2731
#include <eez/modules/psu/psu.h>
28-
2932
#include <eez/modules/psu/devices.h>
3033
#include <eez/modules/psu/idle.h>
31-
3234
#include <eez/modules/psu/gui/psu.h>
33-
//
34-
35-
#include <eez/gui/assets.h>
36-
#include <eez/gui/dialogs.h>
37-
#include <eez/gui/draw.h>
38-
#include <eez/gui/gui.h>
39-
#include <eez/gui/touch.h>
40-
#include <eez/gui/update.h>
41-
#include <eez/gui/widgets/button.h>
42-
#include <eez/index.h>
43-
#include <eez/modules/mcu/display.h>
44-
#include <eez/sound.h>
45-
#include <eez/system.h>
4635

4736
#define CONF_GUI_TOAST_DURATION_MS 2000L
4837

@@ -163,7 +152,7 @@ void AppContext::onPageChanged(int previousPageId, int activePageId) {
163152
}
164153

165154
void AppContext::doShowPage(int pageId, Page *page, int previousPageId) {
166-
page = page ? page : getPageFromId(pageId);
155+
page = page ? page : getPageFromIdHook(pageId);
167156

168157
m_pageNavigationStack[m_pageNavigationStackPointer].page = page;
169158
m_pageNavigationStack[m_pageNavigationStackPointer].pageId = pageId;

‎src/eez/gui/app_context.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818

1919
#pragma once
2020

21-
#include <stdlib.h>
22-
23-
#include <eez/gui/gui.h>
24-
#include <eez/gui/page.h>
25-
#include <eez/modules/mcu/display.h>
26-
2721
#define CONF_GUI_PAGE_NAVIGATION_STACK_SIZE 5
2822
#define CONF_MAX_STATE_SIZE (10 * 1024)
2923

‎src/eez/gui/assets.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,16 @@
1818

1919
#if OPTION_DISPLAY
2020

21-
#include <eez/gui/assets.h>
22-
2321
#include <assert.h>
2422
#include <stdlib.h>
2523
#include <memory.h>
2624

25+
#include <eez/system.h>
26+
#include <eez/memory.h>
27+
2728
#include <eez/libs/lz4/lz4.h>
2829

2930
#include <eez/gui/gui.h>
30-
#include <eez/gui/document.h>
31-
#include <eez/system.h>
32-
33-
#include <eez/memory.h>
3431

3532
namespace eez {
3633
namespace gui {

‎src/eez/gui/data.cpp‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,15 @@
2323
#include <stdio.h>
2424
#include <string.h>
2525

26-
#include <eez/gui/data.h>
27-
28-
#include <scpi/scpi.h>
29-
30-
#include <eez/gui/app_context.h>
31-
#include <eez/gui/dialogs.h>
32-
#include <eez/gui/document.h>
33-
#include <eez/gui/gui.h>
3426
#include <eez/system.h>
3527
#include <eez/util.h>
3628
#include <eez/index.h>
3729
#include <eez/memory.h>
3830

39-
// TODO
31+
#include <scpi/scpi.h>
32+
33+
#include <eez/gui/gui.h>
34+
4035
#include <eez/modules/psu/psu.h>
4136
#include <eez/modules/psu/persist_conf.h>
4237

‎src/eez/gui/dialogs.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,17 @@
1818

1919
#if OPTION_DISPLAY
2020

21-
#include <eez/gui/dialogs.h>
22-
2321
#include <math.h>
2422
#include <string.h>
2523

26-
#include <eez/gui/app_context.h>
2724
#include <eez/system.h>
2825
#include <eez/util.h>
26+
#include <eez/sound.h>
2927

30-
// TODO this must be removed from here
31-
#include <eez/modules/psu/psu.h>
28+
#include <eez/gui/gui.h>
3229

30+
#include <eez/modules/psu/psu.h>
3331
#include <eez/modules/psu/gui/psu.h>
34-
#include <eez/sound.h>
3532

3633
namespace eez {
3734
namespace gui {

‎src/eez/gui/dialogs.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818

1919
#pragma once
2020

21-
#include <stdlib.h>
22-
23-
#include <eez/gui/data.h>
24-
2521
namespace eez {
2622
namespace gui {
2723

0 commit comments

Comments
 (0)