Auto-enable USB serial on cc2538 when TSCH is used with SLIP or with the shell
This commit is contained in:
parent
c320717d9a
commit
09c0213898
@ -230,8 +230,9 @@ typedef uint32_t rtimer_clock_t;
|
|||||||
*/
|
*/
|
||||||
#ifndef USB_SERIAL_CONF_ENABLE
|
#ifndef USB_SERIAL_CONF_ENABLE
|
||||||
#define USB_SERIAL_CONF_ENABLE \
|
#define USB_SERIAL_CONF_ENABLE \
|
||||||
((SLIP_ARCH_CONF_USB & SLIP_ARCH_CONF_ENABLED) | \
|
((SLIP_ARCH_CONF_USB && SLIP_ARCH_CONF_ENABLED) || \
|
||||||
DBG_CONF_USB)
|
(MAC_CONF_WITH_TSCH && (SLIP_ARCH_CONF_ENABLED || BUILD_WITH_SHELL)) || \
|
||||||
|
DBG_CONF_USB)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -278,8 +278,9 @@ typedef uint32_t rtimer_clock_t;
|
|||||||
*/
|
*/
|
||||||
#ifndef USB_SERIAL_CONF_ENABLE
|
#ifndef USB_SERIAL_CONF_ENABLE
|
||||||
#define USB_SERIAL_CONF_ENABLE \
|
#define USB_SERIAL_CONF_ENABLE \
|
||||||
((SLIP_ARCH_CONF_USB & SLIP_ARCH_CONF_ENABLED) | \
|
((SLIP_ARCH_CONF_USB && SLIP_ARCH_CONF_ENABLED) || \
|
||||||
DBG_CONF_USB)
|
(MAC_CONF_WITH_TSCH && (SLIP_ARCH_CONF_ENABLED || BUILD_WITH_SHELL)) || \
|
||||||
|
DBG_CONF_USB)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -276,7 +276,8 @@ typedef uint32_t rtimer_clock_t;
|
|||||||
*/
|
*/
|
||||||
#ifndef USB_SERIAL_CONF_ENABLE
|
#ifndef USB_SERIAL_CONF_ENABLE
|
||||||
#define USB_SERIAL_CONF_ENABLE \
|
#define USB_SERIAL_CONF_ENABLE \
|
||||||
((SLIP_ARCH_CONF_USB & SLIP_ARCH_CONF_ENABLED) | \
|
((SLIP_ARCH_CONF_USB && SLIP_ARCH_CONF_ENABLED) || \
|
||||||
|
(MAC_CONF_WITH_TSCH && (SLIP_ARCH_CONF_ENABLED || BUILD_WITH_SHELL)) || \
|
||||||
DBG_CONF_USB)
|
DBG_CONF_USB)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -104,7 +104,6 @@
|
|||||||
* by default the RC oscillator is activated */
|
* by default the RC oscillator is activated */
|
||||||
#define SYS_CTRL_CONF_OSC32K_USE_XTAL 1
|
#define SYS_CTRL_CONF_OSC32K_USE_XTAL 1
|
||||||
|
|
||||||
#define USB_SERIAL_CONF_ENABLE 1
|
|
||||||
/* USB serial takes space, free more space elsewhere */
|
/* USB serial takes space, free more space elsewhere */
|
||||||
#define SICSLOWPAN_CONF_FRAG 0
|
#define SICSLOWPAN_CONF_FRAG 0
|
||||||
#define UIP_CONF_BUFFER_SIZE 160
|
#define UIP_CONF_BUFFER_SIZE 160
|
||||||
|
@ -60,8 +60,6 @@
|
|||||||
/*******************************************************/
|
/*******************************************************/
|
||||||
|
|
||||||
#if WITH_SHELL
|
#if WITH_SHELL
|
||||||
/* Needed for CC2538 platforms, for serial */
|
|
||||||
#define USB_SERIAL_CONF_ENABLE 1
|
|
||||||
|
|
||||||
/* USB serial takes space, free more space elsewhere */
|
/* USB serial takes space, free more space elsewhere */
|
||||||
#define SICSLOWPAN_CONF_FRAG 0
|
#define SICSLOWPAN_CONF_FRAG 0
|
||||||
|
Loading…
Reference in New Issue
Block a user