You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Benjamin Runnels 965b70a408 Merge branch 'master' into windows ... Conflicts: Makefile cmd/handlers.c esp-link/cgi.c esp-link/cgiwifi.c html/console.html html/style.css html/ui.js httpd/httpd.c mqtt/mqtt.c mqtt/mqtt.h mqtt/mqtt_cmd.c user/user_main.c		9 years ago
..
console.c	Fixed merge misses	9 years ago
console.h	added reset button and baud rate switching	10 years ago
crc16.c	incorporated tuanpmt's slip protocol and rest library	9 years ago
crc16.h	incorporated tuanpmt's slip protocol and rest library	9 years ago
serbridge.c	server-side handling of MQTT web page	9 years ago
serbridge.h	incorporated tuanpmt's slip protocol and rest library	9 years ago
serled.c	license update	10 years ago
serled.h	massive rework of MQTT	9 years ago
slip.c	server-side handling of MQTT web page	9 years ago
slip.h	server-side handling of MQTT web page	9 years ago
uart.c	Merge branch 'master' into windows	9 years ago
uart.h	incorporated tuanpmt's slip protocol and rest library	9 years ago