Merges latest firmware into feature branch

This commit is contained in:
Jimi Sanchez 2022-09-19 17:35:28 -04:00
parent 958c9a1bfa
commit 040dded2a6
2 changed files with 5 additions and 0 deletions

View File

@ -62,6 +62,7 @@ void PlaylistView::set_ready() {
txtline_process(line); txtline_process(line);
} }
} }
playlist_masterdb = playlist_db;
return ; return ;
} }
@ -215,6 +216,9 @@ void PlaylistView::stop(const bool do_loop) {
if (do_loop) { if (do_loop) {
if (playlist_db.size() > 0 ) { if (playlist_db.size() > 0 ) {
start(); start();
} else {
playlist_db = playlist_masterdb;
start();
} }
} else { } else {
radio::set_antenna_bias(false); //Turn off Bias Tee radio::set_antenna_bias(false); //Turn off Bias Tee

View File

@ -57,6 +57,7 @@ private:
uint32_t next_delay{}; uint32_t next_delay{};
}; };
std::deque<playlist_entry> playlist_db{}; std::deque<playlist_entry> playlist_db{};
std::deque<playlist_entry> playlist_masterdb{};
uint32_t sample_rate = 0; uint32_t sample_rate = 0;
int32_t tx_gain { 47 }; int32_t tx_gain { 47 };
bool rf_amp { true }; // aux private var to store temporal, Replay App rf_amp user selection. bool rf_amp { true }; // aux private var to store temporal, Replay App rf_amp user selection.