Some fix to build example with nightly test.

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

diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_adc.h b/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_adc.h
index 62a65734d66224fffb7a71478eb2f2b8be8fd9f4..7147fd94c6bd5b97d7dd2e7fae2c07917dba0aa2 100644 (file)
--- a/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_adc.h
+++ b/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_adc.h
@@ -44,7 +44,7 @@
  * $WIZ$ type = "enum"
  * $WIZ$ value_list = "log_level"
  */
-#define ADC_LOG_LEVEL      LOG_LVL_INFO
+#define ADC_LOG_LEVEL      LOG_LVL_WARN
 
 /**
  * Module logging format.
@@ -52,7 +52,7 @@
  * $WIZ$ type = "enum"
  * $WIZ$ value_list = "log_format"
  */
-#define ADC_LOG_FORMAT     LOG_FMT_VERBOSE
+#define ADC_LOG_FORMAT     LOG_FMT_TERSE
 
 /**
  * Clock Frequency for ADC conversion.

diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_menu.h b/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_menu.h
new file mode 100644 (file)
index 0000000..bbfa1e7
--- /dev/null
+++ b/boards/sam3x-ek/examples/sam3x-ek_display/cfg/cfg_menu.h
@@ -0,0 +1,67 @@
+/**
+ * \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 2010 Develer S.r.l. (http://www.develer.com/)
+ * All Rights Reserved.
+ * -->
+ *
+ * \brief Configuration file for Menu module.
+ *
+ * \author Daniele Basile <asterix@develer.com>
+ */
+
+#ifndef CFG_MENU_H
+#define CFG_MENU_H
+
+/**
+ * Enable button bar behind menus
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_MENU_MENUBAR        0
+
+/**
+ * Level Edit Timeout
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_LEVELEDIT_TIMEOUT   0
+
+/**
+ * Menu timeout
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_MENU_TIMEOUT        0
+
+/**
+ * Enable smooth scrolling in menus
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_MENU_SMOOTH         1
+
+
+#endif /* CFG_MENU_H */
+

diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos b/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos
index 4bc3d1b11b1768cfb636a9bbff3995c73f4b3c66..f1af68213a2bbefdb3a1b8344345edb3f3f589f9 100644 (file)
--- a/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos
+++ b/boards/sam3x-ek/examples/sam3x-ek_display/project.bertos
@@ -21,9 +21,9 @@ S'path'
 p10
 Varm-none-eabi-gcc
 p11
-ssS'PROJECT_SRC_PATH_FROM_MAKEFILE'
+ssS'PROJECT_HW_PATH_FROM_MAKEFILE'
 p12
-Vboards/sam3x-ek/examples/sam3x-ek_display
+Vboards/sam3x-ek
 p13
 sS'ENABLED_MODULES'
 p14
@@ -34,9 +34,9 @@ aS'kbd'
 p17
 aS'menu'
 p18
-aS'signal'
+aS'adc'
 p19
-aS'debug'
+aS'signal'
 p20
 aS'kernel'
 p21
@@ -44,38 +44,40 @@ aS'text_format'
 p22
 aS'sprintf'
 p23
-aS'timer'
+aS'debug'
 p24
-aS'gfx'
+aS'timer'
 p25
-aS'formatwr'
+aS'gfx'
 p26
-aS'lcd_hx8347'
+aS'formatwr'
 p27
-aS'heap'
+aS'lcd_hx8347'
 p28
-asS'CPU_NAME'
+aS'heap'
 p29
-VSAM3X8
+asS'CPU_NAME'
 p30
-sS'PROJECT_HW_PATH'
+VSAM3X8
 p31
-S'../..'
+sS'PROJECT_HW_PATH'
 p32
-sS'PROJECT_SRC_PATH'
+S'../..'
 p33
-S'.'
+sS'PROJECT_SRC_PATH'
 p34
-sS'PRESET'
+S'.'
 p35
-I01
-sS'PROJECT_HW_PATH_FROM_MAKEFILE'
+sS'PRESET'
 p36
-Vboards/sam3x-ek
+I01
+sS'PROJECT_SRC_PATH_FROM_MAKEFILE'
 p37
-sS'OUTPUT'
+Vboards/sam3x-ek/examples/sam3x-ek_display
 p38
-(lp39
+sS'OUTPUT'
+p39
+(lp40
 S'codelite'
-p40
+p41
 as.
\ No newline at end of file

diff --git a/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display.mk b/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display.mk
index 8e22b906fac78abe4b81ad41e27007784c4b4642..3f9dfd51be8452cb95198ef0a1d1ca8ab8471dd2 100644 (file)
--- a/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display.mk
+++ b/boards/sam3x-ek/examples/sam3x-ek_display/sam3x-ek_display.mk
@@ -30,11 +30,13 @@ sam3x-ek_display_WIZARD_CSRC = \
        bertos/mware/sprintf.c \
        bertos/gfx/line.c \
        bertos/drv/lcd_hx8347.c \
+       bertos/drv/adc.c \
        bertos/gfx/text_format.c \
        bertos/drv/kbd.c \
        bertos/fonts/luBS14.c \
        bertos/kern/signal.c \
        bertos/kern/proc.c \
+       bertos/cpu/cortex-m3/drv/adc_sam3.c \
        bertos/mware/hex.c \
        bertos/gui/menu.c \
        #