X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fdemo%2Fdemo.c;h=c13fdf78cb68d31192f5a484bba89ba75000886e;hb=bcc88ce2113b9b3124bc23dc6429e803b6f917a2;hp=c088aa2b6b0953ed39f2a08bb77470928aa3cbe1;hpb=39d13b375a2fed63f1d07bdea8153dd0cdab3c7c;p=bertos.git diff --git a/app/demo/demo.c b/app/demo/demo.c index c088aa2b..c13fdf78 100644 --- a/app/demo/demo.c +++ b/app/demo/demo.c @@ -37,45 +37,9 @@ * \brief Windowing system test. */ -/*#* - *#* $Log$ - *#* Revision 1.10 2007/09/29 16:30:37 bernie - *#* RASTER_SIZE(): Remove obsolete macro. - *#* - *#* Revision 1.9 2006/09/20 14:29:34 marco - *#* Add proc demo (not yet working). - *#* - *#* Revision 1.8 2006/06/02 12:27:36 bernie - *#* Tweak apparence; enable assertions. - *#* - *#* Revision 1.7 2006/05/27 22:31:18 bernie - *#* Clean it up a bit more. - *#* - *#* Revision 1.6 2006/05/27 17:16:38 bernie - *#* Make demos a bit more interesting. - *#* - *#* Revision 1.5 2006/05/15 07:25:29 bernie - *#* Move menu to gui/. - *#* - *#* Revision 1.4 2006/04/27 05:43:07 bernie - *#* Fix naming conventions. - *#* - *#* Revision 1.3 2006/04/11 00:07:32 bernie - *#* Implemenent MF_SAVESEL flag. - *#* - *#* Revision 1.2 2006/03/27 04:49:50 bernie - *#* Add bouncing logo demo. - *#* - *#* Revision 1.1 2006/03/22 09:52:13 bernie - *#* Add demo application. - *#* - *#* Revision 1.1 2006/01/23 23:14:29 bernie - *#* Implement simple, but impressive windowing system. - *#* - *#*/ - #include #include +#include #include #include #include @@ -138,7 +102,7 @@ static void bouncing_logo(Bitmap *bm) 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 */ @@ -160,9 +124,9 @@ static void bouncing_logo(Bitmap *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, - &project_grl_logo); + &bertos_logo); lcd_blitBitmap(bm); timer_delay(10);