Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-14 18:24:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix issue from #1444 (#2278)

Browse Source
This commit is contained in:
sommermorgentraum 2024-10-02 22:17:40 +08:00 committed by GitHub
parent 2d1314a3fa
commit e75fb59169
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/application/apps/ui_encoders.cpp
View File

@ -58,6 +58,7 @@ EncodersConfigView::EncodersConfigView(
options_enctype.on_change = [this](size_t index, int32_t) { options_enctype.on_change = [this](size_t index, int32_t) {
on_type_change(index); on_type_change(index);
set_dirty();
}; };
options_enctype.set_options(enc_options); options_enctype.set_options(enc_options);
@ -104,7 +105,18 @@ void EncodersConfigView::on_type_change(size_t index) {
// Add new SymFields. // Add new SymFields.
Point pos{2 * 8, 9 * 8}; Point pos{2 * 8, 9 * 8};
std::string format_string; std::string format_string = encoder_def->word_format;
/*important notes of this format_String
* previously before PR#1444, this code using the for loop below to generate the format_string, which MAYBE to prevent showing the S symble.
* but after PR#1444, the entireh of symfield code not compatible with this design anymore.
* however the encoder_def struct itself has a field called word_format, which exactly be avle to use as the format_string,
* because itself is ONLY a hint text, not impact protocol things.
* When you find OOK protocol is broken and see this commit from git blame, please be aware that it's not from here.
* previously me and @cusspvz already found it broken, this commit is just to fix the broken that from PR#1444.
* @zxkmm
*/
uint8_t word_length = encoder_def->word_length; uint8_t word_length = encoder_def->word_length;
auto on_change_handler = [this](SymField&) { auto on_change_handler = [this](SymField&) {
generate_frame(); generate_frame();
@ -119,11 +131,9 @@ void EncodersConfigView::on_type_change(size_t index) {
switch (symbol_type) { switch (symbol_type) {
case 'A': case 'A':
symfield->set_symbol_list(encoder_def->address_symbols); symfield->set_symbol_list(encoder_def->address_symbols);
format_string += 'A';
break; break;
case 'D': case 'D':
symfield->set_symbol_list(encoder_def->data_symbols); symfield->set_symbol_list(encoder_def->data_symbols);
format_string += 'D';
break; break;
} }
@ -131,8 +141,8 @@ void EncodersConfigView::on_type_change(size_t index) {
pos += Point{8, 0}; pos += Point{8, 0};
} }
// Ugly :( Pad to erase // cut the S, cuz sync bit isn't in symfield for user to chage/edit.
format_string.append(24 - format_string.size(), ' '); format_string.erase(std::remove(format_string.begin(), format_string.end(), 'S'), format_string.end());
text_format.set(format_string); text_format.set(format_string);
generate_frame(); generate_frame();