From: lottaviano <lottaviano@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 24 May 2011 13:41:26 +0000 (+0000)
Subject: Update arduino kernel template, make it compile
X-Git-Tag: 2.7.0~41
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=19131a5ba427f686a90b1fa2be4311871ed5cbeb;p=bertos.git

Update arduino kernel template, make it compile

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

diff --git a/boards/arduino/templates/arduino_kernel/arduino_kernel.mk b/boards/arduino/templates/arduino_kernel/arduino_kernel.mk
index 4a5dae97..6360d5f8 100644
--- a/boards/arduino/templates/arduino_kernel/arduino_kernel.mk
+++ b/boards/arduino/templates/arduino_kernel/arduino_kernel.mk
@@ -20,18 +20,20 @@ arduino_kernel_HW_PATH = boards/arduino
 # Files automatically generated by the wizard. DO NOT EDIT, USE arduino_kernel_USER_CSRC INSTEAD!
 arduino_kernel_WIZARD_CSRC = \
 	bertos/cpu/avr/drv/ser_avr.c \
-	bertos/kern/signal.c \
-	bertos/kern/sem.c \
-	bertos/struct/heap.c \
-	bertos/io/kfile.c \
-	bertos/mware/hex.c \
+	bertos/cpu/avr/drv/ser_mega.c \
 	bertos/cpu/avr/drv/timer_avr.c \
+	bertos/cpu/avr/drv/timer_mega.c \
+	bertos/drv/ser.c \
 	bertos/drv/timer.c \
-	bertos/mware/event.c \
+	bertos/io/kfile.c \
+	bertos/kern/monitor.c \
 	bertos/kern/proc.c \
+	bertos/kern/sem.c \
+	bertos/kern/signal.c \
+	bertos/mware/event.c \
 	bertos/mware/formatwr.c \
-	bertos/drv/ser.c \
-	bertos/kern/monitor.c \
+	bertos/mware/hex.c \
+	bertos/struct/heap.c \
 	#
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE arduino_kernel_USER_PCSRC INSTEAD!
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_adc.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_adc.h
index df2587be..62ee6ed7 100644
--- a/boards/arduino/templates/arduino_kernel/cfg/cfg_adc.h
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_adc.h
@@ -109,4 +109,41 @@
  */
 #define CONFIG_ADC_STROBE  0
 
+
+/**
+ * Start up timer[s] = startup value / ADCClock [Hz]
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "sam3_adc_sut"
+ * $WIZ$ supports = "sam3"
+ */
+#define CONFIG_ADC_SUT         ADC_SUT512
+
+/**
+ * Analog Settling Time[s] = settling value / ADCClock[Hz]
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "sam3_adc_stt"
+ * $WIZ$ supports = "sam3"
+ */
+#define CONFIG_ADC_STTLING     ADC_AST17
+
+/**
+ * Tracking Time[s] = (TRACKTIM + 1) / ADCClock[Hz]
+ *
+ * $WIZ$ type = "int"
+ * $WIZ$ min = 0
+ * $WIZ$ supports = "sam3"
+ */
+#define CONFIG_ADC_TRACKTIM    0
+
+/**
+ * Transfer Period[s] = (TRANSFER * 2 + 3) ADCClock[Hz]
+ *
+ * $WIZ$ type = "int"
+ * $WIZ$ min = 0
+ * $WIZ$ supports = "sam3"
+ */
+#define CONFIG_ADC_TRANSFER    1
+
 #endif /* CFG_ADC_H */
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_dac.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_dac.h
new file mode 100644
index 00000000..1ae1e984
--- /dev/null
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_dac.h
@@ -0,0 +1,88 @@
+/**
+ * \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 2011 Develer S.r.l. (http://www.develer.com/)
+ * All Rights Reserved.
+ * -->
+ *
+ * \brief Configuration file for DAC module.
+ *
+ *
+ * \author Daniele Basile <asterix@develer.com>
+ */
+
+#ifndef CFG_DAC_H
+#define CFG_DAC_H
+
+/**
+ * Module logging level.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_level"
+ */
+#define DAC_LOG_LEVEL      LOG_LVL_WARN
+
+/**
+ * Module logging format.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_format"
+ */
+#define DAC_LOG_FORMAT     LOG_FMT_TERSE
+
+/**
+ * DAC Refresh Period = 1024*REFRESH/DACC Clock
+ *
+ * $WIZ$ type = "int"
+ * $WIZ$ supports = "sam3x"
+ * $WIZ$ min = 0
+ * $WIZ$ max = 65536
+ */
+#define CONFIG_DAC_REFRESH            16
+
+/**
+ * DAC Startup Time Selection.
+ * see datasheet table.
+ *
+ * $WIZ$ type = "int"
+ * $WIZ$ supports = "sam3x"
+ * $WIZ$ min = 0
+ * $WIZ$ max = 63
+ */
+#define CONFIG_DAC_STARTUP             0
+
+/**
+ * DAC Trigger Selection.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "sam3x_dac_tc"
+ * $WIZ$ supports = "sam3x"
+ */
+#define CONFIG_DAC_TIMER  DACC_TRGSEL_TIO_CH0
+
+#endif /* CFG_DAC_H */
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_eeprom.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_eeprom.h
new file mode 100644
index 00000000..b56c1f9c
--- /dev/null
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_eeprom.h
@@ -0,0 +1,64 @@
+/**
+ * \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/)
+ *
+ * -->
+ *
+ * \brief Configuration file for the Eeprom module.
+ *
+ * \author Daniele Basile <asterix@develer.com>
+ */
+
+#ifndef CFG_EEPROM_H
+#define CFG_EEPROM_H
+
+/**
+ * Module logging level.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_level"
+ */
+#define EEPROM_LOG_LEVEL      LOG_LVL_INFO
+
+/**
+ * Module logging format.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_format"
+ */
+#define EEPROM_LOG_FORMAT     LOG_FMT_TERSE
+
+/**
+ * Check this to disable Eeprom deprecated API support.
+ *
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_EEPROM_DISABLE_OLD_API  0
+
+#endif /* CFG_EEPROM_H */
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_led_7seg.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_led_7seg.h
new file mode 100644
index 00000000..d854b11d
--- /dev/null
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_led_7seg.h
@@ -0,0 +1,80 @@
+/**
+ * \file cfg_led_7seg.h
+ * <!--
+ * 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/)
+ * -->
+ *
+ * \brief Configuration file for led 7 segment display.
+ *
+ * \author Fabio Bizzi <fbizzi@bizzi.org>
+ *
+ * \addtogroup SevenSegDisplay 7 Segments LED Displays Driver
+ * \{
+ *
+ */
+
+#ifndef CFG_LED_7SEG_H
+#define CFG_LED_7SEG_H
+
+/**
+ * Use a Common Cathode display.
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_LED_7SEG_CCAT       0
+
+/**
+ * Number of digit present in the LED display.
+ * $WIZ$ type = "int"
+ * $WIZ$ min = 1
+ * $WIZ$ max = 8
+ */
+#define CONFIG_LED_7SEG_DIGIT      4
+
+/**
+ * Max lenght of the string to be displayed.
+ * $WIZ$ type = "int"
+ * $WIZ$ min = 16
+ * $WIZ$ max = 255
+ */
+#define CONFIG_LED_7SEG_STRLEN     255
+
+/**
+ * Default scrolling speed (ms * CONFIG_LED_7SEG_RTIME).
+ * $WIZ$ type = "int"
+ */
+#define CONFIG_LED_7SEG_SSPEED      10
+
+/**
+ * Default refresh time (ms).
+ * $WIZ$ type = "int"
+ */
+#define CONFIG_LED_7SEG_RTIME      5
+
+#endif /* CFG_LED_7SEG_H */
+ /** \} */ //defgroup drivers
+
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_lwip.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_lwip.h
index b6b55f65..73acb913 100644
--- a/boards/arduino/templates/arduino_kernel/cfg/cfg_lwip.h
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_lwip.h
@@ -1206,6 +1206,13 @@
  * $WIZ$ type = "boolean"
  */
 #define LWIP_SOCKET                     1
+#if LWIP_SOCKET
+	/*
+	 * The sockets.c file requires this macro to be defined to really
+	 * set errno on errors.
+	 */
+	#define ERRNO
+#endif
 
 /**
  * Enable BSD-style sockets functions names.
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_nand.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_nand.h
new file mode 100644
index 00000000..bd3b2623
--- /dev/null
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_nand.h
@@ -0,0 +1,111 @@
+/**
+ * \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 2011 Develer S.r.l. (http://www.develer.com/)
+ * -->
+ *
+ * \author Stefano Fedrigo <aleph@develer.com>
+ *
+ * \brief Configuration file for NAND driver module.
+ */
+
+#ifndef CFG_NAND_H
+#define CFG_NAND_H
+
+/**
+ * Page data size
+ *
+ * Size of the data section of a programmable page in bytes.
+ *
+ * $WIZ$ type = "int"
+ */
+#define CONFIG_NAND_DATA_SIZE         2048
+
+/**
+ * Page spare area size
+ *
+ * Size of the spare section of a programmable page in bytes.
+ *
+ * $WIZ$ type = "int"
+ */
+#define CONFIG_NAND_SPARE_SIZE        64
+
+/**
+ * Pages per block
+ *
+ * Number of pages in a erase block.
+ *
+ * $WIZ$ type = "int"
+ */
+#define CONFIG_NAND_PAGES_PER_BLOCK   64
+
+/**
+ * Number of blocks
+ *
+ * Total number of erase blocks in one NAND chip.
+ *
+ * $WIZ$ type = "int"
+ */
+#define CONFIG_NAND_NUM_BLOCK        2048
+
+/**
+ * Number of reserved blocks
+ *
+ * Blocks reserved for remapping defective NAND blocks.
+ *
+ * $WIZ$ type = "int"
+ */
+#define CONFIG_NAND_NUM_REMAP_BLOCKS  128
+
+/**
+ * NAND operations timeout
+ *
+ * How many milliseconds the cpu waits for
+ * completion of NAND operations.
+ *
+ * $WIZ$ type = "int"
+ */
+#define CONFIG_NAND_TMOUT      100
+
+/**
+ * Module logging level
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_level"
+ */
+#define CONFIG_NAND_LOG_LEVEL      LOG_LVL_WARN
+
+/**
+ * Module logging format
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_format"
+ */
+#define CONFIG_NAND_LOG_FORMAT     LOG_FMT_TERSE
+
+#endif /* CFG_NAND_H */
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_proc.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_proc.h
index e779ebe4..35ad5fe2 100644
--- a/boards/arduino/templates/arduino_kernel/cfg/cfg_proc.h
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_proc.h
@@ -74,6 +74,12 @@
  */
 #define CONFIG_KERN_PRI 1
 
+/**
+ * Priority-inheritance protocol.
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_KERN_PRI_INHERIT 0
+
 /**
  * Dynamic memory allocation for processes.
  * $WIZ$ type = "boolean"
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_pwm.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_pwm.h
index 595189e6..68d62837 100644
--- a/boards/arduino/templates/arduino_kernel/cfg/cfg_pwm.h
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_pwm.h
@@ -53,4 +53,12 @@
  */
 #define PWM_LOG_FORMAT     LOG_FMT_VERBOSE
 
+/**
+ * Enable the OLD pwm API.
+ * Not recommended for new projects.
+ *
+ * $WIZ$ type = "boolean"
+ */
+#define CFG_PWM_ENABLE_OLD_API	1
+
 #endif /* CFG_PWM_H */
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_random.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_random.h
new file mode 100644
index 00000000..5e3afdff
--- /dev/null
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_random.h
@@ -0,0 +1,65 @@
+/**
+ * \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 2011 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \author Andrea Righi <arighi@develer.com>
+ *
+ * \brief Configuration file for the "random" module
+ */
+
+#ifndef CFG_RANDOM_H
+#define CFG_RANDOM_H
+
+/**
+ * Module logging level.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_level"
+ */
+#define RANDOM_LOG_LEVEL      LOG_LVL_INFO
+
+/**
+ * module logging format.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_format"
+ */
+#define RANDOM_LOG_FORMAT     LOG_FMT_TERSE
+
+/**
+ * Random security level.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "random_level"
+ */
+#define RANDOM_SECURITY_LEVEL          RANDOM_SECURITY_MINIMUM
+
+#endif /* CFG_RANDOM_H */
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_tftp.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_tftp.h
new file mode 100644
index 00000000..36cc622c
--- /dev/null
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_tftp.h
@@ -0,0 +1,20 @@
+#ifndef CFG_TFTP_H
+#define CFG_TFTP_H
+
+/**
+ * Module logging level.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_level"
+ */
+#define TFTP_LOG_LEVEL    LOG_LVL_WARN
+
+/**
+ * Module logging format.
+ *
+ * $WIZ$ type = "enum"
+ * $WIZ$ value_list = "log_format"
+ */
+#define TFTP_LOG_FORMAT   LOG_FMT_VERBOSE
+
+#endif /* CFG_TFTP_H */
diff --git a/boards/arduino/templates/arduino_kernel/cfg/cfg_usb.h b/boards/arduino/templates/arduino_kernel/cfg/cfg_usb.h
index e5a282b1..dbfd6fe1 100644
--- a/boards/arduino/templates/arduino_kernel/cfg/cfg_usb.h
+++ b/boards/arduino/templates/arduino_kernel/cfg/cfg_usb.h
@@ -61,4 +61,25 @@
  */
 #define CONFIG_USB_BUFSIZE  64
 
+/**
+ * Maximum number of USB device interfaces (default = 1).
+ * $WIZ$ type = "int"
+ * $WIZ$ min = 1
+ */
+#define CONFIG_USB_INTERFACE_MAX  1
+
+/**
+ * Maximum number of allocated endpoints (0 = auto).
+ * $WIZ$ type = "int"
+ * $WIZ$ min = 0
+ */
+#define CONFIG_USB_EP_MAX  0
+
+/**
+ * Maximum packet size of the control endpoint 0 [bytes].
+ * $WIZ$ type = "int"
+ * $WIZ$ min = 8
+ */
+#define CONFIG_EP0_MAX_SIZE 8
+
 #endif /* CFG_USB_H */
diff --git a/boards/arduino/templates/arduino_kernel/project.bertos b/boards/arduino/templates/arduino_kernel/project.bertos
index 4da4a5a7..5c860a93 100644
--- a/boards/arduino/templates/arduino_kernel/project.bertos
+++ b/boards/arduino/templates/arduino_kernel/project.bertos
@@ -19,34 +19,34 @@ p8
 (dp9
 S'path'
 p10
-V/usr/local/toolchain/avr/bin/avr-gcc
+V/usr/bin/avr-gcc
 p11
-ssS'PROJECT_SRC_PATH_FROM_MAKEFILE'
+ssS'PROJECT_HW_PATH_FROM_MAKEFILE'
 p12
-Vboards/arduino/templates/arduino_kernel
+Vboards/arduino
 p13
 sS'ENABLED_MODULES'
 p14
 (lp15
-S'monitor'
+S'debug'
 p16
-aS'signal'
+aS'formatwr'
 p17
-aS'debug'
+aS'heap'
 p18
 aS'kernel'
 p19
-aS'ser'
-p20
 aS'kfile'
+p20
+aS'monitor'
 p21
-aS'timer'
+aS'semaphores'
 p22
-aS'formatwr'
+aS'ser'
 p23
-aS'semaphores'
+aS'signal'
 p24
-aS'heap'
+aS'timer'
 p25
 asS'CPU_NAME'
 p26
@@ -63,9 +63,9 @@ p31
 sS'PRESET'
 p32
 I01
-sS'PROJECT_HW_PATH_FROM_MAKEFILE'
+sS'PROJECT_SRC_PATH_FROM_MAKEFILE'
 p33
-Vboards/arduino
+Vboards/arduino/templates/arduino_kernel
 p34
 sS'OUTPUT'
 p35