Skip to content

Fixed compilation errors with core 2.6.3 or above #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed compilation errors with core 2.6.3 or above #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/espDMX_RDM/espDMX_RDM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ void espDMX::begin(uint8_t dir, byte* buf) {
_dmx->ownBuffer = 0;

system_set_os_print(0);
ets_install_putc1((void *) &uart_ignore_char);
ets_install_putc1(&uart_ignore_char);

// Initialize variables
_dmx->dmx_nr = _dmx_nr;
Expand Down
3 changes: 1 addition & 2 deletions source/ajax.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ bool ajaxSave(uint8_t page, JsonObject& json) {
deviceSettings.ip = IPAddress(json["ipAddress"][0],json["ipAddress"][1],json["ipAddress"][2],json["ipAddress"][3]);
deviceSettings.subnet = IPAddress(json["subAddress"][0],json["subAddress"][1],json["subAddress"][2],json["subAddress"][3]);
deviceSettings.gateway = IPAddress(json["gwAddress"][0],json["gwAddress"][1],json["gwAddress"][2],json["gwAddress"][3]);
deviceSettings.broadcast = deviceSettings.ip | (~deviceSettings.subnet);
deviceSettings.broadcast = uint32_t(deviceSettings.ip) | (~uint32_t(deviceSettings.subnet));
//deviceSettings.broadcast = {~deviceSettings.subnet[0] | (deviceSettings.ip[0] & deviceSettings.subnet[0]), ~deviceSettings.subnet[1] | (deviceSettings.ip[1] & deviceSettings.subnet[1]), ~deviceSettings.subnet[2] | (deviceSettings.ip[2] & deviceSettings.subnet[2]), ~deviceSettings.subnet[3] | (deviceSettings.ip[3] & deviceSettings.subnet[3])};

json.get<String>("nodeName").toCharArray(deviceSettings.nodeName, 18);
Expand Down Expand Up @@ -741,4 +741,3 @@ void ajaxLoad(uint8_t page, JsonObject& jsonReply) {
jsonReply["message"] = "Invalid or incomplete data received.";
}
}