Skip to content

Commit f0024ff

Browse files
committed
Revert "Move board definition to its own header, fixes BOARD redefined warning"
This reverts commit 70a1c50.
1 parent 8fc235c commit f0024ff

File tree

3 files changed

+77
-80
lines changed

3 files changed

+77
-80
lines changed

arduino-modbus-rtu-tcp-gateway/01-interfaces.ino

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,4 +348,80 @@ ISR(WDT_vect) {
348348
nrot--;
349349
seed1 = seed1 << 8;
350350
seed1 = seed1 ^ TCNT1L;
351-
}
351+
}
352+
353+
// Preprocessor code for identifying microcontroller board
354+
#if defined(TEENSYDUINO)
355+
// --------------- Teensy -----------------
356+
#if defined(__AVR_ATmega32U4__)
357+
#define BOARD F("Teensy 2.0")
358+
#elif defined(__AVR_AT90USB1286__)
359+
#define BOARD F("Teensy++ 2.0")
360+
#elif defined(__MK20DX128__)
361+
#define BOARD F("Teensy 3.0")
362+
#elif defined(__MK20DX256__)
363+
#define BOARD F("Teensy 3.2") // and Teensy 3.1 (obsolete)
364+
#elif defined(__MKL26Z64__)
365+
#define BOARD F("Teensy LC")
366+
#elif defined(__MK64FX512__)
367+
#define BOARD F("Teensy 3.5")
368+
#elif defined(__MK66FX1M0__)
369+
#define BOARD F("Teensy 3.6")
370+
#else
371+
#define BOARD F("Unknown Board")
372+
#endif
373+
#else // --------------- Arduino ------------------
374+
#if defined(ARDUINO_AVR_ADK)
375+
#define BOARD F("Arduino Mega Adk")
376+
#elif defined(ARDUINO_AVR_BT) // Bluetooth
377+
#define BOARD F("Arduino Bt")
378+
#elif defined(ARDUINO_AVR_DUEMILANOVE)
379+
#define BOARD F("Arduino Duemilanove")
380+
#elif defined(ARDUINO_AVR_ESPLORA)
381+
#define BOARD F("Arduino Esplora")
382+
#elif defined(ARDUINO_AVR_ETHERNET)
383+
#define BOARD F("Arduino Ethernet")
384+
#elif defined(ARDUINO_AVR_FIO)
385+
#define BOARD F("Arduino Fio")
386+
#elif defined(ARDUINO_AVR_GEMMA)
387+
#define BOARD F("Arduino Gemma")
388+
#elif defined(ARDUINO_AVR_LEONARDO)
389+
#define BOARD F("Arduino Leonardo")
390+
#elif defined(ARDUINO_AVR_LILYPAD)
391+
#define BOARD F("Arduino Lilypad")
392+
#elif defined(ARDUINO_AVR_LILYPAD_USB)
393+
#define BOARD F("Arduino Lilypad Usb")
394+
#elif defined(ARDUINO_AVR_MEGA)
395+
#define BOARD F("Arduino Mega")
396+
#elif defined(ARDUINO_AVR_MEGA2560)
397+
#define BOARD F("Arduino Mega 2560")
398+
#elif defined(ARDUINO_AVR_MICRO)
399+
#define BOARD F("Arduino Micro")
400+
#elif defined(ARDUINO_AVR_MINI)
401+
#define BOARD F("Arduino Mini")
402+
#elif defined(ARDUINO_AVR_NANO)
403+
#define BOARD F("Arduino Nano")
404+
#elif defined(ARDUINO_AVR_NG)
405+
#define BOARD F("Arduino NG")
406+
#elif defined(ARDUINO_AVR_PRO)
407+
#define BOARD F("Arduino Pro")
408+
#elif defined(ARDUINO_AVR_ROBOT_CONTROL)
409+
#define BOARD F("Arduino Robot Ctrl")
410+
#elif defined(ARDUINO_AVR_ROBOT_MOTOR)
411+
#define BOARD F("Arduino Robot Motor")
412+
#elif defined(ARDUINO_AVR_UNO)
413+
#define BOARD F("Arduino Uno")
414+
#elif defined(ARDUINO_AVR_YUN)
415+
#define BOARD F("Arduino Yun")
416+
417+
// These boards must be installed separately:
418+
#elif defined(ARDUINO_SAM_DUE)
419+
#define BOARD F("Arduino Due")
420+
#elif defined(ARDUINO_SAMD_ZERO)
421+
#define BOARD F("Arduino Zero")
422+
#elif defined(ARDUINO_ARC32_TOOLS)
423+
#define BOARD F("Arduino 101")
424+
#else
425+
#define BOARD F("Unknown Board")
426+
#endif
427+
#endif

arduino-modbus-rtu-tcp-gateway/advanced_settings.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/* Advanced settings, extra functions and default config for Modbus RTU ⇒ Modbus TCP/UDP Gateway
22
*/
33

4-
#include "board.h"
5-
64
/****** FUNCTIONALITY ******/
75

86
// #define ENABLE_EXTENDED_WEBUI // Enable extended Web UI (additional items and settings), consumes FLASH memory

arduino-modbus-rtu-tcp-gateway/board.h

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)