Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2026-01-30 06:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

add RSSI + disable equalizer when not needed - release

Browse Source
This commit is contained in:
Philippe G
2020-04-19 23:01:07 -07:00
parent e0e309c4ed
commit 014aa91fdd
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/squeezelite/embedded.c
View File

@@ -23,6 +23,7 @@
#include "esp_pthread.h" #include "esp_pthread.h"
#include "esp_system.h" #include "esp_system.h"
#include "esp_timer.h" #include "esp_timer.h"
#include "esp_wifi.h"
void get_mac(u8_t mac[]) { void get_mac(u8_t mac[]) {
esp_read_mac(mac, ESP_MAC_WIFI_STA); esp_read_mac(mac, ESP_MAC_WIFI_STA);
@@ -58,3 +59,11 @@ void embedded_init(void) {
sb_controls_init(); sb_controls_init();
if (sb_display_init()) custom_player_id = 100; if (sb_display_init()) custom_player_id = 100;
} }
u16_t get_RSSI(void) {
wifi_ap_record_t wifidata;
esp_wifi_sta_get_ap_info(&wifidata);
// we'll assume dBm, -30 to -100
if (wifidata.primary != 0) return 100 + wifidata.rssi + 30;
else return 0xffff;
}

3
components/squeezelite/embedded.h
View File

@@ -59,6 +59,9 @@ void register_external(void);
void deregister_external(void); void deregister_external(void);
void decode_restore(int external); void decode_restore(int external);
// must provide or define as 0xffff
u16_t get_RSSI(void);
// to be defined to nothing if you don't want to support these // to be defined to nothing if you don't want to support these
extern struct visu_export_s { extern struct visu_export_s {
pthread_mutex_t mutex; pthread_mutex_t mutex;

9
components/squeezelite/equalizer.c
View File

@@ -45,11 +45,18 @@ void equalizer_open(u32_t sample_rate) {
equalizer.update = false; equalizer.update = false;
if (equalizer.handle) { if (equalizer.handle) {
LOG_INFO("equalizer initialized"); bool active = false;
for (int i = 0; i < EQ_BANDS; i++) { for (int i = 0; i < EQ_BANDS; i++) {
esp_equalizer_set_band_value(equalizer.handle, equalizer.gain[i], i, 0); esp_equalizer_set_band_value(equalizer.handle, equalizer.gain[i], i, 0);
esp_equalizer_set_band_value(equalizer.handle, equalizer.gain[i], i, 1); esp_equalizer_set_band_value(equalizer.handle, equalizer.gain[i], i, 1);
active |= equalizer.gain[i] != 0;
} }
// do not activate equalizer if all gain are 0
if (!active) equalizer_close();
LOG_INFO("equalizer initialized %u", active);
} else { } else {
LOG_WARN("can't init equalizer"); LOG_WARN("can't init equalizer");
} }

4
components/squeezelite/slimproto.c
View File

@@ -183,7 +183,11 @@ static void sendSTAT(const char *event, u32_t server_timestamp) {
packN(&pkt.stream_buffer_size, status.stream_size); packN(&pkt.stream_buffer_size, status.stream_size);
packN(&pkt.bytes_received_H, (u64_t)status.stream_bytes >> 32); packN(&pkt.bytes_received_H, (u64_t)status.stream_bytes >> 32);
packN(&pkt.bytes_received_L, (u64_t)status.stream_bytes & 0xffffffff); packN(&pkt.bytes_received_L, (u64_t)status.stream_bytes & 0xffffffff);
#if EMBEDDED
packn(&pkt.signal_strength, get_RSSI());
#else
pkt.signal_strength = 0xffff; pkt.signal_strength = 0xffff;
#endif
packN(&pkt.jiffies, now); packN(&pkt.jiffies, now);
packN(&pkt.output_buffer_size, status.output_size); packN(&pkt.output_buffer_size, status.output_size);
packN(&pkt.output_buffer_fullness, status.output_full); packN(&pkt.output_buffer_fullness, status.output_full);