Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-08-17 02:40:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source 
# Conflicts:
#	firmware/application/bitmap.hpp
#	firmware/application/receiver_model.cpp
#	firmware/application/receiver_model.hpp
#	firmware/application/touch.hpp
#	firmware/application/ui_setup.cpp
#	firmware/baseband/proc_ais.hpp
#	firmware/baseband/proc_ert.hpp
#	firmware/bootstrap/CMakeLists.txt
#	firmware/common/portapack_persistent_memory.cpp
#	firmware/common/portapack_persistent_memory.hpp
This commit is contained in:
furrtek 2016-08-17 02:55:34 +02:00
commit 45a754645e
43 changed files with 1089 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

19
firmware/application/ui_lcr.hpp
View file

@ -44,7 +44,7 @@ private:
const char * addresses;
};
scan_list_t scan_list[2] = {
const scan_list_t scan_list[2] = {
{ 36, &RGSB_list_Lille[0][0] },
{ 23, &RGSB_list_Reims[0][0] }
};
@ -80,9 +80,8 @@ private:
tx_modes tx_mode = IDLE;
bool abort_scan = false;
uint8_t scan_count;
uint8_t scan_count, scan_index;
double scan_progress;
unsigned int scan_index;
char litteral[5][8] = { { 0 }, { 0 }, { 0 }, { 0 }, { 0 } };
char rgsb[5] = { 0 };
char lcr_message[512];
@ -97,20 +96,6 @@ private:
void on_txdone(int n);
void on_button_setam(NavigationView& nav, Button& button);
radio::Configuration lcr_radio_config = {
0,
2280000,
2500000, // ?
rf::Direction::Transmit,
true,
0,
0,
1,
};
// 2: 94 ?
// 9: 85 ?
const Style style_val {
.font = font::fixed_8x16,
.background = Color::green(),