Merge branch 'feature/modify_header_file_relationship_for_use_BITx' into 'master'

Modify header file relationship for app using BITx

See merge request sdk/ESP8266_RTOS_SDK!368
This commit is contained in:
Dong Heng
2018-08-09 19:56:38 +08:00
13 changed files with 16 additions and 13 deletions

View File

@ -29,8 +29,6 @@
#include "esp8266/eagle_soc.h"
#include "freertos/portmacro.h"
/* interrupt related */
#define ETS_SPI_INUM 2
#define ETS_GPIO_INUM 4

View File

@ -67,6 +67,10 @@
#include "sdkconfig.h"
#ifndef __ASSEMBLER__
#include "rom/ets_sys.h"
#endif
/*-----------------------------------------------------------
* Application specific definitions.
*

View File

@ -18,6 +18,7 @@
#include <stdint.h>
#include <stdarg.h>
#include "sdkconfig.h"
#include "rom/ets_sys.h"
#ifdef __cplusplus
extern "C" {

View File

@ -68,7 +68,7 @@ static EventGroupHandle_t wifi_event_group;
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
const int CONNECTED_BIT = 1 << 0;
const int CONNECTED_BIT = BIT0;
/* CA Root certificate, device ("Thing") certificate and device

View File

@ -95,7 +95,7 @@ static EventGroupHandle_t wifi_event_group;
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
const int CONNECTED_BIT = 1 << 0;
const int CONNECTED_BIT = BIT0;
/* CA Root certificate, device ("Thing") certificate and device

View File

@ -37,7 +37,7 @@ static EventGroupHandle_t wifi_event_group;
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
const int CONNECTED_BIT = 1>>0;
const int CONNECTED_BIT = BIT0;
/* Constants that aren't configurable in menuconfig */
#define WEB_SERVER "example.com"

View File

@ -61,7 +61,7 @@ static EventGroupHandle_t wifi_event_group;
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
const int CONNECTED_BIT = 1 << 0;
const int CONNECTED_BIT = BIT0;
/* Constants that aren't configurable in menuconfig */
#define WEB_SERVER "www.howsmyssl.com"

View File

@ -40,7 +40,7 @@ static EventGroupHandle_t wifi_event_group;
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
const int CONNECTED_BIT = 1 << 0;
const int CONNECTED_BIT = BIT0;
#if CONFIG_CERT_AUTH
extern const uint8_t server_root_cert_pem_start[] asm("_binary_server_root_cert_pem_start");

View File

@ -45,7 +45,7 @@ static EventGroupHandle_t wifi_event_group;
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
const int CONNECTED_BIT = 1<<0;
const int CONNECTED_BIT = BIT0;
#define MQTT_BROKER "iot.eclipse.org" /* MQTT Broker Address*/
#define MQTT_PORT 1883 /* MQTT Port*/

View File

@ -46,7 +46,7 @@ static const char *TAG = "example";
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
const int CONNECTED_BIT = 1 << 0;
const int CONNECTED_BIT = BIT0;
extern const uint8_t ca_pem_start[] asm("_binary_ca_pem_start");
extern const uint8_t ca_pem_end[] asm("_binary_ca_pem_end");

View File

@ -40,7 +40,7 @@ static EventGroupHandle_t wifi_event_group;
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
const int CONNECTED_BIT = 1 << 0;
const int CONNECTED_BIT = BIT0;
static const char *TAG = "example";

View File

@ -46,7 +46,7 @@ static const char *TAG = "example";
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
const int CONNECTED_BIT = 1 << 0;
const int CONNECTED_BIT = BIT0;
extern const uint8_t ca_pem_start[] asm("_binary_ca_pem_start");
extern const uint8_t ca_pem_end[] asm("_binary_ca_pem_end");

View File

@ -26,8 +26,8 @@ static EventGroupHandle_t wifi_event_group;
/* The event group allows multiple bits for each event,
but we only care about one event - are we connected
to the AP with an IP? */
static const int CONNECTED_BIT = 1<<0;
static const int ESPTOUCH_DONE_BIT = 1<<1;
static const int CONNECTED_BIT = BIT0;
static const int ESPTOUCH_DONE_BIT = BIT1;
static const char *TAG = "sc";
void smartconfig_example_task(void * parm);