diff options
Diffstat (limited to 'apps/gui/wps.c')
-rw-r--r-- | apps/gui/wps.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 3c0982270e..ca74c452f4 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -99,10 +99,6 @@ void wps_data_load(enum screen_type screen, const char *buf, bool isfile) | |||
99 | { | 99 | { |
100 | bool loaded_ok; | 100 | bool loaded_ok; |
101 | 101 | ||
102 | #if LCD_DEPTH > 1 | ||
103 | screens[screen].backdrop_unload(BACKDROP_SKIN_WPS); | ||
104 | #endif | ||
105 | |||
106 | #ifndef __PCTOOL__ | 102 | #ifndef __PCTOOL__ |
107 | /* | 103 | /* |
108 | * Hardcode loading WPS_DEFAULTCFG to cause a reset ideally this | 104 | * Hardcode loading WPS_DEFAULTCFG to cause a reset ideally this |
@@ -129,6 +125,9 @@ void wps_data_load(enum screen_type screen, const char *buf, bool isfile) | |||
129 | { | 125 | { |
130 | char *skin_buf[NB_SCREENS] = { | 126 | char *skin_buf[NB_SCREENS] = { |
131 | #ifdef HAVE_LCD_BITMAP | 127 | #ifdef HAVE_LCD_BITMAP |
128 | #if LCD_DEPTH > 1 | ||
129 | "%Xd\n" | ||
130 | #endif | ||
132 | "%s%?it<%?in<%in. |>%it|%fn>\n" | 131 | "%s%?it<%?in<%in. |>%it|%fn>\n" |
133 | "%s%?ia<%ia|%?d2<%d2|(root)>>\n" | 132 | "%s%?ia<%ia|%?d2<%d2|(root)>>\n" |
134 | "%s%?id<%id|%?d1<%d1|(root)>> %?iy<(%iy)|>\n\n" | 133 | "%s%?id<%id|%?d1<%d1|(root)>> %?iy<(%iy)|>\n\n" |
@@ -140,6 +139,9 @@ void wps_data_load(enum screen_type screen, const char *buf, bool isfile) | |||
140 | "%pc%?ps<*|/>%pt\n", | 139 | "%pc%?ps<*|/>%pt\n", |
141 | #endif | 140 | #endif |
142 | #ifdef HAVE_REMOTE_LCD | 141 | #ifdef HAVE_REMOTE_LCD |
142 | #if LCD_REMOTE_DEPTH > 1 | ||
143 | "%Xd\n" | ||
144 | #endif | ||
143 | "%s%?ia<%ia|%?d2<%d2|(root)>>\n" | 145 | "%s%?ia<%ia|%?d2<%d2|(root)>>\n" |
144 | "%s%?it<%?in<%in. |>%it|%fn>\n" | 146 | "%s%?it<%?in<%in. |>%it|%fn>\n" |
145 | "%al%pc/%pt%ar[%pp:%pe]\n" | 147 | "%al%pc/%pt%ar[%pp:%pe]\n" |
@@ -563,9 +565,6 @@ static void gwps_leave_wps(void) | |||
563 | FOR_NB_SCREENS(i) | 565 | FOR_NB_SCREENS(i) |
564 | { | 566 | { |
565 | gui_wps[i].display->stop_scroll(); | 567 | gui_wps[i].display->stop_scroll(); |
566 | #if LCD_DEPTH > 1 | ||
567 | gui_wps[i].display->backdrop_show(BACKDROP_MAIN); | ||
568 | #endif | ||
569 | 568 | ||
570 | #ifdef HAVE_LCD_BITMAP | 569 | #ifdef HAVE_LCD_BITMAP |
571 | bool draw = false; | 570 | bool draw = false; |
@@ -614,7 +613,6 @@ static void gwps_enter_wps(void) | |||
614 | vp->fg_pattern = display->get_foreground(); | 613 | vp->fg_pattern = display->get_foreground(); |
615 | vp->bg_pattern = display->get_background(); | 614 | vp->bg_pattern = display->get_background(); |
616 | } | 615 | } |
617 | display->backdrop_show(BACKDROP_SKIN_WPS); | ||
618 | #endif | 616 | #endif |
619 | /* make the backdrop actually take effect */ | 617 | /* make the backdrop actually take effect */ |
620 | display->clear_display(); | 618 | display->clear_display(); |
@@ -1298,9 +1296,6 @@ void gui_sync_wps_init(void) | |||
1298 | /* Currently no seperate wps_state needed/possible | 1296 | /* Currently no seperate wps_state needed/possible |
1299 | so use the only available ( "global" ) one */ | 1297 | so use the only available ( "global" ) one */ |
1300 | gui_wps[i].state = &wps_state; | 1298 | gui_wps[i].state = &wps_state; |
1301 | #if LCD_DEPTH > 1 | ||
1302 | gui_wps[i].display->backdrop_unload(BACKDROP_SKIN_WPS); | ||
1303 | #endif | ||
1304 | /* must point to the same struct for both screens */ | 1299 | /* must point to the same struct for both screens */ |
1305 | gui_wps[i].sync_data = &wps_sync_data; | 1300 | gui_wps[i].sync_data = &wps_sync_data; |
1306 | } | 1301 | } |