Skip to content

Commit aad1adf

Browse files
donghengqazdonghengqaz
committed
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
2 parents 03be34e + 430b95f commit aad1adf

File tree

13 files changed

+16
-13
lines changed

13 files changed

+16
-13
lines changed

‎components/esp8266/include/rom/ets_sys.h

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
#include "esp8266/eagle_soc.h"
3131

32-
#include "freertos/portmacro.h"
33-
3432
/* interrupt related */
3533
#define ETS_SPI_INUM 2
3634
#define ETS_GPIO_INUM 4

‎components/freertos/port/esp8266/include/freertos/FreeRTOSConfig.h

+4
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767

6868
#include "sdkconfig.h"
6969

70+
#ifndef __ASSEMBLER__
71+
#include "rom/ets_sys.h"
72+
#endif
73+
7074
/*-----------------------------------------------------------
7175
* Application specific definitions.
7276
*

‎components/log/include/esp_log.h

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <stdint.h>
1919
#include <stdarg.h>
2020
#include "sdkconfig.h"
21+
#include "rom/ets_sys.h"
2122

2223
#ifdef __cplusplus
2324
extern "C" {

‎examples/protocols/aws_iot/subscribe_publish/main/subscribe_publish_sample.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static EventGroupHandle_t wifi_event_group;
6868
/* The event group allows multiple bits for each event,
6969
but we only care about one event - are we connected
7070
to the AP with an IP? */
71-
const int CONNECTED_BIT = 1 << 0;
71+
const int CONNECTED_BIT = BIT0;
7272

7373

7474
/* CA Root certificate, device ("Thing") certificate and device

‎examples/protocols/aws_iot/thing_shadow/main/thing_shadow_sample.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static EventGroupHandle_t wifi_event_group;
9595
/* The event group allows multiple bits for each event,
9696
but we only care about one event - are we connected
9797
to the AP with an IP? */
98-
const int CONNECTED_BIT = 1 << 0;
98+
const int CONNECTED_BIT = BIT0;
9999

100100

101101
/* CA Root certificate, device ("Thing") certificate and device

‎examples/protocols/http_request/main/http_request_example_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static EventGroupHandle_t wifi_event_group;
3737
/* The event group allows multiple bits for each event,
3838
but we only care about one event - are we connected
3939
to the AP with an IP? */
40-
const int CONNECTED_BIT = 1>>0;
40+
const int CONNECTED_BIT = BIT0;
4141

4242
/* Constants that aren't configurable in menuconfig */
4343
#define WEB_SERVER "example.com"

‎examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static EventGroupHandle_t wifi_event_group;
6161
/* The event group allows multiple bits for each event,
6262
but we only care about one event - are we connected
6363
to the AP with an IP? */
64-
const int CONNECTED_BIT = 1 << 0;
64+
const int CONNECTED_BIT = BIT0;
6565

6666
/* Constants that aren't configurable in menuconfig */
6767
#define WEB_SERVER "www.howsmyssl.com"

‎examples/protocols/https_wolfssl/main/https_wolfssl_example_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static EventGroupHandle_t wifi_event_group;
4040
/* The event group allows multiple bits for each event,
4141
but we only care about one event - are we connected
4242
to the AP with an IP? */
43-
const int CONNECTED_BIT = 1 << 0;
43+
const int CONNECTED_BIT = BIT0;
4444

4545
#if CONFIG_CERT_AUTH
4646
extern const uint8_t server_root_cert_pem_start[] asm("_binary_server_root_cert_pem_start");

‎examples/protocols/mqtt/main/MQTTEcho.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static EventGroupHandle_t wifi_event_group;
4545
/* The event group allows multiple bits for each event,
4646
but we only care about one event - are we connected
4747
to the AP with an IP? */
48-
const int CONNECTED_BIT = 1<<0;
48+
const int CONNECTED_BIT = BIT0;
4949

5050
#define MQTT_BROKER "iot.eclipse.org" /* MQTT Broker Address*/
5151
#define MQTT_PORT 1883 /* MQTT Port*/

‎examples/protocols/openssl_client/main/openssl_client_example_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static const char *TAG = "example";
4646
/* The event group allows multiple bits for each event,
4747
but we only care about one event - are we connected
4848
to the AP with an IP? */
49-
const int CONNECTED_BIT = 1 << 0;
49+
const int CONNECTED_BIT = BIT0;
5050

5151
extern const uint8_t ca_pem_start[] asm("_binary_ca_pem_start");
5252
extern const uint8_t ca_pem_end[] asm("_binary_ca_pem_end");

‎examples/protocols/openssl_demo/main/openssl_demo_example_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static EventGroupHandle_t wifi_event_group;
4040
/* The event group allows multiple bits for each event,
4141
but we only care about one event - are we connected
4242
to the AP with an IP? */
43-
const int CONNECTED_BIT = 1 << 0;
43+
const int CONNECTED_BIT = BIT0;
4444

4545
static const char *TAG = "example";
4646

‎examples/protocols/openssl_server/main/openssl_server_example_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static const char *TAG = "example";
4646
/* The event group allows multiple bits for each event,
4747
but we only care about one event - are we connected
4848
to the AP with an IP? */
49-
const int CONNECTED_BIT = 1 << 0;
49+
const int CONNECTED_BIT = BIT0;
5050

5151
extern const uint8_t ca_pem_start[] asm("_binary_ca_pem_start");
5252
extern const uint8_t ca_pem_end[] asm("_binary_ca_pem_end");

‎examples/wifi/smart_config/main/smartconfig_main.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ static EventGroupHandle_t wifi_event_group;
2626
/* The event group allows multiple bits for each event,
2727
but we only care about one event - are we connected
2828
to the AP with an IP? */
29-
static const int CONNECTED_BIT = 1<<0;
30-
static const int ESPTOUCH_DONE_BIT = 1<<1;
29+
static const int CONNECTED_BIT = BIT0;
30+
static const int ESPTOUCH_DONE_BIT = BIT1;
3131
static const char *TAG = "sc";
3232

3333
void smartconfig_example_task(void * parm);

0 commit comments

Comments
 (0)