Skip to content

Commit 04f41b8

Browse files
authored
Merge pull request #326 from pennam/esp32_2.0.4_fix
ESP32 core 2.0.4 CI fixes
2 parents 94b243d + c0ac252 commit 04f41b8

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

Diff for: src/ArduinoIoTCloud.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ ArduinoIoTCloudClass::ArduinoIoTCloudClass()
3232
, _tz_offset{0}
3333
, _tz_dst_until{0}
3434
, _thing_id{""}
35-
, _device_id{""}
3635
, _lib_version{AIOT_CONFIG_LIB_VERSION}
36+
, _device_id{""}
3737
, _cloud_event_callback{nullptr}
3838
, _thing_id_outdated{false}
3939
{

Diff for: src/ArduinoIoTCloudTCP.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,10 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectPhy()
387387

388388
ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SyncTime()
389389
{
390+
#pragma GCC diagnostic push
391+
#pragma GCC diagnostic ignored "-Wunused-variable"
390392
unsigned long const internal_posix_time = _time_service.getTime();
393+
#pragma GCC diagnostic pop
391394
DEBUG_VERBOSE("ArduinoIoTCloudTCP::%s internal clock configured to posix timestamp %d", __FUNCTION__, internal_posix_time);
392395
return State::ConnectMqttBroker;
393396
}

Diff for: src/cbor/lib/tinycbor/src/open_memstream.c

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ typedef size_t LenType;
4646
#pragma GCC diagnostic push
4747
#pragma GCC diagnostic ignored "-Wpedantic"
4848
#pragma GCC diagnostic ignored "-Wreturn-type"
49+
#pragma GCC diagnostic ignored "-Wunused-function"
4950

5051
struct Buffer
5152
{

Diff for: src/utility/watchdog/Watchdog.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@
4141
/******************************************************************************
4242
* GLOBAL VARIABLES
4343
******************************************************************************/
44-
44+
#if defined(ARDUINO_ARCH_SAMD) || defined(ARDUINO_ARCH_MBED)
4545
static bool is_watchdog_enabled = false;
46+
#endif
4647

4748
/******************************************************************************
4849
* FUNCTION DEFINITION

0 commit comments

Comments
 (0)