deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1046 from g-oikonomou/cc26xx/contrib/slip-and-br

Browse source 
Enable slip-radio and rpl-border-router for CC26xx
This commit is contained in:
George Oikonomou 2015-05-09 22:51:06 +01:00
parent cf1f722a93 a72d90e283
commit 447be526ae
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/cc26xx/cc26xx-web-demo/project-conf.h
View file

@ -44,10 +44,14 @@
#define CC26XX_WEB_DEMO_CONF_COAP_SERVER 1 #define CC26XX_WEB_DEMO_CONF_COAP_SERVER 1
#define CC26XX_WEB_DEMO_CONF_NET_UART 1 #define CC26XX_WEB_DEMO_CONF_NET_UART 1
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Shrink the size of the uIP buffer, routing table and ND cache */ /*
* Shrink the size of the uIP buffer, routing table and ND cache.
* Set the TCP MSS
*/
#define UIP_CONF_BUFFER_SIZE 900 #define UIP_CONF_BUFFER_SIZE 900
#define NBR_TABLE_CONF_MAX_NEIGHBORS 8 #define NBR_TABLE_CONF_MAX_NEIGHBORS 8
#define UIP_CONF_MAX_ROUTES 8 #define UIP_CONF_MAX_ROUTES 8
#define UIP_CONF_TCP_MSS 128
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* PROJECT_CONF_H_ */ #endif /* PROJECT_CONF_H_ */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

9
platform/srf06-cc26xx/contiki-conf.h
View file

@ -220,7 +220,7 @@
#define UIP_CONF_TCP 1 #define UIP_CONF_TCP 1
#endif #endif
#ifndef UIP_CONF_TCP_MSS #ifndef UIP_CONF_TCP_MSS
#define UIP_CONF_TCP_MSS 128 #define UIP_CONF_TCP_MSS 64
#endif #endif
#define UIP_CONF_UDP 1 #define UIP_CONF_UDP 1
@ -287,6 +287,13 @@
/* Notify various examples that we have Buttons */ /* Notify various examples that we have Buttons */
#define PLATFORM_HAS_BUTTON 1 #define PLATFORM_HAS_BUTTON 1
/*
* Override button symbols from dev/button-sensor.h, for the examples that
* include it
*/
#define button_sensor button_left_sensor
#define button_sensor2 button_right_sensor
/** @} */ /** @} */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Platform-specific define to signify sensor reading failure */ /* Platform-specific define to signify sensor reading failure */

1
platform/srf06-cc26xx/sensortag/button-sensor.h
View file

@ -54,7 +54,6 @@
#define BUTTON_SENSOR_VALUE_RELEASED 0 #define BUTTON_SENSOR_VALUE_RELEASED 0
#define BUTTON_SENSOR_VALUE_PRESSED 1 #define BUTTON_SENSOR_VALUE_PRESSED 1
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define button_sensor button_left_sensor
extern const struct sensors_sensor button_left_sensor; extern const struct sensors_sensor button_left_sensor;
extern const struct sensors_sensor button_right_sensor; extern const struct sensors_sensor button_right_sensor;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

1
platform/srf06-cc26xx/srf06/button-sensor.h
View file

@ -49,7 +49,6 @@
#define BUTTON_SENSOR_VALUE_RELEASED 0 #define BUTTON_SENSOR_VALUE_RELEASED 0
#define BUTTON_SENSOR_VALUE_PRESSED 1 #define BUTTON_SENSOR_VALUE_PRESSED 1
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define button_sensor button_select_sensor
extern const struct sensors_sensor button_select_sensor; extern const struct sensors_sensor button_select_sensor;
extern const struct sensors_sensor button_left_sensor; extern const struct sensors_sensor button_left_sensor;
extern const struct sensors_sensor button_right_sensor; extern const struct sensors_sensor button_right_sensor;