projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
STM32: RTC: add missing include
[bertos.git]
/
bertos
/
gui
/
leveledit.c
diff --git
a/bertos/gui/leveledit.c
b/bertos/gui/leveledit.c
index 902d7154d68e29fb0b5b5334c53697d8362889dd..27a46683860a67ef1229ca2f1078da87033d8059 100644
(file)
--- a/
bertos/gui/leveledit.c
+++ b/
bertos/gui/leveledit.c
@@
-32,29
+32,29
@@
*
* \brief Generic editor for (volume/gain/contrast/...) setting.
*
*
* \brief Generic editor for (volume/gain/contrast/...) setting.
*
- * \version $Id$
* \author Stefano Fedrigo <aleph@develer.com>
*/
#include "leveledit.h"
* \author Stefano Fedrigo <aleph@develer.com>
*/
#include "leveledit.h"
+#include "cfg/cfg_menu.h"
#include <cfg/macros.h> /* MAX() */
#include <cfg/macros.h> /* MAX() */
+
#include <drv/kbd.h>
#include <drv/timer.h>
#include <drv/kbd.h>
#include <drv/timer.h>
+
#include <gui/levelbar.h>
#include <gui/levelbar.h>
-#include <mware/pgm.h>
+
+#include <cpu/pgm.h>
+
#include <gfx/text.h>
#include <gfx/font.h>
#include <gfx/text.h>
#include <gfx/font.h>
-#include <appconfig.h>
#if CONFIG_MENU_MENUBAR
#include <gui/menubar.h>
#endif
#if CONFIG_MENU_MENUBAR
#include <gui/menubar.h>
#endif
-// BEGIN project_grl LOCAL
-#include <drv/lcd_gfx.h>
-#include <gui/guiman.h>
-// END project_grl LOCAL
+#warning FIXME: Revise me!
#define LBAR_HEIGHT 16
#define LBAR_HEIGHT 16
@@
-261,17
+261,8
@@
void level_edit(struct LevelEdit *lev)
}
#endif
}
#endif
-// BEGIN project_grl LOCAL
-#if 1
- //FIXME: must to this only when needed
- lcd_blitBitmap(&lcd_bitmap);
- }
- while (!(keys = GuiMan_KbdPeek()));
-#else
}
while (!(keys = kbd_peek()));
}
while (!(keys = kbd_peek()));
-#endif
-// END project_grl LOCAL
if (keys & K_CANCEL)
break;
if (keys & K_CANCEL)
break;