Skip to content

Commit 70a1c50

Browse files
scabreroscabrero
committed
Move board definition to its own header, fixes BOARD redefined warning
Signed-off-by: Samuel Cabrero <[email protected]>
1 parent 539dc8c commit 70a1c50

File tree

3 files changed

+80
-77
lines changed

3 files changed

+80
-77
lines changed

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

Lines changed: 1 addition & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -348,80 +348,4 @@ ISR(WDT_vect) {
348348
nrot--;
349349
seed1 = seed1 << 8;
350350
seed1 = seed1 ^ TCNT1L;
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
351+
}

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

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

4+
#include "board.h"
5+
46
/****** FUNCTIONALITY ******/
57

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

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

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
#pragma once
2+
3+
// Preprocessor code for identifying microcontroller board
4+
#if defined(TEENSYDUINO)
5+
// --------------- Teensy -----------------
6+
#if defined(__AVR_ATmega32U4__)
7+
#define BOARD F("Teensy 2.0")
8+
#elif defined(__AVR_AT90USB1286__)
9+
#define BOARD F("Teensy++ 2.0")
10+
#elif defined(__MK20DX128__)
11+
#define BOARD F("Teensy 3.0")
12+
#elif defined(__MK20DX256__)
13+
#define BOARD F("Teensy 3.2") // and Teensy 3.1 (obsolete)
14+
#elif defined(__MKL26Z64__)
15+
#define BOARD F("Teensy LC")
16+
#elif defined(__MK64FX512__)
17+
#define BOARD F("Teensy 3.5")
18+
#elif defined(__MK66FX1M0__)
19+
#define BOARD F("Teensy 3.6")
20+
#else
21+
#define BOARD F("Unknown Board")
22+
#endif
23+
#else // --------------- Arduino ------------------
24+
#if defined(ARDUINO_AVR_ADK)
25+
#define BOARD F("Arduino Mega Adk")
26+
#elif defined(ARDUINO_AVR_BT) // Bluetooth
27+
#define BOARD F("Arduino Bt")
28+
#elif defined(ARDUINO_AVR_DUEMILANOVE)
29+
#define BOARD F("Arduino Duemilanove")
30+
#elif defined(ARDUINO_AVR_ESPLORA)
31+
#define BOARD F("Arduino Esplora")
32+
#elif defined(ARDUINO_AVR_ETHERNET)
33+
#define BOARD F("Arduino Ethernet")
34+
#elif defined(ARDUINO_AVR_FIO)
35+
#define BOARD F("Arduino Fio")
36+
#elif defined(ARDUINO_AVR_GEMMA)
37+
#define BOARD F("Arduino Gemma")
38+
#elif defined(ARDUINO_AVR_LEONARDO)
39+
#define BOARD F("Arduino Leonardo")
40+
#elif defined(ARDUINO_AVR_LILYPAD)
41+
#define BOARD F("Arduino Lilypad")
42+
#elif defined(ARDUINO_AVR_LILYPAD_USB)
43+
#define BOARD F("Arduino Lilypad Usb")
44+
#elif defined(ARDUINO_AVR_MEGA)
45+
#define BOARD F("Arduino Mega")
46+
#elif defined(ARDUINO_AVR_MEGA2560)
47+
#define BOARD F("Arduino Mega 2560")
48+
#elif defined(ARDUINO_AVR_MICRO)
49+
#define BOARD F("Arduino Micro")
50+
#elif defined(ARDUINO_AVR_MINI)
51+
#define BOARD F("Arduino Mini")
52+
#elif defined(ARDUINO_AVR_NANO)
53+
#define BOARD F("Arduino Nano")
54+
#elif defined(ARDUINO_AVR_NG)
55+
#define BOARD F("Arduino NG")
56+
#elif defined(ARDUINO_AVR_PRO)
57+
#define BOARD F("Arduino Pro")
58+
#elif defined(ARDUINO_AVR_ROBOT_CONTROL)
59+
#define BOARD F("Arduino Robot Ctrl")
60+
#elif defined(ARDUINO_AVR_ROBOT_MOTOR)
61+
#define BOARD F("Arduino Robot Motor")
62+
#elif defined(ARDUINO_AVR_UNO)
63+
#define BOARD F("Arduino Uno")
64+
#elif defined(ARDUINO_AVR_YUN)
65+
#define BOARD F("Arduino Yun")
66+
67+
// These boards must be installed separately:
68+
#elif defined(ARDUINO_SAM_DUE)
69+
#define BOARD F("Arduino Due")
70+
#elif defined(ARDUINO_SAMD_ZERO)
71+
#define BOARD F("Arduino Zero")
72+
#elif defined(ARDUINO_ARC32_TOOLS)
73+
#define BOARD F("Arduino 101")
74+
#else
75+
#define BOARD F("Unknown Board")
76+
#endif
77+
#endif

0 commit comments

Comments
 (0)