diff --git a/firmware/application/apps/ui_whipcalc.cpp b/firmware/application/apps/ui_whipcalc.cpp
index ffc464748a57c534528674b754316a6f80eff6ac..c99f21a79fe2169b05e9611320809ac70b7ecfa0 100644
--- a/firmware/application/apps/ui_whipcalc.cpp
+++ b/firmware/application/apps/ui_whipcalc.cpp
@@ -30,188 +30,203 @@
using namespace portapack;
-namespace ui {
-
-void WhipCalcView::focus() {
- field_frequency.focus();
-}
-
-double ui::WhipCalcView::get_decimals(double num, int16_t mult, bool round) {
- num -= int(num); //keep decimals only
- num *= mult; //Shift decimals into integers
- if (!round) return num;
- int16_t intnum = int(num); //Round it up if necessary
- num -= intnum; //Get decimal part
- if (num > .5) intnum++; //Round up
- return intnum;
- }
-
-void WhipCalcView::update_result() {
- double length, calclength, divider;
- console.clear(true);
- divider = ((double)options_type.selected_index_value() / 8.0);
-
- // Antenna lengths fields
- if (field_frequency.value() > 0)
+namespace ui
+{
+
+ void WhipCalcView::focus()
{
- // Metric
- length = (speed_of_light_mps / (double)field_frequency.value()) * divider;
- auto m = to_string_dec_int((int)length, 0);
- //auto cm = to_string_dec_int(int(length * 100.0) % 100, 2);
- //auto mm = to_string_dec_int(int(length * 1000.0) % 10, 1);
- calclength = get_decimals(length, 100); //cm
- auto cm = to_string_dec_int(int(calclength), 0);
- auto mm = to_string_dec_int(int(get_decimals(calclength, 10, true)), 0);
- text_result_metric.set(m + "m " + cm + "." + mm + "cm");
-
- // Imperial
- calclength = (speed_of_light_fps / (double)field_frequency.value()) * divider;
- auto feet = to_string_dec_int(int(calclength), 0);
- calclength = get_decimals(calclength, 12); //inches
- auto inch = to_string_dec_int(int(calclength), 0);
- auto inch_c = to_string_dec_int(int(get_decimals(calclength, 10, true)), 0);
- text_result_imperial.set(feet + "ft " + inch + "." + inch_c + "in");
+ field_frequency.focus();
}
- else
+
+ double ui::WhipCalcView::get_decimals(double num, int16_t mult, bool round)
{
- text_result_metric.set("infinity+");
- text_result_imperial.set("infinity+");
- return;
+ num -= int(num); //keep decimals only
+ num *= mult; //Shift decimals into integers
+ if (!round)
+ return num;
+ int16_t intnum = int(num); //Round it up if necessary
+ num -= intnum; //Get decimal part
+ if (num > .5)
+ intnum++; //Round up
+ return intnum;
}
- uint8_t ant_count = 9; //Shown antennas counter
- length *= 1000; //Get length in mm needed to extend the antenna
- for (antenna_entry antenna : antenna_db)
- { //go thru all antennas available
- uint16_t element, refined_quarter = 0;
- for (element = 0; element < antenna.elements.size(); element++)
+ void WhipCalcView::update_result()
+ {
+ double length, calclength, divider;
+ console.clear(true);
+ divider = ((double)options_type.selected_index_value() / 8.0);
+
+ // Antenna lengths fields
+ if (field_frequency.value() > 0)
{
- if (length == antenna.elements[element]) //Exact element in length
- {
- element++; //Real element is +1 (zero based vector)
- break; //Done with this ant
- }
- else if (length < antenna.elements[element])
+ // Metric
+ length = (speed_of_light_mps / (double)field_frequency.value()) * divider;
+ auto m = to_string_dec_int((int)length, 0);
+ //auto cm = to_string_dec_int(int(length * 100.0) % 100, 2);
+ //auto mm = to_string_dec_int(int(length * 1000.0) % 10, 1);
+ calclength = get_decimals(length, 100); //cm
+ auto cm = to_string_dec_int(int(calclength), 0);
+ auto mm = to_string_dec_int(int(get_decimals(calclength, 10, true)), 0);
+ text_result_metric.set(m + "m " + cm + "." + mm + "cm");
+
+ // Imperial
+ calclength = (speed_of_light_fps / (double)field_frequency.value()) * divider;
+ auto feet = to_string_dec_int(int(calclength), 0);
+ calclength = get_decimals(calclength, 12); //inches
+ auto inch = to_string_dec_int(int(calclength), 0);
+ auto inch_c = to_string_dec_int(int(get_decimals(calclength, 10, true)), 0);
+ text_result_imperial.set(feet + "ft " + inch + "." + inch_c + "in");
+ }
+ else
+ {
+ text_result_metric.set("infinity+");
+ text_result_imperial.set("infinity+");
+ return;
+ }
+
+ uint8_t ant_count = 9; //Shown antennas counter
+ length *= 1000; //Get length in mm needed to extend the antenna
+ for (antenna_entry antenna : antenna_db)
+ { //go thru all antennas available
+ uint16_t element, refined_quarter = 0;
+ for (element = 0; element < antenna.elements.size(); element++)
{
- double remain, this_element, quarter = 0;
- remain = length - antenna.elements[element - 1]; //mm needed from this element to reach length
- this_element = antenna.elements[element] - antenna.elements[element - 1]; //total mm on this element
- quarter = (remain * 4) / this_element; //havoc & portack ended on this int(quarter) resolution.
- if (quarter - int(quarter) > 0.5)
- { //rounding gave a measure closer to next quarter
- refined_quarter = int(quarter) + 1;
- if (refined_quarter == 4)
- { //rounding gave a measure closer to next element
- refined_quarter = 0;
- element++;
- }
+ if (length == antenna.elements[element]) //Exact element in length
+ {
+ element++; //Real element is +1 (zero based vector)
+ break; //Done with this ant
}
- else
+ else if (length < antenna.elements[element])
{
- refined_quarter = int(quarter);
+ double remain, this_element, quarter = 0;
+ remain = length - antenna.elements[element - 1]; //mm needed from this element to reach length
+ this_element = antenna.elements[element] - antenna.elements[element - 1]; //total mm on this element
+ quarter = (remain * 4) / this_element; //havoc & portack ended on this int(quarter) resolution.
+ if (quarter - int(quarter) > 0.5)
+ { //rounding gave a measure closer to next quarter
+ refined_quarter = int(quarter) + 1;
+ if (refined_quarter == 4)
+ { //rounding gave a measure closer to next element
+ refined_quarter = 0;
+ element++;
+ }
+ }
+ else
+ {
+ refined_quarter = int(quarter);
+ }
+ break; //Done with this ant
}
- break; //Done with this ant
}
- }
- /*if (!ant_count)
+ /*if (!ant_count)
{
console.write(" and more ...");
break;
}*/
- console.write(antenna.label + ": " + to_string_dec_int(element, 1) + frac_str[refined_quarter] + " elements\n");
- ant_count--; // For now, just showing all.
+ console.write(antenna.label + ": " + to_string_dec_int(element, 1) + frac_str[refined_quarter] + " elements\n");
+ ant_count--; // For now, just showing all.
+ }
}
-}
-
-WhipCalcView::WhipCalcView(NavigationView& nav) {
-
- add_children({
- &labels,
- &antennas_on_memory,
- &field_frequency,
- &options_type,
- &text_result_metric,
- &text_result_imperial,
- &console,
- &button_exit
- });
-
- File antennas_file;
- auto result = antennas_file.open("WHIPCALC/ANTENNAS.TXT");
-
- if (result.is_valid()) {
- antenna_Default(); // default ant500
- } else {
- std::string line;
- char one_char[1];
- for (size_t pointer=0; pointer < antennas_file.size();pointer++) {
- antennas_file.seek(pointer);
- antennas_file.read(one_char, 1);
- if ((int)one_char[0] > ' ') { //ascii space upwards
- line += one_char[0]; //Add it to the textline
- }
- else if (one_char[0] == '\n') { //New Line
- txtline_process(line); //make sense of this textline
- line.clear(); //Ready for next textline
- }
- }
- if (line.length() > 0) txtline_process(line); //Last line had no newline at end ?
- if (!antenna_db.size()) antenna_Default(); //no antenna found on txt, use default
- }
- antennas_on_memory.set(to_string_dec_int(antenna_db.size(),0) + " antennas"); //tell user
-
- options_type.set_selected_index(2); // Quarter wave
- options_type.on_change = [this](size_t, OptionsField::value_t) {
- this->update_result();
- };
-
- field_frequency.set_step(1000000); // 1MHz step
- field_frequency.on_change = [this](rf::Frequency) {
- this->update_result();
- };
- field_frequency.on_edit = [this, &nav]() {
- // TODO: Provide separate modal method/scheme?
- auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.tuning_frequency());
- new_view->on_changed = [this](rf::Frequency f) {
- this->field_frequency.set_value(f);
+
+ WhipCalcView::WhipCalcView(NavigationView &nav)
+ {
+ add_children({&labels,
+ //&antennas_on_memory,
+ &field_frequency,
+ &options_type,
+ &text_result_metric,
+ &text_result_imperial,
+ &console,
+ &button_exit});
+
+ File antennas_file;
+ auto error = antennas_file.open("WHIPCALC/ANTENNAS.TXT");
+
+ if (!error.is_valid())
+ {
+ std::string line;
+ char one_char[1];
+ for (size_t pointer = 0; pointer < antennas_file.size(); pointer++)
+ {
+ antennas_file.seek(pointer);
+ antennas_file.read(one_char, 1);
+ if ((int)one_char[0] >= ' ')
+ line += one_char[0]; //Add it to the textline
+ else if (one_char[0] == '\n')
+ { //New Line
+ txtline_process(line); //make sense of this textline
+ line.clear(); //Ready for next textline
+ }
+ }
+ if (line.length() > 0)
+ txtline_process(line); //Last line had no newline at end ?
+ }
+
+ if (!antenna_db.size())
+ add_default_antenna();
+ //antennas_on_memory.set(to_string_dec_int(antenna_db.size(),0) + " antennas"); //tell user
+
+ options_type.set_selected_index(2); // Quarter wave
+ options_type.on_change = [this](size_t, OptionsField::value_t) {
+ this->update_result();
+ };
+
+ field_frequency.set_step(1000000); // 1MHz step
+ field_frequency.on_change = [this](rf::Frequency) {
this->update_result();
};
- };
-
- button_exit.on_select = [this, &nav](Button&) {
- nav.pop();
- };
-
- field_frequency.set_value(transmitter_model.tuning_frequency());
-}
-
-void ui::WhipCalcView::txtline_process(std::string& line) {
- if (line.find("#") != std::string::npos) return; //Line is just a comment
- char separator = ',';
- size_t previous = 0;
- uint16_t value = 0;
- antenna_entry new_antenna;
- size_t current = line.find(separator);
- while (current != std::string::npos) {
- if (!previous) { //first space found
- new_antenna.label.assign(line,0,current); //antenna label
- } else {
- value = std::stoi(line.substr(previous,current - previous));
- if (!value) return; //No element length? abort antenna
- new_antenna.elements.push_back(value); //Store this new element
- }
- previous = current + 1;
- current = line.find(separator,previous); //Search for next space delimiter
- }
- if (!previous) return; //Not even a label ? drop this antenna!
- value = std::stoi(line.substr(previous,current - previous)); //Last element
- if (!value) return;
- new_antenna.elements.push_back(value);
- antenna_db.push_back(new_antenna); //Add this antenna
-}
-
- void ui::WhipCalcView::antenna_Default() {
- antenna_db.push_back({"ANT500",{ 185, 315, 450, 586, 724, 862} }); //store a default ant500
-}
-
-}
+ field_frequency.on_edit = [this, &nav]() {
+ // TODO: Provide separate modal method/scheme?
+ auto new_view = nav.push<FrequencyKeypadView>(transmitter_model.tuning_frequency());
+ new_view->on_changed = [this](rf::Frequency f) {
+ this->field_frequency.set_value(f);
+ this->update_result();
+ };
+ };
+
+ button_exit.on_select = [this, &nav](Button &) {
+ nav.pop();
+ };
+
+ field_frequency.set_value(transmitter_model.tuning_frequency());
+ }
+
+ void ui::WhipCalcView::txtline_process(std::string &line)
+ {
+ if (line.find("#") != std::string::npos)
+ return; //Line is just a comment
+
+ char separator = ',';
+ size_t previous = 0;
+ uint16_t value = 0;
+ antenna_entry new_antenna;
+ size_t current = line.find(separator);
+
+ while (current != std::string::npos)
+ {
+ if (!previous)
+ new_antenna.label.assign(line, 0, current); //antenna label
+ else
+ {
+ value = std::stoi(line.substr(previous, current - previous));
+ if (!value) return; //No element length? abort antenna
+ new_antenna.elements.push_back(value); //Store this new element
+ }
+ previous = current + 1;
+ current = line.find(separator, previous); //Search for next space delimiter
+ }
+
+ if (!previous) return; //Not even a label ? drop this antenna!
+ value = std::stoi(line.substr(previous, current - previous)); //Last element
+
+ if (!value) return;
+ new_antenna.elements.push_back(value);
+ antenna_db.push_back(new_antenna); //Add this antenna
+ }
+
+ void ui::WhipCalcView::add_default_antenna()
+ {
+ antenna_db.push_back({"ANT500", {185, 315, 450, 586, 724, 862}}); //store a default ant500
+ }
+} // namespace ui
diff --git a/firmware/application/apps/ui_whipcalc.hpp b/firmware/application/apps/ui_whipcalc.hpp
index 9c463b7e3f35e3f460a219eac73ebf6730496521..7f1cefc083a4a4752b60149fcdbcc0c4574ba427 100644
--- a/firmware/application/apps/ui_whipcalc.hpp
+++ b/firmware/application/apps/ui_whipcalc.hpp
@@ -30,85 +30,69 @@
#include "string_format.hpp"
#include <vector>
-namespace ui {
+namespace ui
+{
+ class WhipCalcView : public View
+ {
+ public:
+ WhipCalcView(NavigationView &nav);
+ void focus() override;
+ std::string title() const override { return "Antenna length"; };
-class WhipCalcView : public View {
-public:
- WhipCalcView(NavigationView& nav);
-
- void focus() override;
-
- std::string title() const override { return "Antenna length"; };
+ private:
+ const double speed_of_light_mps = 299792458.0; // m/s
+ const double speed_of_light_fps = 983571087.90472; // feet/s
+ const std::string frac_str[4] = {"", " 1/4", " 1/2", " 3/4"};
-private:
- const double speed_of_light_mps = 299792458.0; // m/s
- const double speed_of_light_fps = 983571087.90472; // feet/s
-
- const std::string frac_str[4] = { "", " 1/4", " 1/2", " 3/4" };
+ struct antenna_entry
+ {
+ std::string label{};
+ std::vector<uint16_t> elements{};
+ };
- struct antenna_entry {
- std::string label { };
- std::vector <uint16_t> elements { };
- };
+ std::vector<antenna_entry> antenna_db{};
+ double get_decimals(double num, int16_t mult, bool round = false);
+ void update_result();
+ uint16_t string_to_number(std::string);
+ void txtline_process(std::string &);
+ void add_default_antenna();
- std::vector<antenna_entry> antenna_db { };
-
- double get_decimals(double num, int16_t mult, bool round = false);
- void update_result();
+ Labels labels{
+ {{2 * 8, 1 * 16}, "Frequency:", Color::light_grey()},
+ {{7 * 8, 2 * 16}, "Wave:", Color::light_grey()},
+ {{5 * 8, 3 * 16}, "Metric:", Color::light_grey()},
+ {{3 * 8, 4 * 16}, "Imperial:", Color::light_grey()}};
- uint16_t string_to_number(std::string);
- void txtline_process(std::string&);
- void antenna_Default();
-
- Labels labels {
- //{ { 5 * 8, 1 * 16 }, "Loaded:", Color::light_grey() },
- { { 2 * 8, 1 * 16 }, "Frequency:", Color::light_grey() },
- { { 7 * 8, 2 * 16 }, "Wave:", Color::light_grey() },
- { { 5 * 8, 3 * 16 }, "Metric:", Color::light_grey() },
- { { 3 * 8, 4 * 16 }, "Imperial:", Color::light_grey() }
- };
+ FrequencyField field_frequency{
+ {13 * 8, 1 * 16},
+ };
- /*Text antennas_on_memory {
- { 13 * 8, 1 * 16, 2 * 16, 16 },
- };*/
+ OptionsField options_type{
+ {13 * 8, 2 * 16},
+ 7,
+ {{"Full", 8},
+ {"Half", 4},
+ {"Quarter", 2},
+ {"3/4", 6},
+ {"1/8", 1},
+ {"3/8", 3},
+ {"5/8", 5},
+ {"7/8", 7}}};
- FrequencyField field_frequency {
- { 13 * 8, 1 * 16 },
- };
+ Text text_result_metric{
+ {13 * 8, 3 * 16, 10 * 16, 16},
+ "-"};
+ Text text_result_imperial{
+ {13 * 8, 4 * 16, 10 * 16, 16},
+ "-"};
+ Console console{
+ {0, 6 * 16, 240, 160}};
- OptionsField options_type {
- { 13 * 8, 2 * 16 },
- 7,
- {
- { "Full", 8 },
- { "Half", 4 },
- { "Quarter", 2 },
- { "3/4", 6 },
- { "1/8", 1 },
- { "3/8", 3 },
- { "5/8", 5 },
- { "7/8", 7 }
- }
- };
-
- Text text_result_metric {
- { 13 * 8, 3 * 16, 10 * 16, 16 },
- "-"
- };
- Text text_result_imperial {
- { 13 * 8, 4 * 16, 10 * 16, 16 },
- "-"
- };
- Console console {
- { 0, 6 * 16, 240, 160 }
- };
-
- Button button_exit {
- { 72, 17 * 16, 96, 32 },
- "Back"
+ Button button_exit{
+ {72, 17 * 16, 96, 32},
+ "Back"};
};
-};
} /* namespace ui */
-#endif/*__UI_WHIPCALC__*/
+#endif /*__UI_WHIPCALC__*/