From 261b1d1914bced4c841a2ecd2d31340852bbc2b8 Mon Sep 17 00:00:00 2001 From: batt Date: Mon, 4 Feb 2008 23:42:15 +0000 Subject: [PATCH] Remove unused files. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1084 38d2e660-2303-0410-9eaa-f027e97ec537 --- app/demo/demo.c | 333 ----------------------------------------------- app/demo/demo.mk | 115 ---------------- 2 files changed, 448 deletions(-) delete mode 100644 app/demo/demo.c delete mode 100644 app/demo/demo.mk diff --git a/app/demo/demo.c b/app/demo/demo.c deleted file mode 100644 index 226463ed..00000000 --- a/app/demo/demo.c +++ /dev/null @@ -1,333 +0,0 @@ -/** - * \file - * - * - * \version $Id$ - * - * \author Bernardo Innocenti - * - * \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 -#include -#include -#include -#include -#include -#include -#include - -/** - * Draw a pentacle in the provided bitmap. - */ -void schedule(void) -{ - lcd_blitBitmap(&lcd_bitmap); - emul_idle(); -} - -/** - * Draw a pentacle in the provided bitmap. - */ -static void magic(struct Bitmap *bitmap, coord_t x, coord_t y) -{ - static const coord_t coords[] = { 120, 34, 90, 90, 30, 90, 0, 34, 60, 0, 90, 90, 0, 34, 120, 34, 30, 90, 60, 0 }; - unsigned int i; - - gfx_moveTo(bitmap, coords[countof(coords)-2]/2 + x, coords[countof(coords)-1]/3 + y); - for (i = 0; i < countof(coords); i += 2) - gfx_lineTo(bitmap, coords[i]/2 + x, coords[i+1]/3 + y); -} - -static void hello_world(Bitmap *bm) -{ - extern const Font font_ncenB18; - const Font *old_font = bm->font; - - gfx_bitmapClear(bm); - - /* Set big font */ - gfx_setFont(bm, &font_ncenB18); - - text_xprintf(bm, 1, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER, - "Hello, world!"); - - lcd_blitBitmap(bm); - timer_delay(1000); - - /* Restore old font */ - gfx_setFont(bm, old_font); -} - -/** - * Show the splash screen - */ -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 speed = 1000; - - /* Repeat until logo stands still on the bottom edge */ - while (!((speed == 0) && (h == 0))) - { - /* Move */ - h += speed; - - /* Gravity acceleration */ - speed += GRAVITY_ACCEL; - - if (h > 0 && speed > 0) - { - /* Bounce */ - speed = - (speed / BOUNCE_ELASTICITY); - - } - - /* Update graphics */ - gfx_bitmapClear(bm); - gfx_blitImage(bm, - (bm->width - project_grl_logo.width) / 2, - h / SPEED_SCALE, - &project_grl_logo); - lcd_blitBitmap(bm); - - timer_delay(10); - } -} - -void win_demo(Bitmap *bm) -{ - const coord_t small_left = 45, small_top = 30, small_width = 50, small_height = 30; - const coord_t large_left = -10, large_top = 10, large_width = 85, large_height = 41; - - Window root_win, small_win, large_win; - Bitmap small_bm, large_bm; - uint8_t small_raster[RAST_SIZE(small_width, small_height)]; - uint8_t large_raster[RAST_SIZE(large_width, large_height)]; - - win_create(&root_win, bm); - - gfx_bitmapInit(&large_bm, large_raster, large_width, large_height); - win_create(&large_win, &large_bm); - win_open(&large_win, &root_win); - win_move(&large_win, large_left, large_top); - - gfx_bitmapInit(&small_bm, small_raster, small_width, small_height); - win_create(&small_win, &small_bm); - win_open(&small_win, &root_win); - win_move(&small_win, small_left, small_top); - - - coord_t x = 0, y = LCD_WIDTH / 2; - coord_t xdir = +1, ydir = -1; - coord_t xdir_large = +1; - coord_t ydir_small = +1; - int raise_counter = 0; - int i; - - for(;;) - { - /* Background animation */ - bm = root_win.bitmap; - gfx_bitmapClear(bm); -// gfx_setClipRect(bm, 0, 0, bm->width, bm->height); -// gfx_rectDraw(bm, 10, 10, bm->width-10, bm->height-10); -// gfx_setClipRect(bm, 11, 11, bm->width-11, bm->height-11); - magic(bm, x, y); - x += xdir; - y += ydir; - if (x >= bm->width) xdir = -1; - if (x <= -50) xdir = +1; - if (y >= bm->height) ydir = -1; - if (y <= -50) ydir = +1; - - /* Large window animation */ - bm = large_win.bitmap; - gfx_bitmapClear(bm); - for (i = 0; i < bm->height / 2; i += 2) - gfx_rectDraw(bm, 0 + i, 0 + i, bm->width - i, bm->height - i); - - - /* Small window animation */ - bm = small_win.bitmap; - gfx_bitmapClear(bm); - gfx_rectDraw(bm, 0, 0, bm->width, bm->height); - gfx_line(bm, 0, 0, bm->width, bm->height); - gfx_line(bm, bm->width, 0, 0, bm->height); - - /* Move windows around */ - win_move(&large_win, large_win.geom.xmin + xdir_large, large_top); - if (large_win.geom.xmin < -20) xdir_large = +1; - if (large_win.geom.xmin > RECT_WIDTH(&root_win.geom) - 5) xdir_large = -1; - - win_move(&small_win, small_left, small_win.geom.ymin + ydir_small); - if (small_win.geom.ymin < -20) ydir_small = +1; - if (small_win.geom.ymin > RECT_HEIGHT(&root_win.geom) - 5) ydir_small = -1; - - ++raise_counter; - if (raise_counter % 997 == 0) - win_raise(&small_win); - else if (raise_counter % 731 == 0) - win_raise(&large_win); - - win_compose(&root_win); - - /* Also does LCD refresh, etc. */ - if (kbd_peek()) - break; - } -} - -void proc_demo(void) -{ - extern void proc_test(void); -// FIXME: proc_test() cause segmentation fault. - proc_test(); -} - - -/* SETTINGS SUBMENU */ - -static struct MenuItem settings_items[] = -{ - { (const_iptr_t)"System", 0, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Language", 0, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Networking", 0, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Date & Time",0, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Power Saving", MIF_TOGGLE, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)0, 0, NULL, (iptr_t)0 } -}; -static struct Menu settings_menu = { settings_items, "Settings Menu", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 }; - - -/* MX SUBMENU */ - -static struct MenuItem mx_items[] = -{ - { (const_iptr_t)"Mouse", MIF_CHECKIT | MIF_EXCLUDE_1 | MIF_EXCLUDE_2, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Keyboard", MIF_CHECKED | MIF_CHECKIT | MIF_EXCLUDE_0 | MIF_EXCLUDE_2, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Joystick", MIF_CHECKIT | MIF_EXCLUDE_0 | MIF_EXCLUDE_1, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Autosave", MIF_CHECKED | MIF_CHECKIT | MIF_TOGGLE, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)0, 0, NULL, (iptr_t)0 } -}; - -static struct Menu mx_menu = { mx_items, (const_iptr_t)0, MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 }; - - -/* DISPLAY SUBMENU */ - -static struct MenuItem display_items[] = -{ - { (const_iptr_t)"Background", 0, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Colors", 0, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Style", 0, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)"Icon Theme", 0, (MenuHook)0, (iptr_t)0 }, - { (const_iptr_t)0, 0, NULL, (iptr_t)0 } -}; -static struct Menu display_menu = { display_items, "Display Menu", MF_SAVESEL, &lcd_bitmap, 0 }; - - -/* MAIN MENU */ - -static struct MenuItem main_items[] = -{ - { (const_iptr_t)"Win Fly", 0, (MenuHook)win_demo, (iptr_t)&lcd_bitmap }, - { (const_iptr_t)"Bounce!", 0, (MenuHook)bouncing_logo,(iptr_t)&lcd_bitmap }, - { (const_iptr_t)"Hello World", 0, (MenuHook)hello_world, (iptr_t)&lcd_bitmap }, - { (const_iptr_t)"Scheduling", 0, (MenuHook)proc_demo, (iptr_t)&lcd_bitmap }, - { (const_iptr_t)"Menu MX", 0, (MenuHook)menu_handle, (iptr_t)&mx_menu }, - { (const_iptr_t)"Display", 0, (MenuHook)menu_handle, (iptr_t)&display_menu }, - { (const_iptr_t)"Settings", 0, (MenuHook)menu_handle, (iptr_t)&settings_menu }, - { (const_iptr_t)0, 0, NULL, (iptr_t)0 } -}; -static struct Menu main_menu = { main_items, "Main Menu", MF_STICKY, &lcd_bitmap, 0 }; - - -int main(int argc, char *argv[]) -{ - emul_init(&argc, argv); - timer_init(); - buz_init(); - kbd_init(); - lcd_init(); - proc_init(); - - menu_handle(&main_menu); - - emul_cleanup(); - return 0; -} diff --git a/app/demo/demo.mk b/app/demo/demo.mk deleted file mode 100644 index 4436a053..00000000 --- a/app/demo/demo.mk +++ /dev/null @@ -1,115 +0,0 @@ -# -# $Id$ -# Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/) -# All rights reserved. -# -# Makefile fragment for DevLib demo application. -# -# Author: Bernardo Innocenti -# -# $Log$ -# Revision 1.9 2007/09/29 15:54:14 bernie -# Make demo Qt emulator compile again. -# -# Revision 1.8 2006/09/20 14:27:22 marco -# Added fonts, switch.S; fixed moc -# -# Revision 1.7 2006/09/19 17:48:45 bernie -# Remove artwork.c -# -# Revision 1.6 2006/06/02 12:27:36 bernie -# Tweak apparence; enable assertions. -# -# Revision 1.5 2006/05/27 22:42:02 bernie -# Add verstag. -# -# Revision 1.4 2006/05/27 17:16:38 bernie -# Make demos a bit more interesting. -# -# Revision 1.3 2006/05/15 07:21:24 bernie -# Use pkg-config. -# -# 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. -# - -include fonts/fonts.mk -include emul/emul.mk - -# Set to 1 for debug builds -demo_DEBUG = 1 - -# Our target application -TRG += demo - -# FIXME: we want to use g++ for C source too -CC = g++ - -demo_CXXSRC = \ - emul/emul.cpp \ - emul/emulwin.cpp \ - emul/emulkbd.cpp \ - drv/lcd_gfx_qt.cpp - -demo_CSRC = \ - app/demo/demo.c \ - os/hptime.c \ - gfx/bitmap.c \ - gfx/line.c \ - gfx/win.c \ - gfx/text.c \ - gfx/text_format.c \ - gui/menu.c \ - fonts/helvB10.c \ - fonts/luBS14.c \ - fonts/ncenB18.c \ - icons/logo.c \ - drv/kbd.c \ - drv/timer.c \ - drv/buzzer.c \ - drv/ser.c \ - drv/ser_posix.c \ - mware/formatwr.c \ - mware/hex.c \ - mware/event.c \ - mware/observer.c \ - mware/resource.c \ - mware/sprintf.c \ - kern/proc.c \ - kern/sem.c \ - kern/signal.c \ - kern/monitor.c \ - kern/proc_test.c \ - verstag.c - -demo_CPPASRC = \ - kern/switch.S - -# FIXME: maybe this junk should go in emul/emul.mk? -$(OBJDIR)/demo/emul/emulwin.o: emul/emulwin_moc.cpp -$(OBJDIR)/demo/drv/lcd_gfx_qt.o: drv/lcd_gfx_qt_moc.cpp -$(OBJDIR)/demo/drv/timer.o: drv/timer_qt_moc.cpp -$(OBJDIR)/demo/emul/emulkbd.o: emul/emulkbd_moc.cpp - -#FIXME: isn't there a way to avoid repeating the pattern rule? -drv/timer_qt_moc.cpp: drv/timer_qt.c - $(QT_MOC) -o $@ $< - - -demo_CFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo -Ihw $(EMUL_CFLAGS) -demo_CXXFLAGS = -D_QT=4 -D'ARCH=ARCH_EMUL' -Iapp/demo -Ihw $(EMUL_CFLAGS) -demo_LDFLAGS = $(EMUL_LDFLAGS) - -# Debug stuff -ifeq ($(demo_DEBUG),1) - demo_CFLAGS += -D_DEBUG - demo_CXXFLAGS += -D_DEBUG -# demo_PCSRC += drv/kdebug.c -else - demo_CFLAGS += -Os - demo_CXXFLAGS += -Os -endif - -- 2.25.1