not1mm 25.3.5__tar.gz → 25.3.14__tar.gz

{not1mm-25.3.5 → not1mm-25.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.3.5
+Version: 25.3.14
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -133,6 +133,7 @@ Requires-Dist: Levenshtein
       - [If no exchange entered send AGN](#if-no-exchange-entered-send-agn)
       - [With exchange entered, send your exchange and log it](#with-exchange-entered-send-your-exchange-and-log-it)
   - [Call History Files](#call-history-files)
+    - [Creating your own Call History files](#creating-your-own-call-history-files)
   - [Contest specific notes](#contest-specific-notes)
     - [ARRL Sweekstakes](#arrl-sweekstakes)
       - [The exchange parser](#the-exchange-parser)
@@ -240,6 +241,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-14] Add call history support to ARR Field Day.
+- [25-3-10] Slight change to adif header. Slight change to CAT status icon state.
 - [25-3-5] Added checks for blank/comment lines in the macros
 - [25-3-2] Added call history support to ARRL DX, just in time for it to be over.
 - [25-3-1] Add {OTHER1} and {OTHER2} macros.
@@ -919,13 +922,16 @@ QRZ (for Run) or Exchange (for S&P) is sent.
 
 ## Call History Files
 
-I've started work on using 'call history files'. To test it, you can
-go to `FILE -> Configuration Settings`
+To use Call History files, go to `FILE -> Configuration Settings`
 
 ![Config Screen](https://github.com/mbridak/not1mm/raw/master/pic/configuration_options.png)
 
 Place a check in the `Use Call History` box. Call history files are very specific to the contest you are working. Example files can be obtained from [n1mm's](https://n1mmwp.hamdocs.com/mmfiles/categories/callhistory/?) website. They have a searchbox so you can find the contest you are looking for. If you are feeling masocistic, you can craft your own. The general makeup of the file is a header defining the fields to be used, followed by by lines of comma separated data.
 
+### Creating your own Call History files
+
+You can use [adif2callhistory](https://github.com/mbridak/adif2callhistory) to generate your own call history file from your ADIF files. You can use a list of call history keys used for each contest [here](https://github.com/mbridak/not1mm/blob/master/call_history_keys.md).
+
 An example file excerpt looks like:
 
 ```text

{not1mm-25.3.5 → not1mm-25.3.14}/README.md

@@ -102,6 +102,7 @@
       - [If no exchange entered send AGN](#if-no-exchange-entered-send-agn)
       - [With exchange entered, send your exchange and log it](#with-exchange-entered-send-your-exchange-and-log-it)
   - [Call History Files](#call-history-files)
+    - [Creating your own Call History files](#creating-your-own-call-history-files)
   - [Contest specific notes](#contest-specific-notes)
     - [ARRL Sweekstakes](#arrl-sweekstakes)
       - [The exchange parser](#the-exchange-parser)
@@ -209,6 +210,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-14] Add call history support to ARR Field Day.
+- [25-3-10] Slight change to adif header. Slight change to CAT status icon state.
 - [25-3-5] Added checks for blank/comment lines in the macros
 - [25-3-2] Added call history support to ARRL DX, just in time for it to be over.
 - [25-3-1] Add {OTHER1} and {OTHER2} macros.
@@ -888,13 +891,16 @@ QRZ (for Run) or Exchange (for S&P) is sent.
 
 ## Call History Files
 
-I've started work on using 'call history files'. To test it, you can
-go to `FILE -> Configuration Settings`
+To use Call History files, go to `FILE -> Configuration Settings`
 
 ![Config Screen](https://github.com/mbridak/not1mm/raw/master/pic/configuration_options.png)
 
 Place a check in the `Use Call History` box. Call history files are very specific to the contest you are working. Example files can be obtained from [n1mm's](https://n1mmwp.hamdocs.com/mmfiles/categories/callhistory/?) website. They have a searchbox so you can find the contest you are looking for. If you are feeling masocistic, you can craft your own. The general makeup of the file is a header defining the fields to be used, followed by by lines of comma separated data.
 
+### Creating your own Call History files
+
+You can use [adif2callhistory](https://github.com/mbridak/adif2callhistory) to generate your own call history file from your ADIF files. You can use a list of call history keys used for each contest [here](https://github.com/mbridak/not1mm/blob/master/call_history_keys.md).
+
 An example file excerpt looks like:
 
 ```text

{not1mm-25.3.5 → not1mm-25.3.14}/not1mm/__main__.py

@@ -3480,12 +3480,13 @@ class MainWindow(QtWidgets.QMainWindow):
         None
         """
         if mode in ("CW", "CW-U", "CW-L", "CWR"):
-            if self.rig_control and self.rig_control.online:
-                self.rig_control.set_mode(self.rig_control.last_cw_mode)
-                if self.pref.get("cwtype") == 3 and self.rig_control is not None:
-                    if self.rig_control.interface == "flrig":
-                        self.cwspeed_spinbox_changed()
-                        self.rig_control.cat.set_flrig_cw_send(True)
+            if self.rig_control:
+                if self.rig_control.online:
+                    self.rig_control.set_mode(self.rig_control.last_cw_mode)
+                    if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+                        if self.rig_control.interface == "flrig":
+                            self.cwspeed_spinbox_changed()
+                            self.rig_control.cat.set_flrig_cw_send(True)
             else:
                 self.setmode("CW")
                 self.radio_state["mode"] = "CW"
@@ -3505,8 +3506,9 @@ class MainWindow(QtWidgets.QMainWindow):
             "AM-D",
             "FM-D",
         ):
-            if self.rig_control and self.rig_control.online:
-                self.rig_control.set_mode(self.rig_control.last_data_mode)
+            if self.rig_control:
+                if self.rig_control.online:
+                    self.rig_control.set_mode(self.rig_control.last_data_mode)
             else:
                 self.radio_state["mode"] = "RTTY"
             self.setmode("RTTY")
@@ -3527,8 +3529,9 @@ class MainWindow(QtWidgets.QMainWindow):
             else:
                 self.radio_state["mode"] = "LSB"
 
-            if self.rig_control and self.rig_control.online:
-                self.rig_control.set_mode(self.radio_state.get("mode"))
+            if self.rig_control:
+                if self.rig_control.online:
+                    self.rig_control.set_mode(self.radio_state.get("mode"))
             else:
                 self.setmode("SSB")
                 band = getband(str(self.radio_state.get("vfoa", "0.0")))
@@ -3732,7 +3735,6 @@ class MainWindow(QtWidgets.QMainWindow):
 
         # The following pertains to radio polling.
         logger.debug(f"{the_dict=}")
-        self.set_radio_icon(0)
         info_dirty = False
         vfo = the_dict.get("vfoa", "")
         mode = the_dict.get("mode", "")
@@ -3740,8 +3742,9 @@ class MainWindow(QtWidgets.QMainWindow):
         if bw == "NONE":
             bw = "0"
         online = the_dict.get("online", False)
-
-        if online is False:
+        if self.rig_control.interface == "fake":
+            self.set_radio_icon(0)
+        elif online is False:
             self.set_radio_icon(1)
         else:
             self.set_radio_icon(2)
@@ -3756,8 +3759,9 @@ class MainWindow(QtWidgets.QMainWindow):
         self.contact["Band"] = get_logged_band(str(vfo))
         self.set_band_indicator(band)
 
-        if self.rig_control and self.rig_control.online:
-            self.rig_control.get_modes()
+        if self.rig_control:
+            if self.rig_control.online:
+                self.rig_control.get_modes()
 
         if self.radio_state.get("mode") != mode:
             info_dirty = True
@@ -3789,14 +3793,14 @@ class MainWindow(QtWidgets.QMainWindow):
         ):
             self.setmode("RTTY")
 
-        # cmd = {}
-        # cmd["cmd"] = "RADIO_STATE"
-        # cmd["band"] = band
-        # cmd["vfoa"] = vfo
-        # cmd["mode"] = mode
-        # cmd["bw"] = bw
-        # if self.bandmap_window:
-        #     self.bandmap_window.msg_from_main(cmd)
+        cmd = {}
+        cmd["cmd"] = "RADIO_STATE"
+        cmd["band"] = band
+        cmd["vfoa"] = vfo
+        cmd["mode"] = mode
+        cmd["bw"] = bw
+        if self.bandmap_window:
+            self.bandmap_window.msg_from_main(cmd)
         if info_dirty:
             try:
                 logger.debug("VFO: %s  MODE: %s BW: %s", vfo, mode, bw)

{not1mm-25.3.5 → not1mm-25.3.14}/not1mm/lib/plugin_common.py

@@ -82,6 +82,7 @@ def gen_adif(self, cabrillo_name: str, contest_id=""):
     log = self.database.fetch_all_contacts_asc()
     try:
         with open(filename, "w", encoding="utf-8") as file_descriptor:
+            print("Not1MM ADIF export", end="\r\n", file=file_descriptor)
             print("<ADIF_VER:5>2.2.0", end="\r\n", file=file_descriptor)
             print("<EOH>", end="\r\n", file=file_descriptor)
             for contact in log:

{not1mm-25.3.5 → not1mm-25.3.14}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.3.5"
+__version__ = "25.3.14"

{not1mm-25.3.5 → not1mm-25.3.14}/not1mm/plugins/arrl_field_day.py

@@ -526,3 +526,24 @@ def get_mults(self):
 def just_points(self):
     """"""
     return get_points(self)
+
+
+def populate_history_info_line(self):
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(
+            f"{result.get('Call', '')}, {result.get('Exch1', '')}, {result.get('Sect', '')}, {result.get('UserText','...')}"
+        )
+    else:
+        self.history_info.setText("")
+
+
+def check_call_history(self):
+    """"""
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(f"{result.get('UserText','')}")
+        if self.other_1.text() == "":
+            self.other_1.setText(f"{result.get('Exch1', '')}")
+        if self.other_2.text() == "":
+            self.other_2.setText(f"{result.get('Sect', '')}")

{not1mm-25.3.5 → not1mm-25.3.14}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.3.5
+Version: 25.3.14
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -133,6 +133,7 @@ Requires-Dist: Levenshtein
       - [If no exchange entered send AGN](#if-no-exchange-entered-send-agn)
       - [With exchange entered, send your exchange and log it](#with-exchange-entered-send-your-exchange-and-log-it)
   - [Call History Files](#call-history-files)
+    - [Creating your own Call History files](#creating-your-own-call-history-files)
   - [Contest specific notes](#contest-specific-notes)
     - [ARRL Sweekstakes](#arrl-sweekstakes)
       - [The exchange parser](#the-exchange-parser)
@@ -240,6 +241,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-14] Add call history support to ARR Field Day.
+- [25-3-10] Slight change to adif header. Slight change to CAT status icon state.
 - [25-3-5] Added checks for blank/comment lines in the macros
 - [25-3-2] Added call history support to ARRL DX, just in time for it to be over.
 - [25-3-1] Add {OTHER1} and {OTHER2} macros.
@@ -919,13 +922,16 @@ QRZ (for Run) or Exchange (for S&P) is sent.
 
 ## Call History Files
 
-I've started work on using 'call history files'. To test it, you can
-go to `FILE -> Configuration Settings`
+To use Call History files, go to `FILE -> Configuration Settings`
 
 ![Config Screen](https://github.com/mbridak/not1mm/raw/master/pic/configuration_options.png)
 
 Place a check in the `Use Call History` box. Call history files are very specific to the contest you are working. Example files can be obtained from [n1mm's](https://n1mmwp.hamdocs.com/mmfiles/categories/callhistory/?) website. They have a searchbox so you can find the contest you are looking for. If you are feeling masocistic, you can craft your own. The general makeup of the file is a header defining the fields to be used, followed by by lines of comma separated data.
 
+### Creating your own Call History files
+
+You can use [adif2callhistory](https://github.com/mbridak/adif2callhistory) to generate your own call history file from your ADIF files. You can use a list of call history keys used for each contest [here](https://github.com/mbridak/not1mm/blob/master/call_history_keys.md).
+
 An example file excerpt looks like:
 
 ```text

{not1mm-25.3.5 → not1mm-25.3.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "25.3.5"
+version = "25.3.14"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"