Skip to content

Commit 094453c

Browse files
committed
Remove remaining ARDUINO_AVR_UNO_WIFI_REV2 configuration defines
1 parent 60528b9 commit 094453c

File tree

1 file changed

+8
-43
lines changed

1 file changed

+8
-43
lines changed

src/AIoTC_Config.h

+8-43
Original file line numberDiff line numberDiff line change
@@ -27,64 +27,30 @@
2727
#endif
2828

2929
#ifndef DEBUG_ERROR
30-
# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
31-
# define DEBUG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
32-
# else
33-
# define DEBUG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
34-
# endif
30+
#define DEBUG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
3531
#endif
3632

3733
#ifndef DEBUG_WARNING
38-
# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
39-
# define DEBUG_WARNING(fmt, ...)
40-
# else
41-
# define DEBUG_WARNING(fmt, ...) Debug.print(DBG_WARNING, fmt, ## __VA_ARGS__)
42-
# endif
34+
#define DEBUG_WARNING(fmt, ...) Debug.print(DBG_WARNING, fmt, ## __VA_ARGS__)
4335
#endif
4436

4537
#ifndef DEBUG_INFO
46-
# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
47-
# define DEBUG_INFO(fmt, ...)
48-
# else
49-
# define DEBUG_INFO(fmt, ...) Debug.print(DBG_INFO, fmt, ## __VA_ARGS__)
50-
# endif
38+
#define DEBUG_INFO(fmt, ...) Debug.print(DBG_INFO, fmt, ## __VA_ARGS__)
5139
#endif
5240

5341
#ifndef DEBUG_DEBUG
54-
# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
55-
# define DEBUG_DEBUG(fmt, ...)
56-
# else
57-
# define DEBUG_DEBUG(fmt, ...) Debug.print(DBG_DEBUG, fmt, ## __VA_ARGS__)
58-
# endif
42+
#define DEBUG_DEBUG(fmt, ...) Debug.print(DBG_DEBUG, fmt, ## __VA_ARGS__)
5943
#endif
6044

6145
#ifndef DEBUG_VERBOSE
62-
# if defined(ARDUINO_AVR_UNO_WIFI_REV2)
63-
# define DEBUG_VERBOSE(fmt, ...)
64-
# else
65-
# define DEBUG_VERBOSE(fmt, ...) //Debug.print(DBG_VERBOSE, fmt, ## __VA_ARGS__)
66-
# endif
67-
#endif
68-
69-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) && !(defined(DEBUG_ERROR) || defined(DEBUG_WARNING) || defined(DEBUG_INFO) || defined(DEBUG_DEBUG) || defined(DEBUG_VERBOSE))
70-
/* Provide defines for constants provided within Arduino_DebugUtils
71-
* in order to allow older sketches using those constants to still
72-
* compile.
73-
*/
74-
# define DBG_NONE -1
75-
# define DBG_ERROR 0
76-
# define DBG_WARNING 1
77-
# define DBG_INFO 2
78-
# define DBG_DEBUG 3
79-
# define DBG_VERBOSE 4
46+
#define DEBUG_VERBOSE(fmt, ...) //Debug.print(DBG_VERBOSE, fmt, ## __VA_ARGS__)
8047
#endif
8148

8249
/******************************************************************************
8350
* AUTOMATICALLY CONFIGURED DEFINES
8451
******************************************************************************/
8552

86-
#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT) || \
87-
defined(ARDUINO_AVR_UNO_WIFI_REV2)
53+
#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
8854
#define OTA_STORAGE_SNU (1)
8955
#else
9056
#define OTA_STORAGE_SNU (0)
@@ -112,7 +78,7 @@
11278
#define OTA_STORAGE_ESP (1)
11379
#endif
11480

115-
#if (OTA_STORAGE_SFU || OTA_STORAGE_SSU || OTA_STORAGE_SNU || OTA_STORAGE_PORTENTA_QSPI || OTA_STORAGE_ESP) && !defined(ARDUINO_AVR_UNO_WIFI_REV2)
81+
#if (OTA_STORAGE_SFU || OTA_STORAGE_SSU || OTA_STORAGE_SNU || OTA_STORAGE_PORTENTA_QSPI || OTA_STORAGE_ESP)
11682
#define OTA_ENABLED (1)
11783
#else
11884
#define OTA_ENABLED (0)
@@ -131,8 +97,7 @@
13197
#define HAS_TCP
13298
#endif
13399

134-
#if defined(ARDUINO_AVR_UNO_WIFI_REV2) || \
135-
defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
100+
#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_NANO_33_IOT)
136101
#define BOARD_HAS_OFFLOADED_ECCX08
137102
#define HAS_TCP
138103
#endif

0 commit comments

Comments
 (0)