Skip to content

Commit 7b1dd05

Browse files
budulinekbudulinek
authored
Merge pull request #36 from scabrero/master
Some minor fixes
2 parents fa56b12 + b26645b commit 7b1dd05

File tree

6 files changed

+97
-96
lines changed

6 files changed

+97
-96
lines changed

‎.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
.cache
22
.pio
3-
.vscode/.browse.c_cpp.db*
4-
.vscode/c_cpp_properties.json
5-
.vscode/launch.json
6-
.vscode/ipch
3+
.vscode

‎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/05-pages.ino

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void contentInfo(ChunkedPrint &chunked) {
195195
chunked.print(F("."));
196196
chunked.print(VERSION[1]);
197197
tagDivClose(chunked);
198-
tagLabelDiv(chunked, F("Microcontroller"));
198+
tagLabelDiv(chunked, F("Board"));
199199
chunked.print(BOARD);
200200
tagDivClose(chunked);
201201
tagLabelDiv(chunked, F("EEPROM Health"));
@@ -243,16 +243,6 @@ void contentInfo(ChunkedPrint &chunked) {
243243
tagLabelDiv(chunked, F("IP Address"));
244244
chunked.print(IPAddress(Ethernet.localIP()));
245245
tagDivClose(chunked);
246-
}
247-
248-
/**************************************************************************/
249-
/*!
250-
@brief P1P2 Status
251-
252-
@param chunked Chunked buffer
253-
*/
254-
/**************************************************************************/
255-
void contentStatus(ChunkedPrint &chunked) {
256246

257247
#ifdef ENABLE_EXTENDED_WEBUI
258248
tagLabelDiv(chunked, F("Run Time"));
@@ -264,8 +254,17 @@ void contentStatus(ChunkedPrint &chunked) {
264254
tagLabelDiv(chunked, F("Ethernet Data"));
265255
tagSpan(chunked, JSON_ETH_DATA);
266256
tagDivClose(chunked);
267-
#endif /* ENABLE_EXTENDED_WEBUI */
257+
#endif
258+
}
259+
260+
/**************************************************************************/
261+
/*!
262+
@brief P1P2 Status
268263
264+
@param chunked Chunked buffer
265+
*/
266+
/**************************************************************************/
267+
void contentStatus(ChunkedPrint &chunked) {
269268
tagLabelDiv(chunked, F("Modbus RTU Request"));
270269
for (byte i = 0; i <= POST_REQ_LAST - POST_REQ; i++) {
271270
bool required = false;

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

Lines changed: 3 additions & 1 deletion
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
@@ -66,7 +68,7 @@ const byte SCAN_DATA_ADDRESS = 0x01; // Data address sent during Modbus RTU
6668
const uint16_t SCAN_TIMEOUT = 200; // Timeout (ms) for Modbus scan requests
6769

6870
const byte MAC_START[3] = { 0x90, 0xA2, 0xDA }; // MAC range for Gheo SA
69-
#define ETH_RESET_PIN 7 // Ethernet shield reset pin (deals with power on reset issue on low quality ethernet shields) \
71+
#define ETH_RESET_PIN 7 // Ethernet shield reset pin (deals with power on reset issue on low quality ethernet shields)
7072
// Comment out to disable the functionality
7173
const uint16_t CHECK_ETH_INTERVAL = 2000; // Interval (ms) to check SPI connection with ethernet shield
7274
const uint16_t ETH_RESET_DELAY = 500; // Delay (ms) during Ethernet start, wait for Ethernet shield to start (reset issue on low quality ethernet shields)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,10 @@ typedef struct {
4848
byte ip[4];
4949
byte subnet[4];
5050
byte gateway[4];
51+
#ifdef ENABLE_DHCP
5152
byte dns[4]; // only used if ENABLE_DHCP
5253
bool enableDhcp; // only used if ENABLE_DHCP
54+
#endif
5355
uint16_t tcpPort;
5456
uint16_t udpPort;
5557
uint16_t webPort;
@@ -62,14 +64,14 @@ typedef struct {
6264
byte serialAttempts;
6365
} config_t;
6466

65-
#include "advanced_settings.h"
66-
6767
const config_t DEFAULT_CONFIG = {
6868
DEFAULT_STATIC_IP,
6969
DEFAULT_SUBMASK,
7070
DEFAULT_GATEWAY,
71+
#ifdef ENABLE_DHCP
7172
DEFAULT_DNS,
7273
DEFAULT_AUTO_IP,
74+
#endif
7375
DEFAULT_TCP_PORT,
7476
DEFAULT_UDP_PORT,
7577
DEFAULT_WEB_PORT,

‎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)