1.7.1 (#1037)

* Update past_version.txt

* Update version.txt

.github/workflows/past_version.txt

@@ -1 +1 @@
-v1.6.0
+v1.7.0

.github/workflows/version.txt

@@ -1 +1 @@
-v1.7.0
+v1.7.1

LICENSE.GPL-2.0-or-later

@@ -1,7 +1,7 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -290,8 +290,8 @@ to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {description}
-    Copyright (C) {year}  {fullname}
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -329,11 +329,11 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  {signature of Ty Coon}, 1 April 1989
+  <signature of Ty Coon>, 1 April 1989
   Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+Public License instead of this License.

LICENSE.md

@@ -1,7 +0,0 @@
-# License 
-Portapack Mayhem is distributed under [GPL v3.0](LICENSE), however some sub projects might have different (GPL v3.0 compatible) licenses.
-
-## Other Licenses (compatible with GPL v3.0)
-- Most of Portapack Mayhem is distributed under GPL-2.0-or-later. [license](LICENSE.GPL-2.0-or-later)
-- ChibiOS is distributed under GPL v3.0. [license](/firmware/chibios/license.txt)
-- Portapack-ChibiOS is distributed under Apache-2.0 [license](http://www.apache.org/licenses/LICENSE-2.0)

firmware/application/apps/ui_recon.cpp

@@ -239,18 +239,16 @@ void ReconView::recon_redraw() {
     }
     if (last_entry.frequency_a != freq) {
         last_entry.frequency_a = freq;
-        big_display.set("FREQ: " + to_string_short_freq(freq) + " MHz");
+        big_display.set("FREQ:" + to_string_short_freq(freq) + " MHz");
     }
-    if (last_db != db || last_list_size != frequency_list.size() || last_freq_lock != freq_lock || last_nb_match != recon_lock_nb_match) {
-        last_freq_lock = freq;
-        last_list_size = frequency_list.size();
-        last_db = db;
+    if (last_nb_match != recon_lock_nb_match || last_freq_lock != freq_lock) {
+        last_freq_lock = freq_lock;
         last_nb_match = recon_lock_nb_match;
-        text_max.set("/" + to_string_dec_uint(frequency_list.size()) + " " + to_string_dec_int(db) + " db " + to_string_dec_uint(freq_lock) + "/" + to_string_dec_uint(recon_lock_nb_match));
+        text_nb_locks.set(to_string_dec_uint(freq_lock) + "/" + to_string_dec_uint(recon_lock_nb_match));
         if (freq_lock == 0) {
             // NO FREQ LOCK, ONGOING STANDARD SCANNING
             big_display.set_style(&style_white);
-            if (!userpause)
+            if (recon)
                 button_pause.set_text("<PAUSE>");
             else
                 button_pause.set_text("<RESUME>");
@@ -261,13 +259,17 @@ void ReconView::recon_redraw() {
         } else if (freq_lock >= recon_lock_nb_match) {
             big_display.set_style(&style_green);
             button_pause.set_text("<UNLOCK>");
-
             // FREQ IS STRONG: GREEN and recon will pause when on_statistics_update()
             if ((!scanner_mode) && autosave && frequency_list.size() > 0) {
                 recon_save_freq(freq_file_path, current_index, false);
             }
         }
     }
+    if (last_db != db || last_list_size != frequency_list.size()) {
+        last_list_size = frequency_list.size();
+        last_db = db;
+        text_max.set("/" + to_string_dec_uint(frequency_list.size()) + " " + to_string_dec_int(db) + " db");
+    }
 }
 
 void ReconView::handle_retune() {
@@ -305,7 +307,7 @@ void ReconView::handle_retune() {
         if (last_index != current_index) {
             last_index = current_index;
             if ((int32_t)frequency_list.size() && current_index < (int32_t)frequency_list.size() && frequency_list[current_index].type == RANGE) {
-                if (update_ranges) {
+                if (update_ranges && !manual_mode) {
                     button_manual_start.set_text(to_string_short_freq(frequency_list[current_index].frequency_a));
                     frequency_range.min = frequency_list[current_index].frequency_a;
                     if (frequency_list[current_index].frequency_b != 0) {
@@ -371,6 +373,7 @@ ReconView::ReconView(NavigationView& nav)
                   &rssi,
                   &text_cycle,
                   &text_max,
+                  &text_nb_locks,
                   &desc_cycle,
                   &big_display,
                   &freq_stats,
@@ -508,7 +511,7 @@ ReconView::ReconView(NavigationView& nav)
                 }
                 button_pause.set_text("<PAUSE>");  // Show button for non continuous stop
             } else {
-                if (userpause) {
+                if (!recon) {
                     recon_resume();
                 } else {
                     recon_pause();
@@ -653,7 +656,6 @@ ReconView::ReconView(NavigationView& nav)
         scanner_mode = false;
         manual_mode = true;
         recon_pause();
-
         if (!frequency_range.min || !frequency_range.max) {
             nav_.display_modal("Error", "Both START and END freqs\nneed a value");
         } else if (frequency_range.min > frequency_range.max) {
@@ -668,10 +670,10 @@ ReconView::ReconView(NavigationView& nav)
 
             manual_freq_entry.type = RANGE;
             manual_freq_entry.description =
-                "R " + to_string_short_freq(frequency_range.min) + ">" + to_string_short_freq(frequency_range.max) + " S"  // current Manual range
-                + to_string_short_freq(freqman_entry_get_step_value(def_step)).erase(0, 1);                                // euquiq: lame kludge to reduce spacing in step freq
-            manual_freq_entry.frequency_a = frequency_range.min;                                                           // min range val
-            manual_freq_entry.frequency_b = frequency_range.max;                                                           // max range val
+                to_string_short_freq(frequency_range.min).erase(0, 1) + ">" + to_string_short_freq(frequency_range.max).erase(0, 1) + " S:"  // current Manual range
+                + freqman_entry_get_step_string_short(def_step);                                                                             // euquiq: lame kludge to reduce spacing in step freq
+            manual_freq_entry.frequency_a = frequency_range.min;                                                                             // min range val
+            manual_freq_entry.frequency_b = frequency_range.max;                                                                             // max range val
             manual_freq_entry.modulation = -1;
             manual_freq_entry.bandwidth = -1;
             manual_freq_entry.step = def_step;
@@ -690,7 +692,11 @@ ReconView::ReconView(NavigationView& nav)
             file_name.set_style(&style_white);
             file_name.set("MANUAL RANGE RECON");
             desc_cycle.set_style(&style_white);
-            desc_cycle.set("MANUAL RANGE RECON");
+
+            last_entry.modulation = -1;
+            last_entry.bandwidth = -1;
+            last_entry.step = -1;
+            last_index = -1;
 
             current_index = 0;
             freq = manual_freq_entry.frequency_a;
@@ -709,7 +715,7 @@ ReconView::ReconView(NavigationView& nav)
             button_dir.set_text("FW>");
         }
         timer = 0;
-        if (userpause)
+        if (!recon)
             recon_resume();
     };
 
@@ -767,9 +773,6 @@ ReconView::ReconView(NavigationView& nav)
 
     button_recon_setup.on_select = [this, &nav](Button&) {
         audio::output::stop();
-
-        frequency_list.clear();
-
         auto open_view = nav.push<ReconSetupView>(input_file, output_file, recon_lock_duration, recon_lock_nb_match, recon_match_mode);
         open_view->on_changed = [this](std::vector<std::string> result) {
             input_file = result[0];
@@ -778,7 +781,6 @@ ReconView::ReconView(NavigationView& nav)
             recon_lock_duration = strtol(result[2].c_str(), nullptr, 10);
             recon_lock_nb_match = strtol(result[3].c_str(), nullptr, 10);
             recon_match_mode = strtol(result[4].c_str(), nullptr, 10);
-
             recon_save_config_to_sd();
 
             autosave = persistent_memory::recon_autosave_freqs();
@@ -788,7 +790,6 @@ ReconView::ReconView(NavigationView& nav)
             load_freqs = persistent_memory::recon_load_freqs();
             load_ranges = persistent_memory::recon_load_ranges();
             load_hamradios = persistent_memory::recon_load_hamradios();
-
             update_ranges = persistent_memory::recon_update_ranges_when_recon();
 
             field_wait.set_value(wait);
@@ -796,14 +797,12 @@ ReconView::ReconView(NavigationView& nav)
             colorize_waits();
 
             frequency_file_load(false);
+
             if (autostart) {
                 recon_resume();
             } else {
                 recon_pause();
             }
-            if (userpause != true) {
-                recon_resume();
-            }
         };
     };
 
@@ -957,7 +956,7 @@ void ReconView::frequency_file_load(bool stop_all_before) {
                 break;
         }
         text_cycle.set_text(to_string_dec_uint(current_index + 1, 3));
-        if (update_ranges) {
+        if (update_ranges && !manual_mode) {
             button_manual_start.set_text(to_string_short_freq(frequency_list[current_index].frequency_a));
             frequency_range.min = frequency_list[current_index].frequency_a;
             if (frequency_list[current_index].frequency_b != 0) {
@@ -977,7 +976,7 @@ void ReconView::frequency_file_load(bool stop_all_before) {
 
 void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
     db = statistics.max_db;
-    if (!userpause) {
+    if (recon) {
         if (!timer) {
             status = 0;
             continuous_lock = false;
@@ -1176,7 +1175,6 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
                                 break;
                         }
                     }
-                    // send a pause message with the right freq
                     if (has_looped && !continuous) {
                         recon_pause();
                     }
@@ -1194,7 +1192,6 @@ void ReconView::on_statistics_update(const ChannelStatistics& statistics) {
 void ReconView::recon_pause() {
     timer = 0;
     freq_lock = 0;
-    userpause = true;
     continuous_lock = false;
     recon = false;
 
@@ -1207,7 +1204,6 @@ void ReconView::recon_pause() {
 void ReconView::recon_resume() {
     timer = 0;
     freq_lock = 0;
-    userpause = false;
     continuous_lock = false;
     recon = true;
 
@@ -1221,7 +1217,8 @@ void ReconView::on_index_delta(int32_t v) {
     if (v > 0) {
         fwd = true;
         button_dir.set_text("FW>");
-    } else {
+    }
+    if (v < 0) {
         fwd = false;
         button_dir.set_text("<RW");
     }
@@ -1236,7 +1233,8 @@ void ReconView::on_stepper_delta(int32_t v) {
     if (v > 0) {
         fwd = true;
         button_dir.set_text("FW>");
-    } else {
+    }
+    if (v < 0) {
         fwd = false;
         button_dir.set_text("<RW");
     }

firmware/application/apps/ui_recon.hpp

@@ -125,7 +125,6 @@ class ReconView : public View {
     int32_t wait{RECON_DEF_WAIT_DURATION};  // in msec. if > 0 wait duration after a lock, if < 0 duration is set to 'wait' unless there is no more activity
     freqman_db frequency_list = {};
     int32_t current_index{0};
-    bool userpause{false};
     bool continuous_lock{false};
     std::string input_file = {"RECON"};
     std::string output_file = {"RECON_RESULTS"};
@@ -229,15 +228,21 @@ class ReconView : public View {
     };
 
     RSSI rssi{
-        {0 * 16, 2 * 16, SCREEN_W - 8 * 8 + 4, 16},
+        {0 * 16, 2 * 16, SCREEN_W - 8 * 8 + 4, 14},
     };
 
     ButtonWithEncoder text_cycle{
         {0, 3 * 16, 4 * 8, 16},
         ""};
 
+    // "/XXX -XXX db" =>  12 chars max
     Text text_max{
-        {4 * 8, 3 * 16, SCREEN_W - 7 * 8 - 4 * 8, 16},
+        {4 * 8, 3 * 16, 12 * 8, 16},
+    };
+
+    // "XX/XX" =>  5 chars max
+    Text text_nb_locks{
+        {16 * 8, 3 * 16, 5 * 8, 16},
     };
 
     Text desc_cycle{

firmware/chibios-portapack/LICENSE-2.0.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

flashing/dfu_hackrf_one.bat

@@ -14,6 +14,6 @@ echo.
 pause
 
 echo.
-dfu-util-static.exe --device 1fc9:000c --download hackrf_one_usb.dfu --reset
+"utils/dfu-util-static.exe" --device 1fc9:000c --download "utils/hackrf_one_usb.dfu" --reset
 echo.
 pause