mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix compile 

# Conflicts:
#	protobufs
pull/2051/head
Thomas Göttgens 2022-11-29 17:45:57 +01:00
rodzic 8cbf292373
commit 8b58eaac20
3 zmienionych plików z 11 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/mesh/generated/localonly.pb.h
Wyświetl plik

@ -151,7 +151,7 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
/* Maximum encoded size of messages (where known) */
#define LocalConfig_size 387
#define LocalModuleConfig_size 385
#define LocalModuleConfig_size 364
#ifdef __cplusplus
} /* extern "C" */

16
src/mesh/generated/module_config.pb.h
Wyświetl plik

@ -63,14 +63,14 @@ typedef enum _ModuleConfig_CannedMessageConfig_InputEventChar {
/* Struct definitions */
typedef struct _ModuleConfig_AudioConfig {
bool codec2_enabled;
uint32_t mic_chan;
uint32_t amp_pin;
uint32_t ptt_pin;
uint8_t mic_chan;
uint8_t amp_pin;
uint8_t ptt_pin;
ModuleConfig_AudioConfig_Audio_Baud bitrate;
uint32_t i2s_ws;
uint32_t i2s_sd;
uint32_t i2s_din;
uint32_t i2s_sck;
uint8_t i2s_ws;
uint8_t i2s_sd;
uint8_t i2s_din;
uint8_t i2s_sck;
} ModuleConfig_AudioConfig;
typedef struct _ModuleConfig_CannedMessageConfig {
@ -395,7 +395,7 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg;
#define ModuleConfig_CannedMessageConfig_fields &ModuleConfig_CannedMessageConfig_msg
/* Maximum encoded size of messages (where known) */
#define ModuleConfig_AudioConfig_size 46
#define ModuleConfig_AudioConfig_size 25
#define ModuleConfig_CannedMessageConfig_size 49
#define ModuleConfig_ExternalNotificationConfig_size 22
#define ModuleConfig_MQTTConfig_size 169

4
src/modules/esp32/AudioModule.cpp
Wyświetl plik

@ -116,7 +116,7 @@ IRAM_ATTR void am_onTimer()
if (xHigherPriorityTaskWoken)
portYIELD_FROM_ISR();
}
} else if ((radio_state == RadioState::rx) && (!moduleConfig.audio.i2s_din) {
} else if ((radio_state == RadioState::rx) && (!moduleConfig.audio.i2s_din)) {
// ESP32-S3 does not have DAC support
#if !defined(CONFIG_IDF_TARGET_ESP32S3)
int16_t v;
@ -197,7 +197,7 @@ int32_t AudioModule::runOnce()
.sample_rate = 8000,
.bits_per_sample = I2S_BITS_PER_SAMPLE_16BIT,
.channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT,
.communication_format = (i2s_comm_format_t)(I2S_COMM_FORMAT_I2S | I2S_COMM_FORMAT_I2S_MSB),
.communication_format = (i2s_comm_format_t)(I2S_COMM_FORMAT_STAND_I2S),
.intr_alloc_flags = 0,
.dma_buf_count = 8,
.dma_buf_len = ADC_BUFFER_SIZE,