feat(radio): OS compatibility layer (#5840)
This commit is contained in:
@@ -7,7 +7,6 @@ endif()
|
||||
|
||||
set(SIMU_DRIVERS
|
||||
simpgmspace.cpp
|
||||
simueeprom.cpp
|
||||
simufatfs.cpp
|
||||
simudisk.cpp
|
||||
simulcd.cpp
|
||||
@@ -186,7 +185,7 @@ if(FOX_FOUND)
|
||||
|
||||
target_include_directories(simu PUBLIC ${FOX_INCLUDE_DIR} )
|
||||
target_link_libraries(simu ${FOX_LIBRARY} pthread ${SDL2_LIBRARIES})
|
||||
target_compile_options(simu PRIVATE -DSIMU)
|
||||
target_compile_options(simu PRIVATE ${SIMU_SRC_OPTIONS})
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
|
||||
#include "hal/adc_driver.h"
|
||||
#include "hal/rotary_encoder.h"
|
||||
#include "os/time.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QElapsedTimer>
|
||||
@@ -282,9 +283,9 @@ void OpenTxSimulator::start(const char * filename, bool tests)
|
||||
|
||||
QMutexLocker lckr(&m_mtxSimuMain);
|
||||
QMutexLocker slckr(&m_mtxSettings);
|
||||
startEepromThread(filename);
|
||||
startAudioThread(volumeGain);
|
||||
simuStart(tests, simuSdDirectory.toLatin1().constData(), simuSettingsDirectory.toLatin1().constData());
|
||||
startAudio(volumeGain);
|
||||
simuStart(tests, simuSdDirectory.toLatin1().constData(),
|
||||
simuSettingsDirectory.toLatin1().constData());
|
||||
|
||||
emit started();
|
||||
QTimer::singleShot(0, this, SLOT(run())); // old style for Qt < 5.4
|
||||
@@ -300,8 +301,6 @@ void OpenTxSimulator::stop()
|
||||
|
||||
QMutexLocker lckr(&m_mtxSimuMain);
|
||||
simuStop();
|
||||
stopAudioThread();
|
||||
stopEepromThread();
|
||||
|
||||
emit stopped();
|
||||
}
|
||||
@@ -321,20 +320,20 @@ void OpenTxSimulator::setVolumeGain(const int value)
|
||||
|
||||
void OpenTxSimulator::setRadioData(const QByteArray & data)
|
||||
{
|
||||
#if defined(EEPROM_SIZE)
|
||||
QMutexLocker lckr(&m_mtxRadioData);
|
||||
eeprom = (uint8_t *)malloc(qMin<int>(EEPROM_SIZE, data.size()));
|
||||
memcpy(eeprom, data.data(), qMin<int>(EEPROM_SIZE, data.size()));
|
||||
#endif
|
||||
// #if defined(EEPROM_SIZE)
|
||||
// QMutexLocker lckr(&m_mtxRadioData);
|
||||
// eeprom = (uint8_t *)malloc(qMin<int>(EEPROM_SIZE, data.size()));
|
||||
// memcpy(eeprom, data.data(), qMin<int>(EEPROM_SIZE, data.size()));
|
||||
// #endif
|
||||
}
|
||||
|
||||
void OpenTxSimulator::readRadioData(QByteArray & dest)
|
||||
{
|
||||
#if defined(EEPROM_SIZE)
|
||||
QMutexLocker lckr(&m_mtxRadioData);
|
||||
if (eeprom)
|
||||
memcpy(dest.data(), eeprom, qMin<int>(EEPROM_SIZE, dest.size()));
|
||||
#endif
|
||||
// #if defined(EEPROM_SIZE)
|
||||
// QMutexLocker lckr(&m_mtxRadioData);
|
||||
// if (eeprom)
|
||||
// memcpy(dest.data(), eeprom, qMin<int>(EEPROM_SIZE, dest.size()));
|
||||
// #endif
|
||||
}
|
||||
|
||||
uint8_t * OpenTxSimulator::getLcd()
|
||||
@@ -428,7 +427,7 @@ void OpenTxSimulator::rotaryEncoderEvent(int steps)
|
||||
steps *= -1;
|
||||
rotencValue += steps * ROTARY_ENCODER_GRANULARITY;
|
||||
// TODO: set rotencDt
|
||||
uint32_t now = RTOS_GET_MS();
|
||||
uint32_t now = time_get_ms();
|
||||
uint32_t dt = now - last_tick;
|
||||
rotencDt += dt;
|
||||
last_tick = now;
|
||||
@@ -771,8 +770,6 @@ void OpenTxSimulator::run()
|
||||
|
||||
++loops;
|
||||
|
||||
per10ms();
|
||||
|
||||
checkLcdChanged();
|
||||
|
||||
if (!(loops % 5)) {
|
||||
|
||||
@@ -34,6 +34,9 @@
|
||||
#include "hal/usb_driver.h"
|
||||
#include "hal/audio_driver.h"
|
||||
|
||||
#include "os/task.h"
|
||||
#include "os/timer_pthread_impl.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdarg.h>
|
||||
#include <string>
|
||||
@@ -211,6 +214,7 @@ void simuStart(bool tests, const char * sdPath, const char * settingsPath)
|
||||
lcdInit();
|
||||
|
||||
#if !defined(SIMU_BOOTLOADER)
|
||||
timer_queue::instance().start();
|
||||
simuMain();
|
||||
#else
|
||||
pthread_attr_t attr;
|
||||
@@ -232,8 +236,8 @@ void simuStart(bool tests, const char * sdPath, const char * settingsPath)
|
||||
#endif
|
||||
}
|
||||
|
||||
extern RTOS_TASK_HANDLE mixerTaskId;
|
||||
extern RTOS_TASK_HANDLE menusTaskId;
|
||||
extern task_handle_t mixerTaskId;
|
||||
extern task_handle_t menusTaskId;
|
||||
|
||||
void simuStop()
|
||||
{
|
||||
@@ -242,8 +246,12 @@ void simuStop()
|
||||
|
||||
simu_shutdown = true;
|
||||
|
||||
pthread_join(mixerTaskId, nullptr);
|
||||
pthread_join(menusTaskId, nullptr);
|
||||
pthread_join(mixerTaskId._thread_handle, nullptr);
|
||||
pthread_join(menusTaskId._thread_handle, nullptr);
|
||||
|
||||
#if defined(SIMU_AUDIO)
|
||||
stopAudio();
|
||||
#endif
|
||||
|
||||
simu_running = false;
|
||||
}
|
||||
@@ -253,8 +261,6 @@ struct SimulatorAudio {
|
||||
int currentVolume;
|
||||
int16_t leftoverData[AUDIO_BUFFER_SIZE];
|
||||
int leftoverLen;
|
||||
bool threadRunning;
|
||||
pthread_t threadPid;
|
||||
} simuAudio;
|
||||
|
||||
bool simuIsRunning()
|
||||
@@ -264,10 +270,9 @@ bool simuIsRunning()
|
||||
|
||||
uint8_t simuSleep(uint32_t ms)
|
||||
{
|
||||
for (uint32_t i = 0; i < ms; ++i){
|
||||
if (simu_shutdown || !simu_running)
|
||||
return 1;
|
||||
sleep(1);
|
||||
for (uint32_t i = 0; i < ms; i++) {
|
||||
if (simu_shutdown || !simu_running) return 1;
|
||||
usleep(1);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -336,77 +341,44 @@ void fillAudioBuffer(void *udata, Uint8 *stream, int len)
|
||||
}
|
||||
}
|
||||
|
||||
//fill the rest of buffer with silence
|
||||
// fill the rest of buffer with silence
|
||||
if (len > 0) {
|
||||
SDL_memset(stream, 0x8000, len); // make sure this is silence.
|
||||
// putchar('.');
|
||||
}
|
||||
}
|
||||
|
||||
void * audioThread(void *)
|
||||
int startAudio(int volumeGain)
|
||||
{
|
||||
/*
|
||||
Checking here if SDL audio was initialized is wrong, because
|
||||
the SDL_CloseAudio() de-initializes it.
|
||||
simuAudio = {
|
||||
.volumeGain = volumeGain,
|
||||
.leftoverLen = 0,
|
||||
};
|
||||
|
||||
if ( !SDL_WasInit(SDL_INIT_AUDIO) ) {
|
||||
fprintf(stderr, "ERROR: couldn't initialize SDL audio support\n");
|
||||
return 0;
|
||||
}
|
||||
*/
|
||||
|
||||
SDL_AudioSpec wanted, have;
|
||||
|
||||
/* Set the audio format */
|
||||
wanted.freq = AUDIO_SAMPLE_RATE;
|
||||
wanted.format = AUDIO_S16SYS;
|
||||
wanted.channels = 1; /* 1 = mono, 2 = stereo */
|
||||
wanted.samples =
|
||||
AUDIO_BUFFER_SIZE * 2; /* Good low-latency value for callback */
|
||||
wanted.callback = fillAudioBuffer;
|
||||
wanted.userdata = nullptr;
|
||||
|
||||
/*
|
||||
SDL_OpenAudio() internally calls SDL_InitSubSystem(SDL_INIT_AUDIO),
|
||||
which initializes SDL Audio subsystem if necessary
|
||||
*/
|
||||
if ( SDL_OpenAudio(&wanted, &have) < 0 ) {
|
||||
fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
|
||||
return nullptr;
|
||||
}
|
||||
SDL_PauseAudio(0);
|
||||
|
||||
while (simuAudio.threadRunning) {
|
||||
audioQueue.wakeup();
|
||||
sleep(1);
|
||||
}
|
||||
SDL_CloseAudio();
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void startAudioThread(int volumeGain)
|
||||
{
|
||||
simuAudio.leftoverLen = 0;
|
||||
simuAudio.threadRunning = true;
|
||||
simuAudio.volumeGain = volumeGain;
|
||||
TRACE_SIMPGMSPACE("startAudioThread(%d)", volumeGain);
|
||||
TRACE("startAudioThread(%d)", volumeGain);
|
||||
audioSetVolume(VOLUME_LEVEL_DEF);
|
||||
|
||||
pthread_attr_t attr;
|
||||
pthread_attr_init(&attr);
|
||||
struct sched_param sp;
|
||||
sp.sched_priority = SCHED_RR;
|
||||
pthread_attr_setschedparam(&attr, &sp);
|
||||
pthread_create(&simuAudio.threadPid, &attr, &audioThread, nullptr);
|
||||
#ifdef __linux__
|
||||
pthread_setname_np(simuAudio.threadPid, "audio");
|
||||
#endif
|
||||
/* Set the audio format */
|
||||
SDL_AudioSpec desired = {
|
||||
.freq = AUDIO_SAMPLE_RATE,
|
||||
.format = AUDIO_S16SYS,
|
||||
.channels = 1,
|
||||
.samples = AUDIO_BUFFER_SIZE * 2,
|
||||
.callback = fillAudioBuffer,
|
||||
.userdata = nullptr,
|
||||
};
|
||||
|
||||
SDL_AudioSpec obtained;
|
||||
if ( SDL_OpenAudio(&desired, &obtained) < 0 ) {
|
||||
fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
|
||||
return -1;
|
||||
}
|
||||
SDL_PauseAudio(0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void stopAudioThread()
|
||||
void stopAudio()
|
||||
{
|
||||
simuAudio.threadRunning = false;
|
||||
pthread_join(simuAudio.threadPid, nullptr);
|
||||
SDL_CloseAudio();
|
||||
}
|
||||
#endif // #if defined(SIMU_AUDIO)
|
||||
|
||||
@@ -675,6 +647,3 @@ struct TouchState getInternalTouchState()
|
||||
return simTouchState;
|
||||
}
|
||||
#endif
|
||||
|
||||
void telemetryStart() {}
|
||||
void telemetryStop() {}
|
||||
|
||||
@@ -30,17 +30,11 @@
|
||||
#include <stddef.h>
|
||||
#include <errno.h>
|
||||
|
||||
// #undef min
|
||||
// #undef max
|
||||
|
||||
extern uint8_t * eeprom;
|
||||
|
||||
#define __disable_irq()
|
||||
#define __enable_irq()
|
||||
|
||||
extern char * main_thread_error;
|
||||
|
||||
|
||||
uint64_t simuTimerMicros(void);
|
||||
uint8_t simuSleep(uint32_t ms); // returns true if thread shutdown requested
|
||||
|
||||
@@ -57,21 +51,16 @@ void startEepromThread(const char * filename = "eeprom.bin");
|
||||
void stopEepromThread();
|
||||
|
||||
#if defined(SIMU_AUDIO)
|
||||
void startAudioThread(int volumeGain = 10);
|
||||
void stopAudioThread(void);
|
||||
int startAudio(int volumeGain = 10);
|
||||
void stopAudio();
|
||||
#else
|
||||
#define startAudioThread(dummy)
|
||||
#define stopAudioThread()
|
||||
#define startAudio(dummy) (-1)
|
||||
#define stopAudio()
|
||||
#endif
|
||||
#endif
|
||||
|
||||
void simuMain();
|
||||
|
||||
|
||||
// inline void delay_01us(uint32_t dummy) { }
|
||||
|
||||
#define configure_pins(...)
|
||||
|
||||
#if !defined(SKIP_FATFS_DECLARATION) && !defined(SIMU_DISKIO)
|
||||
#define SIMU_USE_SDCARD
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user