Merge remote-tracking branch 'origin/master' into httpd

Conflicts:
	components/services/monitor.c
	components/telnet/telnet.c
This commit is contained in:
sebastien
2020-02-05 21:05:09 -05:00
22 changed files with 2005 additions and 143 deletions

View File

@@ -77,6 +77,8 @@ const static actrls_t controls = {
raop_pause, raop_stop, // pause, stop
NULL, NULL, // rew, fwd
raop_prev, raop_next, // prev, next
NULL, NULL, NULL, NULL, // left, right, up, down
raop_volume_down, raop_volume_up, raop_toggle// knob left, knob_right, knob push
};
/****************************************************************************************