Dreaded_X/car-stereo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some small tweaks

Browse Source
This commit is contained in:
Dreaded_X 2022-06-15 19:07:37 +02:00
parent d05f767827
commit 097814ea25
5 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
software/main/include/can_data.h
View File

@ -62,12 +62,8 @@ namespace can {
#pragma pack(1) #pragma pack(1)
struct Volume { struct Volume {
uint8_t _upper : 3;
uint8_t volume : 5; uint8_t volume : 5;
uint8_t _1 : 3;
bool scrolled() {
return _upper == 0b000;
}
}; };
#pragma pack() #pragma pack()
} }

6
software/main/src/avrcp.cpp
View File

@ -178,8 +178,14 @@ void avrcp::backward() {
} }
void avrcp::set_volume(uint8_t v) { void avrcp::set_volume(uint8_t v) {
// Make sure the volume is actually changed
if (v == volume) {
return;
}
set_volume_value(v); set_volume_value(v);
// @TODO What we the device supports remote volume but we can not send it yet?
if (volume_notify) { if (volume_notify) {
ESP_LOGI(AVRCP_TAG, "Setting remote volume value to %i", v); ESP_LOGI(AVRCP_TAG, "Setting remote volume value to %i", v);
esp_avrc_rn_param_t rn_param; esp_avrc_rn_param_t rn_param;

42
software/main/src/can.cpp
View File

@ -324,10 +324,10 @@ static void read_can_msg(spi_device_handle_t spi, uint8_t buffer_load_addr, unsi
{ {
spi_transaction_t t; spi_transaction_t t;
memset(&t, 0, sizeof(t)); memset(&t, 0, sizeof(t));
t.length = 8*5; t.length = 8*(5 + 8);
uint8_t data[5]; uint8_t data[5 + 8];
t.rx_buffer = data; t.rx_buffer = data;
t.flags = SPI_TRANS_CS_KEEP_ACTIVE; /* t.flags = SPI_TRANS_CS_KEEP_ACTIVE; */
ret = spi_device_polling_transmit(spi, &t); ret = spi_device_polling_transmit(spi, &t);
ESP_ERROR_CHECK(ret); ESP_ERROR_CHECK(ret);
@ -347,18 +347,23 @@ static void read_can_msg(spi_device_handle_t spi, uint8_t buffer_load_addr, unsi
// @TODO Do we need this in our application // @TODO Do we need this in our application
*rtr_bit = (data[0] & MCP_RTR_MASK) ? 1 : 0; *rtr_bit = (data[0] & MCP_RTR_MASK) ? 1 : 0;
// Copy the data into the buffer
for (int i = 0; i < *len; ++i) {
buf[i] = data[5 + i];
}
} }
// Read the data // Read the data
{ /* { */
spi_transaction_t t; /* spi_transaction_t t; */
memset(&t, 0, sizeof(t)); /* memset(&t, 0, sizeof(t)); */
t.length = 8*(*len); /* t.length = 8*(*len); */
t.rx_buffer = buf; /* t.rx_buffer = buf; */
ret = spi_device_polling_transmit(spi, &t); /* ret = spi_device_polling_transmit(spi, &t); */
ESP_ERROR_CHECK(ret); /* ESP_ERROR_CHECK(ret); */
} /* } */
// Make sure we release the bus // Make sure we release the bus
spi_device_release_bus(spi); spi_device_release_bus(spi);
@ -471,9 +476,7 @@ static void read_message(spi_device_handle_t spi) {
button_backward.tick(buttons.backward); button_backward.tick(buttons.backward);
} else if (id == VOLUME_ID) { } else if (id == VOLUME_ID) {
can::Volume volume = *(can::Volume*)buf; can::Volume volume = *(can::Volume*)buf;
if (volume.scrolled()) { avrcp::set_volume(ceil(volume.volume * 4.2f));
avrcp::set_volume(ceil(volume.volume * 4.2f));
}
} }
} }
@ -504,7 +507,7 @@ void can::init() {
ESP_LOGI(CAN_TAG, "Adding device"); ESP_LOGI(CAN_TAG, "Adding device");
spi_device_interface_config_t devcfg = { spi_device_interface_config_t devcfg = {
.mode=0, .mode=0,
.clock_speed_hz=10*1000*1000, .clock_speed_hz=20*1000*1000,
.spics_io_num=PIN_NUM_CS, .spics_io_num=PIN_NUM_CS,
.queue_size=7, .queue_size=7,
}; };
@ -540,9 +543,12 @@ void can::init() {
write_id(*spi, MCP_RXM1SIDH, 0, 0x3ff); write_id(*spi, MCP_RXM1SIDH, 0, 0x3ff);
ESP_LOGI(CAN_TAG, "Init filter"); ESP_LOGI(CAN_TAG, "Init filter");
/* write_id(*spi, MCP_RXF0SIDH, 0, 0x165); */ // @TODO WATCH OUT FOR ADDRESS
write_id(*spi, MCP_RXF1SIDH, 0, 0x1a5); /* write_id(*spi, MCP_RXF0SIDH, 0, RADIO_ID); */
write_id(*spi, MCP_RXF1SIDH, 0, 0x21f); /* write_id(*spi, MCP_RXF0SIDH, 0, VOLUME_ID); */
write_id(*spi, MCP_RXF1SIDH, 0, BUTTONS_ID);
write_id(*spi, MCP_RXF0SIDH, 0, 0);
ESP_LOGI(CAN_TAG, "Enter normal mode"); ESP_LOGI(CAN_TAG, "Enter normal mode");
set_CANCTRL_mode(*spi, MODE_NORMAL); set_CANCTRL_mode(*spi, MODE_NORMAL);

1
software/main/src/helper.cpp
View File

@ -15,6 +15,7 @@ const char* connection_state_to_str(esp_a2d_connection_state_t state) {
MultiPurposeButton::MultiPurposeButton(void(*short_press)(), void(*long_press)(), uint8_t threshold) : short_press(short_press), long_press(long_press), threshold(threshold) {} MultiPurposeButton::MultiPurposeButton(void(*short_press)(), void(*long_press)(), uint8_t threshold) : short_press(short_press), long_press(long_press), threshold(threshold) {}
// @TOOD Use a timer instead of amount of updates as this can be inconsistent (e.g. when in eco mode)
void MultiPurposeButton::tick(bool current) { void MultiPurposeButton::tick(bool current) {
if (current && !acted) { if (current && !acted) {
if (counter >= threshold) { if (counter >= threshold) {

2
software/main/src/main.cpp
View File

@ -45,6 +45,6 @@ extern "C" void app_main() {
/* xTaskCreate(task, "Task", 2048, nullptr, 0, nullptr); */ /* xTaskCreate(task, "Task", 2048, nullptr, 0, nullptr); */
/* can::init(); */ can::init();
} }