Revert last commit.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3729 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/drv/lcd_gfx_hwtest.c b/bertos/drv/lcd_gfx_hwtest.c
index c07be270678ea5fbf44202e132808600366bc6ab..7c1d5282b800dde7bf54502f4cd58084e8983277 100644 (file)
--- a/bertos/drv/lcd_gfx_hwtest.c
+++ b/bertos/drv/lcd_gfx_hwtest.c
@@ -32,6 +32,8 @@
  *
  * \brief dot-matrix LCD test.
  *
+ * \version $Id$
+ *
  * \author Bernie Innocenti <bernie@codewiz.org>
  *
  */

diff --git a/bertos/gfx/gfx.h b/bertos/gfx/gfx.h
index ebcf9c8dc7e483ad66b074abe4caa611a9c48ac8..eeef5bc7b9dd19887997eb96ccae49e7bb9a6095 100644 (file)
--- a/bertos/gfx/gfx.h
+++ b/bertos/gfx/gfx.h
@@ -1,42 +1,15 @@
 /**
  * \file
- * <!--
- * This file is part of BeRTOS.
- *
- * Bertos is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- *
  * Copyright 2003, 2004, 2005, 2006 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernie Innocenti <bernie@codewiz.org>
  *
  *
+ * \version $Id$
+ *
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  *
  * \brief General pourpose graphics routines
- *
- * $WIZ$ module_name = "gfx"
- * $WIZ$ module_configuration = "bertos/cfg/cfg_gfx.h"
  */
 
 #ifndef GFX_GFX_H
@@ -48,13 +21,9 @@
 #include <cpu/attr.h>       /* CPU_HARVARD */
 
 
-#define CONFIG_CHART_TYPE_X uint8_t ///< Type for the chart dataset
-#define CONFIG_CHART_TYPE_Y uint8_t ///< Type for the chart dataset
-
 /**
  * \name Known pixel formats for bitmap representation.
  * \{
- * $WIZ$ bitmap_format = "BITMAP_FMT_PLANAR_H_MSB", "BITMAP_FMT_PLANAR_V_LSB"
  */
 #define BITMAP_FMT_PLANAR_H_MSB  1  /**< Planar pixels, horizontal bytes, MSB left. */
 #define BITMAP_FMT_PLANAR_V_LSB  2  /**< Planar pixels, vertical bytes, LSB top. */

diff --git a/bertos/gfx/text.h b/bertos/gfx/text.h
index 44be12d762a4327113b4e232cccc90734d882dee..249f28187f7960cdce60a09e5b782ed7d29ffdb9 100644 (file)
--- a/bertos/gfx/text.h
+++ b/bertos/gfx/text.h
@@ -35,6 +35,7 @@
  *
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
+ * \version $Id$
  *
  * $WIZ$ module_name = "text"
  * $WIZ$ module_harvard = "pgm_memory"

diff --git a/bertos/gui/leveledit.c b/bertos/gui/leveledit.c
index 57c4b9af11d8e9369f05b389723a273eaf38d3e0..fd49af907e382f75928133eb40a4956bc0611d26 100644 (file)
--- a/bertos/gui/leveledit.c
+++ b/bertos/gui/leveledit.c
@@ -37,7 +37,7 @@
 
 #include "leveledit.h"
 
-#include "cfg/cfg_menu.h"
+#include "cfg/cfg_gfx.h"
 #include <cfg/macros.h> /* MAX() */
 
 #include <drv/kbd.h>

diff --git a/bertos/gui/menu.c b/bertos/gui/menu.c
index dabc9210e25a403c0452f645300633721da3177b..6c3f8d0d8fef038c8980a521585c46efc65e2f30 100644 (file)
--- a/bertos/gui/menu.c
+++ b/bertos/gui/menu.c
@@ -40,7 +40,6 @@
 #include "menu.h"
 
 #include "cfg/cfg_gfx.h"
-#include "cfg/cfg_menu.h"
 #include "cfg/cfg_arch.h"
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
@@ -59,15 +58,6 @@
 
 #if CONFIG_MENU_SMOOTH
 #include <drv/lcd_gfx.h>
-/**
- * With this you can choose, at compile time, which backend to use.
- *
- * $WIZ$ menu_backend_lcd = "LCD_RIT128X96_DRV", "LCD_32122A_DRV"
- */
-#define LCD_RIT128X96_DRV  0 ///<
-#define LCD_32122A_DRV     1 ///<
-
-
 #endif
 
 #if (CONFIG_MENU_TIMEOUT != 0)

diff --git a/bertos/gui/menu.h b/bertos/gui/menu.h
index d5b516ae9cec6443b94eb660ea5cfd0170ac76fa..5c17428330d85eb68114410d870b2d5d28360b1a 100644 (file)
--- a/bertos/gui/menu.h
+++ b/bertos/gui/menu.h
@@ -35,10 +35,6 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  *
  * \brief Common menu handling API
- *
- * $WIZ$ module_name = "menu"
- * $WIZ$ module_configuration = "bertos/cfg/cfg_menu.h"
- * $WIZ$ module_depends = "text", "gfx", "timer", "kbd"
  */
 
 #ifndef GUI_MENU_H