Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2026-01-27 12:50:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

add IR and "raw" button mode - release

Browse Source
This commit is contained in:
Philippe G
2020-05-09 18:07:26 -07:00
parent be00683b66
commit 5b6ddf0b02
15 changed files with 662 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
components/squeezelite/controls.c
View File

@@ -7,84 +7,225 @@
*/
#include "squeezelite.h"
#include "config.h"
#include "audio_controls.h"
static log_level loglevel = lINFO;
#define DOWN_OFS 0x10000
#define UP_OFS 0x20000
// numbers are simply 0..9
// arrow_right.down = 0001000e seems to be missing ...
enum { BUTN_POWER_FRONT = 0X0A, BUTN_ARROW_UP, BUTN_ARROW_DOWN, BUTN_ARROW_LEFT, BUTN_KNOB_PUSH, BUTN_SEARCH,
BUTN_REW, BUTN_FWD, BUTN_PLAY, BUTN_ADD, BUTN_BRIGHTNESS, BUTN_NOW_PLAYING,
BUTN_PAUSE = 0X17, BUTN_BROWSE, BUTN_VOLUP_FRONT, BUTN_VOLDOWN_FRONT, BUTN_SIZE, BUTN_VISUAL, BUTN_VOLUMEMODE,
BUTN_PRESET_1 = 0X23, BUTN_PRESET_2, BUTN_PRESET_3, BUTN_PRESET_4, BUTN_PRESET_5, BUTN_PRESET_6, BUTN_SNOOZE,
BUTN_KNOB_LEFT = 0X5A, BUTN_KNOB_RIGHT };
#define BUTN_ARROW_RIGHT BUTN_KNOB_PUSH
#pragma pack(push, 1)
struct BUTN_header {
char opcode[4];
u32_t length;
u32_t jiffies;
u32_t button;
};
struct IR_header {
char opcode[4];
u32_t length;
u32_t jiffies;
u8_t format; // unused
u8_t bits; // unused
u32_t code;
};
#pragma pack(pop)
static in_addr_t server_ip;
static u16_t server_hport;
static u16_t server_cport;
static u8_t mac[6];
static void (*chained_notify)(in_addr_t, u16_t, u16_t);
static bool raw_mode;
static void cli_send_cmd(char *cmd);
static void lms_volume_up(void) {
cli_send_cmd("button volup");
/****************************************************************************************
* Send BUTN
*/
static void sendBUTN(int code, bool pressed) {
struct BUTN_header pkt_header;
memset(&pkt_header, 0, sizeof(pkt_header));
memcpy(&pkt_header.opcode, "BUTN", 4);
pkt_header.length = htonl(sizeof(pkt_header) - 8);
pkt_header.jiffies = htonl(gettime_ms());
pkt_header.button = htonl(code + (pressed ? DOWN_OFS : UP_OFS));
LOG_INFO("sending BUTN code %04x %s", code, pressed ? "down" : "up");
LOCK_P;
send_packet((uint8_t *) &pkt_header, sizeof(pkt_header));
UNLOCK_P;
}
static void lms_volume_down(void) {
cli_send_cmd("button voldown");
/****************************************************************************************
* Send IR
*/
static void sendIR(u16_t addr, u16_t cmd) {
struct IR_header pkt_header;
memset(&pkt_header, 0, sizeof(pkt_header));
memcpy(&pkt_header.opcode, "IR ", 4);
pkt_header.length = htonl(sizeof(pkt_header) - 8);
pkt_header.jiffies = htonl(gettime_ms());
pkt_header.format = pkt_header.bits = 0;
pkt_header.code = htonl((addr << 16) | cmd);
LOG_INFO("sending IR code %04x", (addr << 16) | cmd);
LOCK_P;
send_packet((uint8_t *) &pkt_header, sizeof(pkt_header));
UNLOCK_P;
}
static void lms_toggle(void) {
cli_send_cmd("pause");
static void lms_volume_up(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_VOLUP_FRONT, pressed);
} else {
cli_send_cmd("button volup");
}
}
static void lms_pause(void) {
cli_send_cmd("pause 1");
static void lms_volume_down(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_VOLDOWN_FRONT, pressed);
} else {
cli_send_cmd("button voldown");
}
}
static void lms_play(void) {
cli_send_cmd("button play.single");
static void lms_toggle(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_PAUSE, pressed);
} else {
cli_send_cmd("pause");
}
}
static void lms_stop(void) {
static void lms_pause(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_PAUSE, pressed);
} else {
cli_send_cmd("pause 1");
}
}
static void lms_play(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_PLAY, pressed);
} else {
cli_send_cmd("button play.single");
}
}
static void lms_stop(bool pressed) {
cli_send_cmd("button stop");
}
static void lms_rew(void) {
cli_send_cmd("button rew.repeat");
static void lms_rew(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_REW, pressed);
} else {
cli_send_cmd("button rew.repeat");
}
}
static void lms_fwd(void) {
cli_send_cmd("button fwd.repeat");
static void lms_fwd(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_FWD, pressed);
} else {
cli_send_cmd("button fwd.repeat");
}
}
static void lms_prev(void) {
cli_send_cmd("button rew");
static void lms_prev(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_REW, pressed);
} else {
cli_send_cmd("button rew");
}
}
static void lms_next(void) {
cli_send_cmd("button fwd");
static void lms_next(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_FWD, pressed);
} else {
cli_send_cmd("button fwd");
}
}
static void lms_up(void) {
cli_send_cmd("button arrow_up");
static void lms_up(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_ARROW_UP, pressed);
} else {
cli_send_cmd("button arrow_up");
}
}
static void lms_down(void) {
cli_send_cmd("button arrow_down");
static void lms_down(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_ARROW_DOWN, pressed);
} else {
cli_send_cmd("button arrow_down");
}
}
static void lms_left(void) {
cli_send_cmd("button arrow_left");
static void lms_left(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_ARROW_LEFT, pressed);
} else {
cli_send_cmd("button arrow_left");
}
}
static void lms_right(void) {
cli_send_cmd("button arrow_right");
static void lms_right(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_ARROW_RIGHT, pressed);
} else {
cli_send_cmd("button arrow_right");
}
}
static void lms_knob_left(void) {
cli_send_cmd("button knob_left");
static void lms_knob_left(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_KNOB_LEFT, pressed);
} else {
cli_send_cmd("button knob_left");
}
}
static void lms_knob_right(void) {
cli_send_cmd("button knob_right");
static void lms_knob_right(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_KNOB_RIGHT, pressed);
} else {
cli_send_cmd("button knob_right");
}
}
static void lms_knob_push(void) {
cli_send_cmd("button knob_push");
static void lms_knob_push(bool pressed) {
if (raw_mode) {
sendBUTN(BUTN_KNOB_PUSH, pressed);
} else {
cli_send_cmd("button knob_push");
}
}
const actrls_t LMS_controls = {
@@ -137,13 +278,27 @@ static void notify(in_addr_t ip, u16_t hport, u16_t cport) {
if (chained_notify) (*chained_notify)(ip, hport, cport);
}
/****************************************************************************************
* IR handler
*/
static bool ir_handler(u16_t addr, u16_t cmd) {
sendIR(addr, cmd);
return true;
}
/****************************************************************************************
* Initialize controls - shall be called once from output_init_embedded
*/
void sb_controls_init(void) {
LOG_INFO("initializing CLI controls");
char *p = config_alloc_get_default(NVS_TYPE_STR, "lms_ctrls_raw", "n", 0);
raw_mode = p && (*p == '1' || *p == 'Y' || *p == 'y');
free(p);
LOG_INFO("initializing audio (buttons/rotary/ir) controls (raw:%u)", raw_mode);
get_mac(mac);
actrls_set_default(LMS_controls, NULL);
actrls_set_default(LMS_controls, raw_mode, NULL, ir_handler);
chained_notify = server_notify;
server_notify = notify;
}