projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use cfg instead appconfig in bertos modules. Reformat. Remove CVS logs.
[bertos.git]
/
app
/
demo
/
demo.c
diff --git
a/app/demo/demo.c
b/app/demo/demo.c
index 4d0172f9ef62f07c77f464e5f38090e44134a5d3..c13fdf78cb68d31192f5a484bba89ba75000886e 100644
(file)
--- a/
app/demo/demo.c
+++ b/
app/demo/demo.c
@@
-39,6
+39,7
@@
#include <emul/emul.h>
#include <kern/proc.h>
#include <emul/emul.h>
#include <kern/proc.h>
+#include <kern/msg.h>
#include <drv/timer.h>
#include <drv/buzzer.h>
#include <drv/lcd_gfx.h>
#include <drv/timer.h>
#include <drv/buzzer.h>
#include <drv/lcd_gfx.h>
@@
-101,7
+102,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
+124,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);