Revision 78:65de72417cd3, committed 2018-02-01

Comitter:

Wolfgang Betz

Date:

Thu Feb 01 16:15:57 2018 +0100

Parent:

77:a9a9807bf3ed

Child:

81:b16caa776548

Commit message:

Cleanup unnecessary header files

Changed in this revision

--- a/source/NanostackRfPhySpirit1.cpp	Thu Jan 18 15:07:23 2018 +0100
+++ b/source/NanostackRfPhySpirit1.cpp	Thu Feb 01 16:15:57 2018 +0100
@@ -829,4 +829,4 @@
 }
 
 #endif /* MBED_CONF_RTOS_PRESENT */
-#endif /* MBED_CONF_NANOSTACK_CONFIGURATION */
\ No newline at end of file
+#endif /* MBED_CONF_NANOSTACK_CONFIGURATION */

--- a/source/libs/Contiki_STM32_Library/contiki-conf.h	Thu Jan 18 15:07:23 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/**
-******************************************************************************
-* @file    platform/stm32nucleo-spirit1/contiki-conf.h
-* @author  System LAB 
-* @version V1.0.0
-* @date    17-May-2015
-* @brief   Contiki configuration parameters
-******************************************************************************
-* @attention
-*
-* <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*   1. Redistributions of source code must retain the above copyright notice,
-*      this list of conditions and the following disclaimer.
-*   2. Redistributions in binary form must reproduce the above copyright notice,
-*      this list of conditions and the following disclaimer in the documentation
-*      and/or other materials provided with the distribution.
-*   3. Neither the name of STMicroelectronics nor the names of its contributors
-*      may be used to endorse or promote products derived from this software
-*      without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-******************************************************************************
-*/
-/*---------------------------------------------------------------------------*/
-#ifndef __CONTIKI_CONF_H__
-#define __CONTIKI_CONF_H__
-/*---------------------------------------------------------------------------*/
-#include "platform-conf.h"
-//#include "project-conf.h"
-/*---------------------------------------------------------------------------*/
-#define SLIP_BRIDGE_CONF_NO_PUTCHAR 1
-
-#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
-#define NULLRDC_CONF_802154_AUTOACK 0
-#define NETSTACK_CONF_FRAMER  framer_802154
-#define NETSTACK_CONF_NETWORK sicslowpan_driver
-
-#undef NETSTACK_CONF_RDC
-#define NETSTACK_CONF_RDC     nullrdc_driver
-#define NETSTACK_RDC_HEADER_LEN 0
-
-#undef NETSTACK_CONF_MAC
-#define NETSTACK_CONF_MAC csma_driver
-#define NETSTACK_MAC_HEADER_LEN 0
-
-#define SICSLOWPAN_CONF_MAC_MAX_PAYLOAD \
-  (NETSTACK_RADIO_MAX_PAYLOAD_LEN - NETSTACK_MAC_HEADER_LEN - \
-   NETSTACK_RDC_HEADER_LEN )
-
-#define RIMESTATS_CONF_ENABLED                 0
-#define RIMESTATS_CONF_ON                      0
-
-
-/* Network setup for IPv6 */
-
-#define CXMAC_CONF_ANNOUNCEMENTS         0
-
-
-/* A trick to resolve a compilation error with IAR. */
-#ifdef __ICCARM__
-#define UIP_CONF_DS6_AADDR_NBU              1
-#endif
-
-/* radio driver blocks until ACK is received */
-#define NULLRDC_CONF_ACK_WAIT_TIME          (0)
-#define CONTIKIMAC_CONF_BROADCAST_RATE_LIMIT 0
-#define IEEE802154_CONF_PANID       0xABCD
-
-#define AODV_COMPLIANCE
-
-#define WITH_ASCII 1
-
-#define PROCESS_CONF_NUMEVENTS 8
-#define PROCESS_CONF_STATS 1
-/*#define PROCESS_CONF_FASTPOLL    4*/
-
-
-#define LINKADDR_CONF_SIZE              8
-
-#define UIP_CONF_LL_802154              1
-#define UIP_CONF_LLH_LEN                0
-
-#define UIP_CONF_ROUTER                 1
-
-/* configure number of neighbors and routes */
-#ifndef UIP_CONF_DS6_ROUTE_NBU
-#define UIP_CONF_DS6_ROUTE_NBU   30
-#endif /* UIP_CONF_DS6_ROUTE_NBU */
-
-#ifndef UIP_CONF_ND6_SEND_RA
-#define UIP_CONF_ND6_SEND_RA    0
-#endif
-#define UIP_CONF_ND6_REACHABLE_TIME    600000 //90000// 600000 
-#define UIP_CONF_ND6_RETRANS_TIMER      10000
-
-
-#define UIP_CONF_IPV6                   1
-#ifndef UIP_CONF_IPV6_QUEUE_PKT
-#define UIP_CONF_IPV6_QUEUE_PKT         0
-#endif /* UIP_CONF_IPV6_QUEUE_PKT */
-#define UIP_CONF_IP_FORWARD             0
-#ifndef UIP_CONF_BUFFER_SIZE
-//#define UIP_CONF_BUFFER_SIZE    280
-#define UIP_CONF_BUFFER_SIZE    600
-#endif
-
-#define SICSLOWPAN_CONF_MAXAGE                  4
-#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
-
-
-#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
-#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS   5
-#endif /* SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS */
-
-#define UIP_CONF_ICMP_DEST_UNREACH 1
-
-#define UIP_CONF_DHCP_LIGHT
-#define UIP_CONF_LLH_LEN         0
-#ifndef UIP_CONF_RECEIVE_WINDOW
-#define UIP_CONF_RECEIVE_WINDOW  150
-#endif
-#ifndef UIP_CONF_TCP_MSS
-#define UIP_CONF_TCP_MSS         UIP_CONF_RECEIVE_WINDOW
-#endif
-#define UIP_CONF_MAX_CONNECTIONS 4
-#define UIP_CONF_MAX_LISTENPORTS 8
-#define UIP_CONF_UDP_CONNS       12
-#define UIP_CONF_FWCACHE_SIZE    30
-#define UIP_CONF_BROADCAST       1
-#define UIP_ARCH_IPCHKSUM        0
-#define UIP_CONF_UDP             1
-#define UIP_CONF_UDP_CHECKSUMS   1
-#define UIP_CONF_TCP		 1
-/*---------------------------------------------------------------------------*/
-/* include the project config */
-/* PROJECT_CONF_H might be defined in the project Makefile */
-#ifdef PROJECT_CONF_H
-#include "project-conf.h"
-#endif /* PROJECT_CONF_H */
-/*---------------------------------------------------------------------------*/
-#endif /* CONTIKI_CONF_H */
-/*---------------------------------------------------------------------------*/

--- a/source/libs/Contiki_STM32_Library/hw-config.h	Thu Jan 18 15:07:23 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
- /**
-  ******************************************************************************
-  * @file    hw-config.h
-  * @author  System LAB 
- * @version V1.0.0
- * @date    17-May-2015
-  * @brief   Header file for Hardware Configuration & Setup
-  ******************************************************************************
-  * @attention
-  *
- * <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
-  *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *   1. Redistributions of source code must retain the above copyright notice,
- *      this list of conditions and the following disclaimer.
- *   2. Redistributions in binary form must reproduce the above copyright notice,
- *      this list of conditions and the following disclaimer in the documentation
- *      and/or other materials provided with the distribution.
- *   3. Neither the name of STMicroelectronics nor the names of its contributors
- *      may be used to endorse or promote products derived from this software
- *      without specific prior written permission.
-  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  *
-  ******************************************************************************
-  */
-/*---------------------------------------------------------------------------*/
-#ifndef __HW_CONFIG_H
-#define __HW_CONFIG_H
-/*---------------------------------------------------------------------------*/
-#include "stm32l-spirit1-config.h"
-/*---------------------------------------------------------------------------*/
-#define UART_RxBufferSize    512
-/*---------------------------------------------------------------------------*/    
-#define I2Cx                            I2C1
-#define I2Cx_CLK_ENABLE()               __I2C1_CLK_ENABLE()
-#define I2Cx_SDA_GPIO_CLK_ENABLE()      __GPIOB_CLK_ENABLE()
-#define I2Cx_SCL_GPIO_CLK_ENABLE()      __GPIOB_CLK_ENABLE() 
-/*---------------------------------------------------------------------------*/
-#define I2Cx_FORCE_RESET()              __I2C1_FORCE_RESET()
-#define I2Cx_RELEASE_RESET()            __I2C1_RELEASE_RESET()
-/*---------------------------------------------------------------------------*/
-/* Definition for I2Cx Pins */
-#define I2Cx_SCL_PIN                    GPIO_PIN_8
-#define I2Cx_SCL_GPIO_PORT              GPIOB
-#define I2Cx_SDA_PIN                    GPIO_PIN_9
-#define I2Cx_SDA_GPIO_PORT              GPIOB
-#define I2Cx_SCL_SDA_AF                 GPIO_AF4_I2C1
-
-/* Definition for I2Cx's NVIC */
-#define I2Cx_EV_IRQn                    I2C1_EV_IRQn
-#define I2Cx_ER_IRQn                    I2C1_ER_IRQn
-#define I2Cx_EV_IRQHandler              I2C1_EV_IRQHandler
-#define I2Cx_ER_IRQHandler              I2C1_ER_IRQHandler
-
-  
-#define I2Cx                            I2C1
-#define I2Cx_CLK_ENABLE()               __I2C1_CLK_ENABLE()
-#define I2Cx_SDA_GPIO_CLK_ENABLE()      __GPIOB_CLK_ENABLE()
-#define I2Cx_SCL_GPIO_CLK_ENABLE()      __GPIOB_CLK_ENABLE() 
-
-#define I2Cx_FORCE_RESET()              __I2C1_FORCE_RESET()
-#define I2Cx_RELEASE_RESET()            __I2C1_RELEASE_RESET()
-
-/* Definition for I2Cx Pins */
-#define I2Cx_SCL_PIN                    GPIO_PIN_8
-#define I2Cx_SCL_GPIO_PORT              GPIOB
-#define I2Cx_SDA_PIN                    GPIO_PIN_9
-#define I2Cx_SDA_GPIO_PORT              GPIOB
-#define I2Cx_SCL_SDA_AF                 GPIO_AF4_I2C1
-
-/* Definition for I2Cx's NVIC */
-#define I2Cx_EV_IRQn                    I2C1_EV_IRQn
-#define I2Cx_ER_IRQn                    I2C1_ER_IRQn
-#define I2Cx_EV_IRQHandler              I2C1_EV_IRQHandler
-#define I2Cx_ER_IRQHandler              I2C1_ER_IRQHandler
-
-/* User can use this section to tailor USARTx/UARTx instance used and associated
-   resources */
-/* Definition for USARTx clock resources */
-#define USARTx                           USART2
-#define USARTx_CLK_ENABLE()              __USART2_CLK_ENABLE();
-#define DMAx_CLK_ENABLE()                __DMA1_CLK_ENABLE()
-#define USARTx_RX_GPIO_CLK_ENABLE()      __GPIOA_CLK_ENABLE()
-#define USARTx_TX_GPIO_CLK_ENABLE()      __GPIOA_CLK_ENABLE()
-
-#define USARTx_FORCE_RESET()             __USART2_FORCE_RESET()
-#define USARTx_RELEASE_RESET()           __USART2_RELEASE_RESET()
-
-/* Definition for USARTx Pins */
-#define USARTx_TX_PIN                    GPIO_PIN_2
-#define USARTx_TX_GPIO_PORT              GPIOA
-
-#define USARTx_RX_PIN                    GPIO_PIN_3
-#define USARTx_RX_GPIO_PORT              GPIOA
-
-     /* Definition for USARTx's NVIC */
-#define USARTx_IRQn                      USART2_IRQn
-#define USARTx_IRQHandler                USART2_IRQHandler
-
-#define USARTx_TX_AF                     GPIO_AF7_USART2 
-#define USARTx_RX_AF                     GPIO_AF7_USART2
-
-
-  /* Enable sensor mask */
-#define PRESSURE_SENSOR                         0x00000001
-#define TEMPERATURE_SENSOR                      0x00000002
-#define HUMIDITY_SENSOR                         0x00000004
-#define UV_SENSOR                               0x00000008  
-#define ACCELEROMETER_SENSOR                    0x00000010  
-#define GYROSCOPE_SENSOR                        0x00000020
-#define MAGNETIC_SENSOR                         0x00000040      
-/*---------------------------------------------------------------------------*/
-#endif  /*__HW_CONFIG_H*/
-/*---------------------------------------------------------------------------*/

--- a/source/libs/Contiki_STM32_Library/ip64-conf.h	Thu Jan 18 15:07:23 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2012, Thingsquare, http://www.thingsquare.com/.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-#ifndef IP64_CONF_H
-#define IP64_CONF_H
-
-/*
-#include "ip64-tap-driver.h"
-#include "ip64-eth-interface.h"
-
-#define IP64_CONF_UIP_FALLBACK_INTERFACE ip64_eth_interface
-#define IP64_CONF_INPUT                  ip64_eth_interface_input
-
-#define IP64_CONF_ETH_DRIVER             ip64_tap_driver
-
-
-#undef UIP_FALLBACK_INTERFACE
-#define UIP_FALLBACK_INTERFACE ip64_uip_fallback_interface
-*/
-#ifdef MY_DRIVERS
-#include <my_wifi_interface.h>
-#include <my_wifi_driver.h>
-
-#define IP64_CONF_UIP_FALLBACK_INTERFACE_SLIP 0
-#define IP64_CONF_UIP_FALLBACK_INTERFACE my_wifi_interface
-#define IP64_CONF_INPUT                  my_wifi_interface_input
-#define IP64_CONF_ETH_DRIVER             my_wifi_driver
-
-#undef UIP_CONF_ND6_RA_RDNSS
-#define UIP_CONF_ND6_RA_RDNSS 1
-
-#undef UIP_CONF_ND6_SEND_RA
-#define UIP_CONF_ND6_SEND_RA  1
-
-#undef UIP_CONF_ROUTER
-#define UIP_CONF_ROUTER       1
-
-#ifndef QUEUEBUF_CONF_NUM
-#define QUEUEBUF_CONF_NUM          16
-#endif
-
-
-#else
-
-
-#include "net/ip64/ip64-slip-interface.h"
-#include "net/ip64/ip64-null-driver.h"
-
-#define IP64_CONF_UIP_FALLBACK_INTERFACE_SLIP 1
-#define IP64_CONF_UIP_FALLBACK_INTERFACE ip64_slip_interface
-#define IP64_CONF_INPUT                  ip64_slip_interface_input
-#define IP64_CONF_ETH_DRIVER             ip64_null_driver
-
-#undef UIP_CONF_ND6_RA_RDNSS
-#define UIP_CONF_ND6_RA_RDNSS 1
-
-#undef UIP_CONF_ND6_SEND_RA
-#define UIP_CONF_ND6_SEND_RA  1
-
-#undef UIP_CONF_ROUTER
-#define UIP_CONF_ROUTER       1
-
-#ifndef QUEUEBUF_CONF_NUM
-#define QUEUEBUF_CONF_NUM          16
-#endif
-
-#endif//MY_DRIVERS
-
-#endif /* IP64_CONF_H */

--- a/source/libs/Contiki_STM32_Library/platform-conf.h	Thu Jan 18 15:07:23 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-/**
-******************************************************************************
-* @file    platform/stm32nucleo-spirit1/platform-conf.h
-* @author  System LAB 
-* @version V1.0.0
-* @date    17-May-2015
-* @brief   Configuration parameters
-******************************************************************************
-* @attention
-*
-* <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*   1. Redistributions of source code must retain the above copyright notice,
-*      this list of conditions and the following disclaimer.
-*   2. Redistributions in binary form must reproduce the above copyright notice,
-*      this list of conditions and the following disclaimer in the documentation
-*      and/or other materials provided with the distribution.
-*   3. Neither the name of STMicroelectronics nor the names of its contributors
-*      may be used to endorse or promote products derived from this software
-*      without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-******************************************************************************
-*/
-/*---------------------------------------------------------------------------*/
-/**
- * \addtogroup stm32nucleo-spirit1
- * @{
- *
- * \defgroup stm32nucleo-spirit1-peripherals User Button on STM32 Nucleo
- *
- * Defines some of the platforms capabilities
- * @{
- *
- * \file
- * Header file for the stm32nucleo-spirit1 platform configuration
- */
-/*---------------------------------------------------------------------------*/
-#ifndef __PLATFORM_CONF_H__
-#define __PLATFORM_CONF_H__
-/*---------------------------------------------------------------------------*/
-#ifdef USE_STM32L1XX_NUCLEO
-#include <inttypes.h>
-#include <string.h>
-/*---------------------------------------------------------------------------*/
-#define PLATFORM_HAS_LEDS 1
-#define PLATFORM_HAS_BUTTON 1
-#define PLATFORM_HAS_RADIO 1
-
-#define LEDS_GREEN  1 /*Nucleo LED*/
-#define LEDS_RED    2 /*SPIRIT1 LED*/
-
-#ifdef COMPILE_SENSORS
-#define LEDS_CONF_ALL 1 /*Can't use SPIRIT1 LED in this case*/
-#else
-#define LEDS_CONF_ALL 3 /*No sensors -> we can use SPIRIT1 LED in this case*/
-#endif /*COMPILE_SENSORS*/
-/*---------------------------------------------------------------------------*/
-#define F_CPU                   32000000ul
-#define RTIMER_ARCH_SECOND              32768   
-#define PRESCALER       ((F_CPU / (RTIMER_ARCH_SECOND*2)))
-
-#define UART1_CONF_TX_WITH_INTERRUPT        0
-#define WITH_SERIAL_LINE_INPUT              1
-#define TELNETD_CONF_NUMLINES               6
-#define NETSTACK_CONF_RADIO                 spirit_radio_driver
-#define NETSTACK_RADIO_MAX_PAYLOAD_LEN      96 /* spirit1-config.h */
-
-#if WITH_IP64
-#include "ip64-conf.h"
-#define WITH_SLIP 1
-#ifndef UIP_FALLBACK_INTERFACE
-#define UIP_FALLBACK_INTERFACE ip64_uip_fallback_interface
-#endif
-#endif /* WITH_IP64 */
-
-/*---------------------------------------------------------------------------*/
-/* define ticks/second for slow and fast clocks. Notice that these should be a
-  power of two, eg 64,128,256,512 etc, for efficiency as POT's can be optimized
-  well. */
-#define CLOCK_CONF_SECOND             128
-#define RELOAD_VALUE        ((F_CPU/CLOCK_CONF_SECOND) - 1)
-/* One tick: 62.5 ms */
-
-#define RTIMER_CLOCK_LT(a,b)     ((signed short)((a)-(b)) < 0)
-/*---------------------------------------------------------------------------*/
-typedef unsigned long clock_time_t;     
-typedef unsigned long long rtimer_clock_t; 
-/*---------------------------------------------------------------------------*/
-#define CC_CONF_REGISTER_ARGS          0
-#define CC_CONF_FUNCTION_POINTER_ARGS  1
-#define CC_CONF_FASTCALL
-#define CC_CONF_VA_ARGS                1
-#define CC_CONF_INLINE                 inline
-
-#define CCIF
-#define CLIF
-/*---------------------------------------------------------------------------*/
-typedef uint8_t         u8_t;
-typedef uint16_t        u16_t;
-typedef uint32_t        u32_t;
-typedef  int32_t        s32_t;
-typedef unsigned short  uip_stats_t;
-/*---------------------------------------------------------------------------*/
-#define MULTICHAN_CONF_SET_CHANNEL(x)
-#define MULTICHAN_CONF_READ_RSSI(x) 0
-/*---------------------------------------------------------------------------*/
-#endif//USE_STM32L1XX_NUCLEO
-
-#ifdef USE_STM32F4XX_NUCLEO
-#include <inttypes.h>
-#include <string.h>
-#include "main.h"
-/*---------------------------------------------------------------------------*/
-#define PLATFORM_HAS_LEDS 1
-#define PLATFORM_HAS_BUTTON 1
-#define PLATFORM_HAS_RADIO 1
-
-#define LEDS_GREEN  1 /*Nucleo LED*/
-#define LEDS_RED    2 /*SPIRIT1 LED*/
-
-#ifdef COMPILE_SENSORS
-#define LEDS_CONF_ALL 1 /*Can't use SPIRIT1 LED in this case*/
-#else
-#define LEDS_CONF_ALL 3 /*No sensors -> we can use SPIRIT1 LED in this case*/
-#endif /*COMPILE_SENSORS*/
-/*---------------------------------------------------------------------------*/
-#define F_CPU                   	84000000ul
-#define RTIMER_ARCH_SECOND          96000//32678
-//#define PRESCALER       			uwPrescalerValue
-
-#define UART1_CONF_TX_WITH_INTERRUPT        0
-#define WITH_SERIAL_LINE_INPUT              1
-#define TELNETD_CONF_NUMLINES               6
-#define NETSTACK_CONF_RADIO                 spirit_radio_driver
-#define NETSTACK_RADIO_MAX_PAYLOAD_LEN      96 /* spirit1-config.h */
-
-#if WITH_IP64
-#include "ip64-conf.h"
-#define WITH_SLIP 1
-#ifndef UIP_FALLBACK_INTERFACE
-#define UIP_FALLBACK_INTERFACE ip64_uip_fallback_interface
-#endif
-#endif /* WITH_IP64 */
-
-/*---------------------------------------------------------------------------*/
-/* define ticks/second for slow and fast clocks. Notice that these should be a
-  power of two, eg 64,128,256,512 etc, for efficiency as POT's can be optimized
-  well. */
-#define CLOCK_CONF_SECOND             512
-#define RELOAD_VALUE        ((F_CPU/CLOCK_CONF_SECOND) - 1)
-
-/* One tick: 62.5 ms */
-
-#define RTIMER_CLOCK_LT(a,b)     ((signed short)((a)-(b)) < 0)
-/*---------------------------------------------------------------------------*/
-typedef unsigned long clock_time_t;
-typedef unsigned long long rtimer_clock_t;
-/*---------------------------------------------------------------------------*/
-#define CC_CONF_REGISTER_ARGS          0
-#define CC_CONF_FUNCTION_POINTER_ARGS  1
-#define CC_CONF_FASTCALL
-#define CC_CONF_VA_ARGS                1
-#define CC_CONF_INLINE                 inline
-
-#define CCIF
-#define CLIF
-/*---------------------------------------------------------------------------*/
-typedef uint8_t         u8_t;
-typedef uint16_t        u16_t;
-typedef uint32_t        u32_t;
-typedef  int32_t        s32_t;
-typedef unsigned short  uip_stats_t;
-/*---------------------------------------------------------------------------*/
-#define MULTICHAN_CONF_SET_CHANNEL(x)
-#define MULTICHAN_CONF_READ_RSSI(x) 0
-/*---------------------------------------------------------------------------*/
-#endif//USE_STM32F4XX_NUCLEO
-
-#endif /* __PLATFORM_CONF_H__ */
-/*---------------------------------------------------------------------------*/
-/**
- * @}
- * @}
- */

--- a/source/libs/Contiki_STM32_Library/stm32l-spirit1-config.h	Thu Jan 18 15:07:23 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    stm32l-spirit1-config.h
-  * @author  MCD Application Team
-  * @version V3.4.0
-  * @date    29-June-2012
-  * @brief   Evaluation board specific configuration file.
-  ******************************************************************************
-  * @attention
-  *
-  * <h2><center>&copy; COPYRIGHT 2012 STMicroelectronics</center></h2>
-  *
-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
-  * You may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at:
-  *
-  *        http://www.st.com/software_license_agreement_liberty_v2
-  *
-  * Unless required by applicable law or agreed to in writing, software 
-  * distributed under the License is distributed on an "AS IS" BASIS, 
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  *
-  ******************************************************************************
-  */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32L_SPIRIT1_CONFIG_H
-#define __STM32L_SPIRIT1_CONFIG_H
-
-/* Includes ------------------------------------------------------------------*/
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-
-/* Define the STM32F10x hardware depending on the used evaluation board */
-#ifdef USE_STM3210B_EVAL
-  #define USB_DISCONNECT                      GPIOD  
-  #define USB_DISCONNECT_PIN                  GPIO_PIN_9
-  #define RCC_APB2Periph_GPIO_DISCONNECT      RCC_APB2Periph_GPIOD
-  #define EVAL_COM1_IRQHandler                USART1_IRQHandler 
-
-#elif defined (USE_STM3210E_EVAL)
-  #define USB_DISCONNECT                      GPIOB  
-  #define USB_DISCONNECT_PIN                  GPIO_PIN_14
-  #define RCC_APB2Periph_GPIO_DISCONNECT      RCC_APB2Periph_GPIOB
-  #define EVAL_COM1_IRQHandler                USART1_IRQHandler 
-
-#elif defined (USE_STM3210C_EVAL)
-  #define USB_DISCONNECT                      0  
-  #define USB_DISCONNECT_PIN                  0
-  #define RCC_APB2Periph_GPIO_DISCONNECT      0
-  #define EVAL_COM1_IRQHandler                USART2_IRQHandler 
-
-#elif defined (USE_STM32L152_EVAL) || defined (USE_STM32L152D_EVAL)
- /* 
-   For STM32L15xx devices it is possible to use the internal USB pullup
-   controlled by register SYSCFG_PMC (refer to RM0038 reference manual for
-   more details).
-   It is also possible to use external pullup (and disable the internal pullup)
-   by setting the define USB_USE_EXTERNAL_PULLUP in file platform_config.h
-   and configuring the right pin to be used for the external pull up configuration.
-   To have more details on how to use an external pull up, please refer to 
-   STM3210E-EVAL evaluation board manuals.
-   */
- /* Uncomment the following define to use an external pull up instead of the 
-    integrated STM32L15xx internal pull up. In this case make sure to set up
-    correctly the external required hardware and the GPIO defines below.*/
-/* #define USB_USE_EXTERNAL_PULLUP */
-
- #if !defined(USB_USE_EXTERNAL_PULLUP)
-  #define STM32L15_USB_CONNECT                SYSCFG_USBPuCmd(ENABLE)
-  #define STM32L15_USB_DISCONNECT             SYSCFG_USBPuCmd(DISABLE)
-
- #elif defined(USB_USE_EXTERNAL_PULLUP)
-  /* PA0 is chosen just as illustrating example, you should modify the defines
-    below according to your hardware configuration. */ 
-  #define USB_DISCONNECT                      GPIOA
-  #define USB_DISCONNECT_PIN                  GPIO_PIN_0
-  #define RCC_AHBPeriph_GPIO_DISCONNECT       RCC_AHBPeriph_GPIOA
-  #define STM32L15_USB_CONNECT                GPIO_ResetBits(USB_DISCONNECT, USB_DISCONNECT_PIN)
-  #define STM32L15_USB_DISCONNECT             GPIO_SetBits(USB_DISCONNECT, USB_DISCONNECT_PIN)
- #endif /* USB_USE_EXTERNAL_PULLUP */
-
-#ifdef USE_STM32L152_EVAL 
- #define EVAL_COM1_IRQHandler              USART2_IRQHandler
-#elif defined (USE_STM32L152D_EVAL) 
- #define EVAL_COM1_IRQHandler              USART1_IRQHandler
-#endif /*USE_STM32L152_EVAL*/
-
-#endif /* USE_STM3210B_EVAL */
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-#endif /* __STM32L_SPIRIT1_CONFIG_H */
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

--- a/source/libs/spirit1/X-NUCLEO-IDS01Ax/radio_gpio.h	Thu Jan 18 15:07:23 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-/**
-******************************************************************************
-* @file    radio_gpio.h
-* @author  System Lab - NOIDA
-* @version V1.0.0
-* @date    15-May-2014
-* @brief   This file contains all the functions prototypes for the gpio  
-******************************************************************************
-* @attention
-*
-* <h2><center>&copy; COPYRIGHT(c) 2014 STMicroelectronics</center></h2>
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*   1. Redistributions of source code must retain the above copyright notice,
-*      this list of conditions and the following disclaimer.
-*   2. Redistributions in binary form must reproduce the above copyright notice,
-*      this list of conditions and the following disclaimer in the documentation
-*      and/or other materials provided with the distribution.
-*   3. Neither the name of STMicroelectronics nor the names of its contributors
-*      may be used to endorse or promote products derived from this software
-*      without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-******************************************************************************
-*/
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Exported macro ------------------------------------------------------------*/
-/* Exported Variables ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __RADIO_GPIO_H
-#define __RADIO_GPIO_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-  
-/* Includes ------------------------------------------------------------------*/
-#ifdef USE_STM32L1XX_NUCLEO
-#include "stm32l1xx_hal.h"
-#endif
-
-#ifdef USE_STM32F4XX_NUCLEO
-#include "stm32f4xx_hal.h"
-#endif
-#include "SPIRIT_Types.h"
-  
-/**
- * @addtogroup BSP
- * @{
- */
-
-
-/* Exported types ------------------------------------------------------------*/
-  /* MCU GPIO pin working mode for GPIO */
-typedef enum                                                                                          
-{
-    RADIO_MODE_GPIO_IN  = 0x00,   /*!< Work as GPIO input */
-    RADIO_MODE_EXTI_IN,           /*!< Work as EXTI */
-    RADIO_MODE_GPIO_OUT,          /*!< Work as GPIO output */
-}RadioGpioMode;  
-
- /* MCU GPIO pin enumeration for GPIO */
-typedef enum 
-{
-  RADIO_GPIO_0     = 0x00, /*!< GPIO_0 selected */
-  RADIO_GPIO_1     = 0x01, /*!< GPIO_1 selected */
-  RADIO_GPIO_2     = 0x02, /*!< GPIO_2 selected */
-  RADIO_GPIO_3     = 0x03, /*!< GPIO_3 selected */
-  RADIO_GPIO_SDN   = 0x04, /*!< GPIO_SDN selected */
-} 
-RadioGpioPin;   
-
-  
-/* Exported constants --------------------------------------------------------*/
-  
-  
-/* Exported macro ------------------------------------------------------------*/
- /* MCU GPIO pin working mode for GPIO */
-#define IS_RADIO_GPIO_MODE(MODE) (((MODE) == RADIO_MODE_GPIO_IN) || \
-                               ((MODE) == RADIO_MODE_EXTI_IN) || \
-                               ((MODE) == RADIO_MODE_GPIO_OUT))
-
-/* Number of Arduino pins used for RADIO GPIO interface */
-#define RADIO_GPIO_NUMBER    ((uint8_t)5)
-
-/* MCU GPIO pin enumeration for GPIO */
-#define IS_RADIO_GPIO_PIN(PIN)   (((PIN) == RADIO_GPIO_0) || \
-                               ((PIN) == RADIO_GPIO_1) || \
-                               ((PIN) == RADIO_GPIO_2) || \
-                               ((PIN) == RADIO_GPIO_3) || \
-                               ((PIN) == RADIO_GPIO_SDN))
-
-/* Define for RADIO board */
-#if !defined (USE_SPIRIT1_DEFAULT)
- #define USE_SPIRIT1_DEFAULT
-#endif  
-
-/* @defgroup Radio_Gpio_config_Define */
-/*NOTE: GPIO0, GPIO1, GPIO2 of SPIRIT1 is not used in the shield*/
-
-#define RADIO_GPIO_0_PORT                          GPIOC
-#define RADIO_GPIO_0_PIN                           GPIO_PIN_1
-#define RADIO_GPIO_0_CLOCK_ENABLE()                __GPIOC_CLK_ENABLE()
-#define RADIO_GPIO_0_CLOCK_DISABLE()               __GPIOC_CLK_ENABLE()   
-#define RADIO_GPIO_0_SPEED                         GPIO_SPEED_HIGH
-#define RADIO_GPIO_0_PUPD                          GPIO_NOPULL
-#define RADIO_GPIO_0_EXTI_LINE                     GPIO_PIN_1
-#define RADIO_GPIO_0_EXTI_MODE                     GPIO_MODE_IT_FALLING
-#define RADIO_GPIO_0_EXTI_IRQN                     EXTI1_IRQn 
-#define RADIO_GPIO_0_EXTI_PREEMPTION_PRIORITY      2
-#define RADIO_GPIO_0_EXTI_SUB_PRIORITY             2
-#define RADIO_GPIO_0_EXTI_IRQ_HANDLER              EXTI1_IRQHandler
-
-#define RADIO_GPIO_1_PORT                          GPIOB
-#define RADIO_GPIO_1_PIN                           GPIO_PIN_0
-#define RADIO_GPIO_1_CLOCK_ENABLE()                __GPIOB_CLK_ENABLE()
-#define RADIO_GPIO_1_CLOCK_DISABLE()               __GPIOB_CLK_ENABLE()   
-#define RADIO_GPIO_1_SPEED                         GPIO_SPEED_HIGH
-#define RADIO_GPIO_1_PUPD                          GPIO_NOPULL
-#define RADIO_GPIO_1_EXTI_LINE                     GPIO_PIN_0
-#define RADIO_GPIO_1_EXTI_MODE                     GPIO_MODE_IT_FALLING
-#define RADIO_GPIO_1_EXTI_IRQN                     EXTI0_IRQn 
-#define RADIO_GPIO_1_EXTI_PREEMPTION_PRIORITY      2
-#define RADIO_GPIO_1_EXTI_SUB_PRIORITY             2
-#define RADIO_GPIO_1_EXTI_IRQ_HANDLER              EXTI0_IRQHandler
-
-#define RADIO_GPIO_2_PORT                          GPIOA
-#define RADIO_GPIO_2_PIN                           GPIO_PIN_4
-#define RADIO_GPIO_2_CLOCK_ENABLE()                __GPIOA_CLK_ENABLE()
-#define RADIO_GPIO_2_CLOCK_DISABLE()               __GPIOA_CLK_ENABLE()   
-#define RADIO_GPIO_2_SPEED                         GPIO_SPEED_HIGH
-#define RADIO_GPIO_2_PUPD                          GPIO_NOPULL
-#define RADIO_GPIO_2_EXTI_LINE                     GPIO_PIN_4
-#define RADIO_GPIO_2_EXTI_MODE                     GPIO_MODE_IT_FALLING
-#define RADIO_GPIO_2_EXTI_IRQN                     EXTI4_IRQn 
-#define RADIO_GPIO_2_EXTI_PREEMPTION_PRIORITY      2
-#define RADIO_GPIO_2_EXTI_SUB_PRIORITY             2
-#define RADIO_GPIO_2_EXTI_IRQ_HANDLER              EXTI4_IRQHandler
-
-
-#if defined (USE_SPIRIT1_DEFAULT)
-
-
-#define RADIO_GPIO_3_PORT                          GPIOC
-#define RADIO_GPIO_3_PIN                           GPIO_PIN_7
-#define RADIO_GPIO_3_CLOCK_ENABLE()              __GPIOC_CLK_ENABLE()
-#define RADIO_GPIO_3_CLOCK_DISABLE()             __GPIOC_CLK_DISABLE()   
-#define RADIO_GPIO_3_SPEED                         GPIO_SPEED_HIGH
-#define RADIO_GPIO_3_PUPD                          GPIO_NOPULL
-#define RADIO_GPIO_3_EXTI_LINE                     GPIO_PIN_7
-#define RADIO_GPIO_3_EXTI_MODE                     GPIO_MODE_IT_FALLING
-#define RADIO_GPIO_3_EXTI_IRQN                     EXTI9_5_IRQn 
-#define RADIO_GPIO_3_EXTI_PREEMPTION_PRIORITY      2
-#define RADIO_GPIO_3_EXTI_SUB_PRIORITY             2
-#define RADIO_GPIO_3_EXTI_IRQ_HANDLER              EXTI9_5_IRQHandler
-
-#else
-
-#define RADIO_GPIO_3_PORT                        GPIOA
-#define RADIO_GPIO_3_PIN                         GPIO_PIN_0
-#define RADIO_GPIO_3_CLOCK_ENABLE()                __GPIOA_CLK_ENABLE()
-#define RADIO_GPIO_3_CLOCK_DISABLE()               __GPIOA_CLK_DISABLE() 
-#define RADIO_GPIO_3_SPEED                       GPIO_SPEED_HIGH
-#define RADIO_GPIO_3_PUPD                        GPIO_NOPULL
-#define RADIO_GPIO_3_EXTI_LINE                   GPIO_PIN_0
-#define RADIO_GPIO_3_EXTI_MODE                   GPIO_MODE_IT_FALLING
-#define RADIO_GPIO_3_EXTI_IRQN                   EXTI0_IRQn
-#define RADIO_GPIO_3_EXTI_PREEMPTION_PRIORITY    2
-#define RADIO_GPIO_3_EXTI_SUB_PRIORITY           2
-#define RADIO_GPIO_3_EXTI_IRQ_HANDLER            EXTI0_IRQHandler
-
-#endif
-
-#define RADIO_GPIO_SDN_PORT                        GPIOA
-#define RADIO_GPIO_SDN_PIN                         GPIO_PIN_10
-#define RADIO_GPIO_SDN_CLOCK_ENABLE()            __GPIOA_CLK_ENABLE()
-#define RADIO_GPIO_SDN_CLOCK_DISABLE()           __GPIOA_CLK_DISABLE()
-#define RADIO_GPIO_SDN_SPEED                       GPIO_SPEED_HIGH
-#define RADIO_GPIO_SDN_PUPD                        GPIO_PULLUP
-
-
-#define RADIO_GPIO_IRQ		RADIO_GPIO_3
-#define SPIRIT_GPIO_IRQ         SPIRIT_GPIO_3
-
-/* Exported Variables ------------------------------------------------------------*/
-  
-  
-/* Exported functions ------------------------------------------------------- */
-FlagStatus RadioGpioGetLevel(RadioGpioPin xGpio);
-void RadioGpioSetLevel(RadioGpioPin xGpio, GPIO_PinState xState);
-void SdkEvalEnterShutdown(void);
-void SdkEvalExitShutdown(void);
-SpiritFlagStatus SdkEvalCheckShutdown(void);
-void RadioGpioInit(RadioGpioPin xGpio, RadioGpioMode xGpioMode);
-void RadioGpioInterruptCmd(RadioGpioPin xGpio, uint8_t nPreemption, uint8_t nSubpriority, FunctionalState xNewState);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /*__RADIO_GPIO_H */
-
-/**
-* @}
-*/
-
-/**
-* @}
-*/
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

--- a/stm-spirit1-rf-driver/radio_spi.h	Thu Jan 18 15:07:23 2018 +0100
+++ b/stm-spirit1-rf-driver/radio_spi.h	Thu Feb 01 16:15:57 2018 +0100
@@ -52,7 +52,7 @@
 // #include "stm32f4xx_hal.h"
 #endif
 #include "SPIRIT_Config.h"
-#include "radio_spi.h" 
+// #include "radio_spi.h"
 // #include "spirit1-arch.h"
 
 /**