Rename CPU_MEMORY_BARRIER to MEMORY_BARRIER and move it in compiler header.

[bertos.git] / app / demo / appconfig.h

diff --git a/app/demo/appconfig.h b/app/demo/appconfig.h
index 4361d0f07716a3df1413e7472227aed1a0e56849..398f2ffa43803d0f18a5ea38c9d3eb28d204c759 100644 (file)
--- a/app/demo/appconfig.h
+++ b/app/demo/appconfig.h
@@ -64,18 +64,17 @@
  * In most cases, we rely on the optimizer to discard checks
  * on constant values and performing dead-code elimination.
  *
- * \version $Id$
+ * \version $Id: appconfig.h 18242 2007-10-08 17:35:23Z marco $
  * \author Bernardo Innocenti <bernie@develer.com>
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-#ifndef APPCONFIG_COMMON_H
-#define APPCONFIG_COMMON_H
+#ifndef APPCONFIG_H
+#define APPCONFIG_H
 
 /** kdebug console */
 #define CONFIG_KDEBUG_PORT 0
 
-
 /** Baud-rate for the kdebug console */
 #define CONFIG_KDEBUG_BAUDRATE  19200
 
@@ -95,7 +94,7 @@
  *
  * \sa config_kern.h
  */
-#define CONFIG_KERNEL 0
+#define CONFIG_KERNEL 1
 
 /**
  * \name Serial driver parameters
@@ -119,18 +118,6 @@
        /** [bytes] Size of the inbound FIFO buffer for SPI port (AVR only). */
        #define CONFIG_SPI_RXBUFSIZE    32
 
-       /** SPI data order (AVR only). */
-       #define CONFIG_SPI_DATA_ORDER   SER_MSB_FIRST
-
-       /** SPI clock division factor (AVR only). */
-       #define CONFIG_SPI_CLOCK_DIV    16
-
-       /** SPI clock polarity: 0 = normal low, 1 = normal high (AVR only). */
-       #define CONFIG_SPI_CLOCK_POL    0
-
-       /** SPI clock phase: 0 = sample on first edge, 1 = sample on second clock edge (AVR only). */
-       #define CONFIG_SPI_CLOCK_PHASE  0
-
        /** Default transmit timeout (ms). Set to -1 to disable timeout support */
        #define CONFIG_SER_TXTIMEOUT    -1
 
@@ -165,11 +152,8 @@
 /// Debug timer interrupt using a strobe pin.
 #define CONFIG_TIMER_STROBE  0
 
-/// Enable ADS strobe.
-#define CONFIG_ADC_STROBE  0
-
 /// Enable watchdog timer.
-#define CONFIG_WATCHDOG  0
+#define CONFIG_WATCHDOG  1
 
 /// EEPROM type for drv/eeprom.c
 #define CONFIG_EEPROM_TYPE EEPROM_24XX256
@@ -178,13 +162,13 @@
 #define CONFIG_BITMAP_FMT  BITMAP_FMT_PLANAR_V_LSB
 
 /// Enable line clipping algorithm.
-#define CONFIG_GFX_CLIPPING  1
+#define CONFIG_GFX_CLIPPING 1
 
 /// Enable text rendering in bitmaps.
-#define CONFIG_GFX_TEXT  1
+#define CONFIG_GFX_TEXT 1
 
 /// Enable virtual coordinate system.
-#define CONFIG_GFX_VCOORDS  1
+#define CONFIG_GFX_VCOORDS 1
 
 /// Keyboard polling method
 #define CONFIG_KBD_POLL  KBD_POLL_SOFTINT
@@ -192,11 +176,11 @@
 /// Enable keyboard event delivery to observers
 #define CONFIG_KBD_OBSERVER  0
 
-/// Enable key beeps
+/// Enable key beeps.
 #define CONFIG_KBD_BEEP  1
 
 /// Enable long pression handler for keys
-#define CONFIG_KBD_LONGPRESS  1
+#define CONFIG_KBD_LONGPRESS  0
 
 /**
  * \name Type for the chart dataset
@@ -209,19 +193,16 @@
 /// Enable button bar behind menus
 #define CONFIG_MENU_MENUBAR  0
 
-/// Enable smooth scrolling in menus
+/// Enable smooth scrolling in menus.
 #define CONFIG_MENU_SMOOTH  1
 
-/// Size of block for MD2 algorithm.
-#define CONFIG_MD2_BLOCK_LEN 16
-
-/// Use standard permutation in MD2 algorithm.
-#define CONFIG_MD2_STD_PERM 0
+/// Abort menu after this amount of time.
+#define CONFIG_MENU_TIMEOUT 0 /* ms */
 
-/// Define a size, in byte, of entropy pool.
-#define CONFIG_SIZE_ENTROPY_POOL 64
+/// Accept input implicitly after this amount of time.
+#define CONFIG_LEVELEDIT_TIMEOUT 3000 /* ms */
 
-/// Turn on or off timer support in Randpool.
-#define CONFIG_RANDPOOL_TIMER 1
+/// LCD bus size. If 0 use 8bit bus.
+#define CONFIG_LCD_4BIT 0
 
 #endif /* APPCONFIG_H */