TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-14 12:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comma as separator

Browse Source
This commit is contained in:
eried 2020-06-28 14:19:09 +02:00
parent a1501d0993
commit 65ab23fd3c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/application/apps/ui_whipcalc.cpp
View File

@ -140,7 +140,7 @@ WhipCalcView::WhipCalcView(
for (size_t pointer=0; pointer < antennas_file.size();pointer++) { for (size_t pointer=0; pointer < antennas_file.size();pointer++) {
antennas_file.seek(pointer); antennas_file.seek(pointer);
antennas_file.read(one_char, 1); antennas_file.read(one_char, 1);
if ((int)one_char[0] > 31) { //ascii space upwards if ((int)one_char[0] > ' ') { //ascii space upwards
line += one_char[0]; //Add it to the textline line += one_char[0]; //Add it to the textline
} }
else if (one_char[0] == '\n') { //New Line else if (one_char[0] == '\n') { //New Line
@ -181,10 +181,11 @@ WhipCalcView::WhipCalcView(
void ui::WhipCalcView::txtline_process(std::string& line) { void ui::WhipCalcView::txtline_process(std::string& line) {
if (line.find("#") != std::string::npos) return; //Line is just a comment if (line.find("#") != std::string::npos) return; //Line is just a comment
char separator = ',';
size_t previous = 0; size_t previous = 0;
uint16_t value = 0; uint16_t value = 0;
antenna_entry new_antenna; antenna_entry new_antenna;
size_t current = line.find(" "); size_t current = line.find(separator);
while (current != std::string::npos) { while (current != std::string::npos) {
if (!previous) { //first space found if (!previous) { //first space found
new_antenna.label.assign(line,0,current); //antenna label new_antenna.label.assign(line,0,current); //antenna label
@ -194,7 +195,7 @@ void ui::WhipCalcView::txtline_process(std::string& line) {
new_antenna.elements.push_back(value); //Store this new element new_antenna.elements.push_back(value); //Store this new element
} }
previous = current + 1; previous = current + 1;
current = line.find(" ",previous); //Search for next space delimiter current = line.find(separator,previous); //Search for next space delimiter
} }
if (!previous) return; //Not even a label ? drop this antenna! if (!previous) return; //Not even a label ? drop this antenna!
value = std::stoi(line.substr(previous,current - previous)); //Last element value = std::stoi(line.substr(previous,current - previous)); //Last element