projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proc_new(): Rename stacksize to stack_size for consistency
[bertos.git]
/
app
/
demo
/
demo.c
diff --git
a/app/demo/demo.c
b/app/demo/demo.c
index 4d0172f9ef62f07c77f464e5f38090e44134a5d3..729abe090357eed78814e4c12e8c8e5281459cb9 100644
(file)
--- a/
app/demo/demo.c
+++ b/
app/demo/demo.c
@@
-32,24
+32,30
@@
*
* \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $
*
*
* \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $
*
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
*
* \brief Windowing system test.
*/
*
* \brief Windowing system test.
*/
+#include <cfg/macros.h>
+
#include <emul/emul.h>
#include <emul/emul.h>
+
#include <kern/proc.h>
#include <kern/proc.h>
+#include <kern/msg.h>
+
#include <drv/timer.h>
#include <drv/buzzer.h>
#include <drv/lcd_gfx.h>
#include <drv/kbd.h>
#include <drv/timer.h>
#include <drv/buzzer.h>
#include <drv/lcd_gfx.h>
#include <drv/kbd.h>
+
#include <gfx/gfx.h>
#include <gfx/win.h>
#include <gfx/text.h>
#include <gfx/font.h>
#include <gfx/gfx.h>
#include <gfx/win.h>
#include <gfx/text.h>
#include <gfx/font.h>
+
#include <gui/menu.h>
#include <icons/logo.h>
#include <gui/menu.h>
#include <icons/logo.h>
-#include <cfg/macros.h>
/**
* Draw a pentacle in the provided bitmap.
/**
* Draw a pentacle in the provided bitmap.
@@
-101,7
+107,7
@@
static void bouncing_logo(Bitmap *bm)
const long SPEED_SCALE = 1000;
const long GRAVITY_ACCEL = 10;
const long BOUNCE_ELASTICITY = 2;
const long SPEED_SCALE = 1000;
const long GRAVITY_ACCEL = 10;
const long BOUNCE_ELASTICITY = 2;
- long h = (long)(-
project_grl
_logo.height) * SPEED_SCALE;
+ long h = (long)(-
bertos
_logo.height) * SPEED_SCALE;
long speed = 1000;
/* Repeat until logo stands still on the bottom edge */
long speed = 1000;
/* Repeat until logo stands still on the bottom edge */
@@
-123,9
+129,9
@@
static void bouncing_logo(Bitmap *bm)
/* Update graphics */
gfx_bitmapClear(bm);
gfx_blitImage(bm,
/* Update graphics */
gfx_bitmapClear(bm);
gfx_blitImage(bm,
- (bm->width -
project_grl
_logo.width) / 2,
+ (bm->width -
bertos
_logo.width) / 2,
h / SPEED_SCALE,
h / SPEED_SCALE,
- &
project_grl
_logo);
+ &
bertos
_logo);
lcd_blitBitmap(bm);
timer_delay(10);
lcd_blitBitmap(bm);
timer_delay(10);