not1mm 25.1.27.1__tar.gz → 25.1.27.3__tar.gz

{not1mm-25.1.27.1 → not1mm-25.1.27.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.1.27.1
+Version: 25.1.27.3
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -236,6 +236,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-1-27-3] Add ft8 adif parser to the general logger.
 - [25-1-27-1] Add LABRE-RS Digi
 - [25-1-27] Update pop up about updates...
 - [25-1-26] Add macros for MARK, SPOT, WIPE, RUN, SANDP.

{not1mm-25.1.27.1 → not1mm-25.1.27.3}/README.md

@@ -205,6 +205,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-1-27-3] Add ft8 adif parser to the general logger.
 - [25-1-27-1] Add LABRE-RS Digi
 - [25-1-27] Update pop up about updates...
 - [25-1-26] Add macros for MARK, SPOT, WIPE, RUN, SANDP.

not1mm-25.1.27.3/not1mm/lib/version.py

@@ -0,0 +1,3 @@
+"""It's the version"""
+
+__version__ = "25.1.27.3"

{not1mm-25.1.27.1 → not1mm-25.1.27.3}/not1mm/plugins/general_logging.py

@@ -6,6 +6,7 @@ import logging
 
 from PyQt6 import QtWidgets
 
+from not1mm.lib.ham_utility import get_logged_band
 from not1mm.lib.plugin_common import gen_adif, get_points
 from not1mm.lib.version import __version__
 
@@ -183,19 +184,18 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                 buttons_to_send.append(self.esm_dict["HISCALL"])
                 buttons_to_send.append(self.esm_dict["EXCH"])
 
-#        elif self.current_widget in ["other_1", "other_2"]:
-#            if self.other_2.text() == "" and self.other_1.text() == "":
-#                self.make_button_green(self.esm_dict["AGN"])
-#                buttons_to_send.append(self.esm_dict["AGN"])
-#            else:
-#                self.make_button_green(self.esm_dict["QRZ"])
-#                buttons_to_send.append(self.esm_dict["QRZ"])
-#                buttons_to_send.append("LOGIT")
+        #        elif self.current_widget in ["other_1", "other_2"]:
+        #            if self.other_2.text() == "" and self.other_1.text() == "":
+        #                self.make_button_green(self.esm_dict["AGN"])
+        #                buttons_to_send.append(self.esm_dict["AGN"])
+        #            else:
+        #                self.make_button_green(self.esm_dict["QRZ"])
+        #                buttons_to_send.append(self.esm_dict["QRZ"])
+        #                buttons_to_send.append("LOGIT")
 
         elif self.current_widget in ["other_1", "other_2"]:
             buttons_to_send.append("LOGIT")
 
-
         if with_enter is True and bool(len(buttons_to_send)):
             for button in buttons_to_send:
                 if button:
@@ -209,19 +209,18 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 
-#        elif self.current_widget in ["other_1", "other_2"]:
-#            if self.other_2.text() == "" and self.other_1.text() == "":
-#                self.make_button_green(self.esm_dict["AGN"])
-#                buttons_to_send.append(self.esm_dict["AGN"])
-#            else:
-#                self.make_button_green(self.esm_dict["EXCH"])
-#                buttons_to_send.append(self.esm_dict["EXCH"])
-#                buttons_to_send.append("LOGIT")
+        #        elif self.current_widget in ["other_1", "other_2"]:
+        #            if self.other_2.text() == "" and self.other_1.text() == "":
+        #                self.make_button_green(self.esm_dict["AGN"])
+        #                buttons_to_send.append(self.esm_dict["AGN"])
+        #            else:
+        #                self.make_button_green(self.esm_dict["EXCH"])
+        #                buttons_to_send.append(self.esm_dict["EXCH"])
+        #                buttons_to_send.append("LOGIT")
 
         elif self.current_widget in ["other_1", "other_2"]:
             buttons_to_send.append("LOGIT")
 
-
         if with_enter is True and bool(len(buttons_to_send)):
             for button in buttons_to_send:
                 if button:
@@ -248,3 +247,85 @@ def check_call_history(self):
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":
             self.other_1.setText(f"{result.get('Name', '')}")
+
+
+def set_self(the_outie):
+    """..."""
+    globals()["ALTEREGO"] = the_outie
+
+
+def ft8_handler(the_packet: dict):
+    """Process FT8 QSO packets
+    FT8
+    {
+        'CALL': 'KE0OG',
+        'GRIDSQUARE': 'DM10AT',
+        'MODE': 'FT8',
+        'RST_SENT': '',
+        'RST_RCVD': '',
+        'QSO_DATE': '20210329',
+        'TIME_ON': '183213',
+        'QSO_DATE_OFF': '20210329',
+        'TIME_OFF': '183213',
+        'BAND': '20M',
+        'FREQ': '14.074754',
+        'STATION_CALLSIGN': 'K6GTE',
+        'MY_GRIDSQUARE': 'DM13AT',
+        'CONTEST_ID': 'ARRL-FIELD-DAY',
+        'SRX_STRING': '1D UT',
+        'CLASS': '1D',
+        'ARRL_SECT': 'UT'
+    }
+    FlDigi
+    {
+        'FREQ': '7.029500',
+        'CALL': 'DL2DSL',
+        'MODE': 'RTTY',
+        'NAME': 'BOB',
+        'QSO_DATE': '20240904',
+        'QSO_DATE_OFF': '20240904',
+        'TIME_OFF': '212825',
+        'TIME_ON': '212800',
+        'RST_RCVD': '599',
+        'RST_SENT': '599',
+        'BAND': '40M',
+        'COUNTRY': 'FED. REP. OF GERMANY',
+        'CQZ': '14',
+        'STX': '000',
+        'STX_STRING': '1D ORG',
+        'CLASS': '1D',
+        'ARRL_SECT': 'DX',
+        'TX_PWR': '0',
+        'OPERATOR': 'K6GTE',
+        'STATION_CALLSIGN': 'K6GTE',
+        'MY_GRIDSQUARE': 'DM13AT',
+        'MY_CITY': 'ANAHEIM, CA',
+        'MY_STATE': 'CA'
+    }
+
+    """
+    # print(f"\n{the_packet=}\n")
+    if ALTEREGO is not None:
+        ALTEREGO.callsign.setText(the_packet.get("CALL"))
+        ALTEREGO.contact["Call"] = the_packet.get("CALL", "")
+        ALTEREGO.contact["SNT"] = the_packet.get("RST_SENT", "59")
+        ALTEREGO.contact["RCV"] = the_packet.get("RST_RCVD", "59")
+        my_grid = the_packet.get("MY_GRIDSQUARE", "")
+        if my_grid:
+            if len(my_grid) > 4:
+                my_grid = my_grid[:4]
+        their_grid = the_packet.get("GRIDSQUARE", "")
+        if their_grid:
+            ALTEREGO.contact["GridSquare"] = their_grid
+        if the_packet.get("SUBMODE"):
+            ALTEREGO.contact["Mode"] = the_packet.get("SUBMODE", "ERR")
+        else:
+            ALTEREGO.contact["Mode"] = the_packet.get("MODE", "ERR")
+        ALTEREGO.contact["Freq"] = round(float(the_packet.get("FREQ", "0.0")) * 1000, 2)
+        ALTEREGO.contact["QSXFreq"] = round(
+            float(the_packet.get("FREQ", "0.0")) * 1000, 2
+        )
+        ALTEREGO.contact["Band"] = get_logged_band(
+            str(int(float(the_packet.get("FREQ", "0.0")) * 1000000))
+        )
+        ALTEREGO.save_contact()

{not1mm-25.1.27.1 → not1mm-25.1.27.3}/not1mm/plugins/labre_rs_digi.py

@@ -44,7 +44,7 @@ EXCHANGE_HINT = "4-character grid square"
 
 name = "LABRE-RS Digi"
 mode = "RTTY"  # CW SSB BOTH RTTY
-cabrillo_name = "CQWW-DIGI"
+cabrillo_name = "LABRE-DIGI"
 
 columns = [
     "YYYY-MM-DD HH:MM:SS",
@@ -150,8 +150,9 @@ def points(self):
     # QSO Points:   1 point per QSO
     #               1 additional point per QSO with PY3,PU3,ZZ3,PP3,etc
 
-    if self.contact.get("Call", "") in ["PY3", "PU3", "ZZ3", "PP3"]:
-        return 2
+    if len(self.contact.get("Call", "")) > 2:
+        if self.contact.get("Call", "")[:3] in ["PY3", "PU3", "ZZ3", "PP3", "PX3"]:
+            return 2
     return 1
 
 

{not1mm-25.1.27.1 → not1mm-25.1.27.3}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.1.27.1
+Version: 25.1.27.3
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -236,6 +236,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-1-27-3] Add ft8 adif parser to the general logger.
 - [25-1-27-1] Add LABRE-RS Digi
 - [25-1-27] Update pop up about updates...
 - [25-1-26] Add macros for MARK, SPOT, WIPE, RUN, SANDP.

{not1mm-25.1.27.1 → not1mm-25.1.27.3}/pyproject.toml

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

not1mm-25.1.27.1/not1mm/lib/version.py

@@ -1,3 +0,0 @@
-"""It's the version"""
-
-__version__ = "25.1.27.1"