andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

added more board profiles for ethernet

Browse Source
This commit is contained in:
proddy
2021-03-22 22:09:09 +01:00
parent fecfe9d791
commit c01c098f7e
4 changed files with 20173 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG_LATEST.md
View File

@@ -19,7 +19,7 @@
- RC300 `thermostat temp -1` to clear temporary setpoint in auto mode - RC300 `thermostat temp -1` to clear temporary setpoint in auto mode
- syslog port selectable (#744) - syslog port selectable (#744)
- individual mqtt commands (#31) - individual mqtt commands (#31)
- Board Profiles (#11) - board Profiles (#11)
### Fixed ### Fixed
- telegrams matched to masterthermostat 0x18 - telegrams matched to masterthermostat 0x18

20166
interface/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

11
interface/src/project/EMSESPSettingsForm.tsx
View File

@@ -103,11 +103,12 @@ class EMSESPSettingsForm extends React.Component<EMSESPSettingsFormProps> {
onChange={handleValueChange('board_profile')} onChange={handleValueChange('board_profile')}
margin="normal"> margin="normal">
<MenuItem value={1}>Gateway S32</MenuItem> <MenuItem value={1}>Gateway S32</MenuItem>
<MenuItem value={2}>Gateway E32 (LAN8720)</MenuItem> <MenuItem value={2}>NodeMCU 32S</MenuItem>
<MenuItem value={3}>NodeMCU 32S</MenuItem> <MenuItem value={3}>Lolin D32</MenuItem>
<MenuItem value={4}>Lolin D32</MenuItem> <MenuItem value={4}>Wemos Mini D1-32</MenuItem>
<MenuItem value={5}>Olimex ESP32 Gateway (LAN8720)</MenuItem> <MenuItem value={10}>Gateway E32 (LAN8720)</MenuItem>
<MenuItem value={6}>Ethernet (TLK110)</MenuItem> <MenuItem value={11}>Olimex ESP32-EVB-EA (LAN8720)</MenuItem>
<MenuItem value={12}>Ethernet (TLK110)</MenuItem>
<MenuItem value={0}>Custom...</MenuItem> <MenuItem value={0}>Custom...</MenuItem>
</SelectValidator> </SelectValidator>

26
src/system.cpp
View File

@@ -153,13 +153,13 @@ void System::syslog_init(bool refresh) {
// read all the settings from the config files and store locally // read all the settings from the config files and store locally
void System::get_settings() { void System::get_settings() {
EMSESP::webSettingsService.read([&](WebSettings & settings) { EMSESP::webSettingsService.read([&](WebSettings & settings) {
// BUTTON // Button
pbutton_gpio_ = settings.pbutton_gpio; pbutton_gpio_ = settings.pbutton_gpio;
// ADC // ADC
analog_enabled_ = settings.analog_enabled; analog_enabled_ = settings.analog_enabled;
// SYSLOG // Syslog
syslog_enabled_ = settings.syslog_enabled; syslog_enabled_ = settings.syslog_enabled;
syslog_level_ = settings.syslog_level; syslog_level_ = settings.syslog_level;
syslog_mark_interval_ = settings.syslog_mark_interval; syslog_mark_interval_ = settings.syslog_mark_interval;
@@ -170,7 +170,7 @@ void System::get_settings() {
hide_led_ = settings.hide_led; hide_led_ = settings.hide_led;
led_gpio_ = settings.led_gpio; led_gpio_ = settings.led_gpio;
// BOARD profile // Board profile
board_profile_ = settings.board_profile; board_profile_ = settings.board_profile;
}); });
@@ -452,9 +452,9 @@ void System::network_init(bool refresh) {
get_settings(); get_settings();
} }
// check ethernet profile // check board profile for those which use ethernet (id > 10)
// ethernet uses lots of additional memory so we only start it when it's explicitly set in the config // ethernet uses lots of additional memory so we only start it when it's explicitly set in the config
if (board_profile_ == 0) { if (board_profile_ < 10) {
return; return;
} }
@@ -465,16 +465,24 @@ void System::network_init(bool refresh) {
eth_phy_type_t type; // Type of the Ethernet PHY (LAN8720 or TLK110) eth_phy_type_t type; // Type of the Ethernet PHY (LAN8720 or TLK110)
eth_clock_mode_t clock_mode; // ETH_CLOCK_GPIO0_IN or ETH_CLOCK_GPIO0_OUT, ETH_CLOCK_GPIO16_OUT, ETH_CLOCK_GPIO17_OUT for 50Hz inverted clock eth_clock_mode_t clock_mode; // ETH_CLOCK_GPIO0_IN or ETH_CLOCK_GPIO0_OUT, ETH_CLOCK_GPIO16_OUT, ETH_CLOCK_GPIO17_OUT for 50Hz inverted clock
if (board_profile_ == 1) { if (board_profile_ == 10) {
// LAN8720 // Gateway E32 (LAN8720)
phy_addr = 1;
power = 16;
mdc = 23;
mdio = 18;
type = ETH_PHY_LAN8720;
clock_mode = ETH_CLOCK_GPIO0_IN;
} else if (board_profile_ == 11) {
// Olimex ESP32-EVB-EA (LAN8720)
phy_addr = 0; phy_addr = 0;
power = -1; power = -1;
mdc = 23; mdc = 23;
mdio = 18; mdio = 18;
type = ETH_PHY_LAN8720; type = ETH_PHY_LAN8720;
clock_mode = ETH_CLOCK_GPIO0_IN; clock_mode = ETH_CLOCK_GPIO0_IN;
} else if (board_profile_ == 2) { } else if (board_profile_ == 12) {
// TLK110 // Ethernet (TLK110)
phy_addr = 31; phy_addr = 31;
power = -1; power = -1;
mdc = 23; mdc = 23;