Merge pull request #91 from fl1pfl0p/master

Bugfix: RX pullup checkbox in GUI fixed
pull/95/head
Thorsten von Eicken 9 years ago
commit b2e8023089
  1. 2
      esp-link/cgipins.c
  2. 2
      html/ui.js

@ -34,7 +34,7 @@ int ICACHE_FLASH_ATTR cgiPinsGet(HttpdConnData *connData) {
len = os_sprintf(buff, len = os_sprintf(buff,
"{ \"reset\":%d, \"isp\":%d, \"conn\":%d, \"ser\":%d, \"swap\":%d, \"rxpup\":%d }", "{ \"reset\":%d, \"isp\":%d, \"conn\":%d, \"ser\":%d, \"swap\":%d, \"rxpup\":%d }",
flashConfig.reset_pin, flashConfig.isp_pin, flashConfig.conn_led_pin, flashConfig.reset_pin, flashConfig.isp_pin, flashConfig.conn_led_pin,
flashConfig.ser_led_pin, !!flashConfig.swap_uart, 1); flashConfig.ser_led_pin, !!flashConfig.swap_uart, !!flashConfig.rx_pullup);
jsonHeader(connData, 200); jsonHeader(connData, 200);
httpdSend(connData, buff, len); httpdSend(connData, buff, len);

@ -473,7 +473,7 @@ function setPins(ev) {
url += sep + p + "=" + $("#pin-"+p).value; url += sep + p + "=" + $("#pin-"+p).value;
sep = "&"; sep = "&";
}); });
url += "&rxpup=" + ($("#pin-rxpup").selected ? "1" : "0"); url += "&rxpup=" + ($("#pin-rxpup").checked ? "1" : "0");
// console.log("set pins: " + url); // console.log("set pins: " + url);
ajaxSpin("POST", url, function() { ajaxSpin("POST", url, function() {
showNotification("Pin assignment changed"); showNotification("Pin assignment changed");

Loading…
Cancel
Save