kazu/ESP8266lib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

switched to new SDK

Browse Source 
minor changes
This commit is contained in:
FrankE
2017-10-10 09:57:37 +02:00
parent ecb7f3640f
commit cc84788d42
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
c++.h
View File

@@ -4,7 +4,7 @@
#define FALSE false #define FALSE false
typedef void (*int_handler_t)(void*); typedef void (*int_handler_t)(void*);
/*
void *pvPortMalloc(size_t xWantedSize, const char* file, int line) __attribute__((malloc, alloc_size(1))); void *pvPortMalloc(size_t xWantedSize, const char* file, int line) __attribute__((malloc, alloc_size(1)));
void *pvPortRealloc(void* ptr, size_t xWantedSize, const char* file, int line) __attribute__((alloc_size(2))); void *pvPortRealloc(void* ptr, size_t xWantedSize, const char* file, int line) __attribute__((alloc_size(2)));
void vPortFree(void *ptr, const char* file, int line); void vPortFree(void *ptr, const char* file, int line);
@@ -29,7 +29,6 @@ void ets_install_putc1(void* routine);
void uart_div_modify(int no, int freq); void uart_div_modify(int no, int freq);
//STATUS uart_tx_one_char(uint8_t uart, uint8_t TxChar); //STATUS uart_tx_one_char(uint8_t uart, uint8_t TxChar);
void ets_isr_mask(int intr); void ets_isr_mask(int intr);
void ets_isr_unmask(int intr); void ets_isr_unmask(int intr);
void ets_isr_attach(int intr, int_handler_t handler, void *arg); void ets_isr_attach(int intr, int_handler_t handler, void *arg);
@@ -54,7 +53,7 @@ typedef void (*int_handler_t)(void*);
#define ETS_CCOMPARE0_INUM 6 #define ETS_CCOMPARE0_INUM 6
#define ETS_SOFT_INUM 7 #define ETS_SOFT_INUM 7
#define ETS_WDT_INUM 8 #define ETS_WDT_INUM 8
#define ETS_FRC_TIMER1_INUM 9 /* use edge*/ #define ETS_FRC_TIMER1_INUM 9 // use edge
#define ETS_INTR_LOCK() \ #define ETS_INTR_LOCK() \
ets_intr_lock() ets_intr_lock()
@@ -99,18 +98,18 @@ inline uint32_t ETS_INTR_PENDING(void)
#define ETS_CCOMPARE0_DISABLE() \ #define ETS_CCOMPARE0_DISABLE() \
ETS_INTR_DISABLE(ETS_CCOMPARE0_INUM) ETS_INTR_DISABLE(ETS_CCOMPARE0_INUM)
/*
//#define ETS_FRC_TIMER1_INTR_ATTACH(func, arg) \ //#define ETS_FRC_TIMER1_INTR_ATTACH(func, arg) \
// ets_isr_attach(ETS_FRC_TIMER1_INUM, (int_handler_t)(func), (void *)(arg)) // ets_isr_attach(ETS_FRC_TIMER1_INUM, (int_handler_t)(func), (void *)(arg))
*/
#define ETS_FRC_TIMER1_NMI_INTR_ATTACH(func) \ #define ETS_FRC_TIMER1_NMI_INTR_ATTACH(func) \
NmiTimSetFunc(func) NmiTimSetFunc(func)
/*
//#define ETS_GPIO_INTR_ATTACH(func, arg) \ //#define ETS_GPIO_INTR_ATTACH(func, arg) \
// ets_isr_attach(ETS_GPIO_INUM, (int_handler_t)(func), (void *)(arg)) // ets_isr_attach(ETS_GPIO_INUM, (int_handler_t)(func), (void *)(arg))
*/
#define ETS_GPIO_INTR_ENABLE() \ #define ETS_GPIO_INTR_ENABLE() \
ETS_INTR_ENABLE(ETS_GPIO_INUM) ETS_INTR_ENABLE(ETS_GPIO_INUM)
@@ -118,10 +117,10 @@ inline uint32_t ETS_INTR_PENDING(void)
#define ETS_GPIO_INTR_DISABLE() \ #define ETS_GPIO_INTR_DISABLE() \
ETS_INTR_DISABLE(ETS_GPIO_INUM) ETS_INTR_DISABLE(ETS_GPIO_INUM)
/*
//#define ETS_UART_INTR_ATTACH(func, arg) \ //#define ETS_UART_INTR_ATTACH(func, arg) \
// ets_isr_attach(ETS_UART_INUM, (int_handler_t)(func), (void *)(arg)) // ets_isr_attach(ETS_UART_INUM, (int_handler_t)(func), (void *)(arg))
*/
#define ETS_UART_INTR_ENABLE() \ #define ETS_UART_INTR_ENABLE() \
ETS_INTR_ENABLE(ETS_UART_INUM) ETS_INTR_ENABLE(ETS_UART_INUM)
@@ -135,10 +134,10 @@ inline uint32_t ETS_INTR_PENDING(void)
#define ETS_FRC1_INTR_DISABLE() \ #define ETS_FRC1_INTR_DISABLE() \
ETS_INTR_DISABLE(ETS_FRC_TIMER1_INUM) ETS_INTR_DISABLE(ETS_FRC_TIMER1_INUM)
/*
//#define ETS_SPI_INTR_ATTACH(func, arg) \ //#define ETS_SPI_INTR_ATTACH(func, arg) \
// ets_isr_attach(ETS_SPI_INUM, (int_handler_t)(func), (void *)(arg)) // ets_isr_attach(ETS_SPI_INUM, (int_handler_t)(func), (void *)(arg))
*/
#define ETS_SPI_INTR_ENABLE() \ #define ETS_SPI_INTR_ENABLE() \
ETS_INTR_ENABLE(ETS_SPI_INUM) ETS_INTR_ENABLE(ETS_SPI_INUM)
@@ -156,10 +155,9 @@ inline uint32_t ETS_INTR_PENDING(void)
#define ETS_SLC_INTR_DISABLE() \ #define ETS_SLC_INTR_DISABLE() \
ETS_INTR_DISABLE(ETS_SLC_INUM) ETS_INTR_DISABLE(ETS_SLC_INUM)
/*
//#define ETS_SDIO_INTR_ATTACH(func, arg) \ //#define ETS_SDIO_INTR_ATTACH(func, arg) \
// ets_isr_attach(ETS_SDIO_INUM, (int_handler_t)(func), (void *)(arg)) // ets_isr_attach(ETS_SDIO_INUM, (int_handler_t)(func), (void *)(arg))
*/
#define ETS_SDIO_INTR_ENABLE() \ #define ETS_SDIO_INTR_ENABLE() \
ETS_INTR_ENABLE(ETS_SDIO_INUM) ETS_INTR_ENABLE(ETS_SDIO_INUM)
@@ -185,7 +183,7 @@ extern void ets_delay_us(uint32_t us);
extern int os_printf_plus(const char * format, ...) __attribute__ ((format (printf, 1, 2))); extern int os_printf_plus(const char * format, ...) __attribute__ ((format (printf, 1, 2)));
*/
/* /*
bool wifi_station_get_config(struct station_config *config); bool wifi_station_get_config(struct station_config *config);

2
io/IO.h
View File

@@ -72,6 +72,8 @@ public:
#elif PLATFORM == NODE_MCU #elif PLATFORM == NODE_MCU
GPIO16_OUTPUT_SET; GPIO16_OUTPUT_SET;
if (on) {GPIO16_H;} else {GPIO16_L;} if (on) {GPIO16_H;} else {GPIO16_L;}
GPIO2_OUTPUT_SET;
if (on) {GPIO2_H;} else {GPIO2_L;}
#else #else
#error "NO PLATFORM" #error "NO PLATFORM"
#endif #endif

2
net/Promiscuous.h
View File

@@ -25,7 +25,7 @@ struct RxControl {
unsigned rxend_state:8; unsigned rxend_state:8;
unsigned ampdu_cnt:8; unsigned ampdu_cnt:8;
unsigned channel:4; //which channel this packet in. unsigned channel:4; //which channel this packet in.
unsigned:12; unsigned unknown3:12;
}; };
struct LenSeq{ struct LenSeq{