Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 17:33:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:nuttx/nuttx into ieee802154

Browse Source
This commit is contained in:
Gregory Nutt
2017-04-04 14:29:00 -06:00
parent cd64339413 34da085b40
commit e7f9d14118
19 changed files with 914 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/net/sixlowpan.h
+6 -3
View File
@@ -42,8 +42,8 @@
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_NET_SIXLOWOAN_H
#define __INCLUDE_NUTTX_NET_SIXLOWOAN_H
#ifndef __INCLUDE_NUTTX_NET_SIXLOWPAN_H
#define __INCLUDE_NUTTX_NET_SIXLOWPAN_H
/****************************************************************************
* Included Files
@@ -57,6 +57,8 @@
#include <nuttx/net/iob.h>
#include <nuttx/net/netdev.h>
#ifdef CONFIG_NET_6LOWPAN
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
@@ -465,4 +467,5 @@ struct ieee802154_driver_s
int sixlowpan_input(FAR struct ieee802154_driver_s *ieee);
#endif /* __INCLUDE_NUTTX_NET_SIXLOWOAN_H */
#endif /* CONFIG_NET_6LOWPAN */
#endif /* __INCLUDE_NUTTX_NET_SIXLOWPAN_H */
include/nuttx/sensors/lis2dh.h
+6 -2
View File
@@ -109,8 +109,12 @@ extern "C"
/* I1_AOI1 ENABLE for INT2 (-X------) */
#define ST_LIS2DH_CR3_I1_AOI1_ENABLED 0x40 /* AOI1 interrupt on INT1 pin.*/
#define ST_LIS2DH_CR3_I1_AOI2_ENABLED 0x20 /* AOI2 interrupt on INT1 pin.*/
#define ST_LIS2DH_CR3_I1_AOI1_ENABLED 0x40 /* AOI1 interrupt on INT1 pin. */
#define ST_LIS2DH_CR3_I1_AOI2_ENABLED 0x20 /* AOI2 interrupt on INT1 pin. */
#define ST_LIS2DH_CR3_I1_DRDY1 0x10 /* DRDY1 interrupt on INT1 pin. */
#define ST_LIS2DH_CR3_I1_DRDY2 0x08 /* DRDY2 interrupt on INT1 pin. */
#define ST_LIS2DH_CR3_I1_WTM 0x04 /* FIFO Watermark interrupt on INT1 pin. */
#define ST_LIS2DH_CR3_I1_OVERRUN 0x02 /* FIFO Overrun interrupt on INT1 pin. */
#define ST_LIS2DH_CTRL_REG4 0x23