Merge branch 'packetbuf2' into uart_net

Author: miri64

.travis.yml

@@ -22,6 +22,7 @@ install:
     - sudo apt-get install pcregrep libpcre3
     - sudo apt-get install qemu-system-x86 python3
     - sudo apt-get install g++-multilib
+    - sudo apt-get install gcc-avr binutils-avr avr-libc
     - git config --global user.email "[email protected]"
     - git config --global user.name "Travis CI"
 

boards/arduino-mega2560/Makefile

@@ -0,0 +1,3 @@
+MODULE = $(BOARD)_base
+
+include $(RIOTBASE)/Makefile.base

boards/arduino-mega2560/Makefile.include

@@ -0,0 +1,43 @@
+
+# define the cpu used by the arduino mega2560 board
+export CPU = atmega2560
+
+# define tools used for building the project
+export PREFIX = avr-
+export CC = $(PREFIX)gcc
+export CXX = $(PREFIX)c++
+export AR = $(PREFIX)ar
+export AS = $(PREFIX)as
+export LINK = $(PREFIX)gcc
+export SIZE = $(PREFIX)size
+export OBJCOPY = $(PREFIX)objcopy
+export TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm
+export TERMFLAGS = -b 38400 -p $(PORT)
+
+#define the flash-tool and default port depending on the host operating system
+OS = $(shell uname)
+ifeq ($(OS),Linux)
+  PORT ?= /dev/ttyACM0
+  FLASHER = avrdude
+#else ifeq ($(OS),Darwin)
+#  PORT ?=
+#  FLASHER =
+else
+  $(info CAUTION: No flash tool for your host system found!)
+  # TODO: fix for building under windows/MacOS
+endif
+export FLASHER
+export PORT
+
+# define build specific options
+export CPU_USAGE = -mmcu=atmega2560
+export CFLAGS += -ggdb -g3 -std=gnu99 -Os -Wall -Wstrict-prototypes $(CPU_USAGE)
+export ASFLAGS += -ggdb -g3 $(CPU_USAGE) $(FPU_USAGE)
+export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -static -lgcc -e reset_handler
+# linkerscript specified in cpu/Makefile.include
+#export LINKFLAGS += -T$(LINKERSCRIPT)
+export OFLAGS += -j .text -j .data -O ihex
+export FFLAGS += -p m2560 -c stk500v2 -P $(PORT) -b 115200 -F -U flash:w:bin/$(BOARD)/$(PROJECT)$(APPLICATION).hex
+
+# export board specific includes to the global includes-listing
+export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include

boards/arduino-mega2560/board.c

@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2014 Freie Universität Berlin, Hinnerk van Bruinehsen
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @ingroup     board_arduino-mega2560
+ * @{
+ *
+ * @file        board.c
+ * @brief       Board specific implementations for the Arduino Mega 2560 board
+ *
+ * @author      Hinnerk van Bruinehsen <[email protected]>
+ *
+ * @}
+ */
+
+#include <stdio.h>
+#include <avr/io.h>
+
+#include "board.h"
+#include "cpu.h"
+#include "periph/uart.h"
+
+#ifndef MODULE_UART0
+#include "ringbuffer.h"
+#include "mutex.h"
+#endif
+
+#ifdef MODULE_UART0
+#include "board_uart0.h"
+#endif
+
+/**
+ * @brief use mutex for waiting on incoming UART chars
+ */
+#ifndef MODULE_UART0
+static mutex_t uart_rx_mutex;
+static char rx_buf_mem[STDIO_RX_BUFSIZE];
+static ringbuffer_t rx_buf;
+#endif
+
+void led_init(void);
+void SystemInit(void);
+static int uart_putchar(unsigned char c, FILE *stream);
+static char uart_getchar(FILE *stream);
+
+static FILE uart_stdout = FDEV_SETUP_STREAM(uart_putchar, NULL, _FDEV_SETUP_WRITE);
+static FILE uart_stdin = FDEV_SETUP_STREAM(NULL, uart_getchar, _FDEV_SETUP_READ);
+
+
+/**
+ * @brief Receive a new character from the UART and put it into the receive
+ * buffer
+ *
+ * @param[in] data    the newly received byte
+ */
+
+void rx_cb(void *arg, char data)
+{
+    LED_TOGGLE;
+#ifndef MODULE_UART0
+    ringbuffer_add_one(&rx_buf, data);
+    mutex_unlock(&uart_rx_mutex);
+#elif MODULE_UART0
+
+    if (uart0_handler_pid) {
+        uart0_handle_incoming(data);
+        uart0_notify_thread();
+    }
+
+#endif
+}
+
+void board_init(void)
+{
+    /* initialize stdio via USART_0 */
+    SystemInit();
+
+    /* initialize the CPU */
+    cpu_init();
+
+    /* initialize the boards LEDs */
+    led_init();
+
+    enableIRQ();
+}
+
+
+/**
+ * @brief Initialize the boards on-board LED (Amber LED "L")
+ *
+ * The LED initialization is hard-coded in this function. As the LED is soldered
+ * onto the board it is fixed to its CPU pins.
+ *
+ * The LED is connected to the following pin:
+ * - LED: PB27
+ */
+void led_init(void)
+{
+    LED_ENABLE_PORT;
+    LED_ON;
+}
+
+/**
+ * @brief Initialize the System, initialize IO via UART_0
+ */
+void SystemInit(void)
+{
+    /* initialize UART_0 for use as stdout */
+#ifndef MODULE_UART0
+    mutex_init(&uart_rx_mutex);
+    ringbuffer_init(&rx_buf, rx_buf_mem, STDIO_RX_BUFSIZE);
+#endif
+    uart_init(STDIO, STDIO_BAUDRATE, (uart_rx_cb_t) rx_cb, NULL, NULL);
+
+    stdout = &uart_stdout;
+    stdin = &uart_stdin;
+
+    /* Flush stdout */
+    puts("\f");
+}
+
+static int uart_putchar(unsigned char c, FILE *stream)
+{
+    uart_write_blocking(UART_0, c);
+    return 0;
+}
+
+char uart_getchar(FILE *stream)
+{
+#ifndef MODULE_UART0
+
+    if (rx_buf.avail == 0) {
+        mutex_lock(&uart_rx_mutex);
+    }
+
+    return ringbuffer_get_one(&rx_buf);
+#else
+    LED_TOGGLE;
+    char temp;
+    temp = (char) uart0_readc();
+    return temp;
+#endif
+}

boards/arduino-mega2560/include/board.h

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2014 Freie Universität Berlin, Hinnerk van Bruinehsen
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @defgroup    board_arduino-mega2560 Arduino Mega 2560
+ * @ingroup     boards
+ * @brief       Board specific files for the Arduino Mega 2560 board.
+ * @{
+ *
+ * @file
+ * @brief       Board specific definitions for the Arduino Mega 2560 board.
+ *
+ * @author      Hinnerk van Bruinehsen <[email protected]>
+ */
+
+#ifndef __BOARD_H
+#define __BOARD_H
+
+#include "cpu.h"
+
+/**
+ * Define the nominal CPU core clock in this board
+ */
+#define F_CPU               (16000000L)
+
+
+/**
+ * Assign the hardware timer
+ */
+#define HW_TIMER            TIMER_0
+
+/**
+* @name Define UART device and baudrate for stdio
+* @{
+*/
+#define STDIO UART_0
+#define STDIO_BAUDRATE (38400U)
+#define STDIO_RX_BUFSIZE (64U)
+/** @} */
+
+/**
+ * @name LED pin definitions
+ * @{
+ */
+#define LED_PORT            PORTB
+#define LED_PIN             (1 << 7)
+/** @} */
+
+/**
+ * @name Macros for controlling the on-board LEDs.
+ * @{
+ */
+#define LED_ENABLE_PORT     DDRB |= (1 << DDB7)
+#define LED_ON              LED_PORT |= LED_PIN
+#define LED_OFF             LED_PORT &= ~LED_PIN
+#define LED_TOGGLE          LED_PORT ^= LED_PIN;
+
+/* for compatability to other boards */
+#define LED_GREEN_ON        LED_ON
+#define LED_GREEN_OFF       LED_OFF
+#define LED_GREEN_TOGGLE    LED_TOGGLE
+#define LED_RED_ON          /* not available */
+#define LED_RED_OFF         /* not available */
+#define LED_RED_TOGGLE      /* not available */
+/** @} */
+
+
+/**
+ * @brief Initialize board specific hardware, including clock, LEDs and std-IO
+ */
+void board_init(void);
+
+
+#endif /** __BOARD_H */
+/** @} */