Merge branch 'master' of https://github.com/jeelabs/esp-link into TvEmaster

* 'master' of https://github.com/jeelabs/esp-link:
  Bugfix: RX pullup checkbox in GUI fixed

esp-link/cgipins.c

@@ -34,7 +34,7 @@ int ICACHE_FLASH_ATTR cgiPinsGet(HttpdConnData *connData) {
   len = os_sprintf(buff,
       "{ \"reset\":%d, \"isp\":%d, \"conn\":%d, \"ser\":%d, \"swap\":%d, \"rxpup\":%d }",
       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);
   httpdSend(connData, buff, len);

html/ui.js

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