not1mm 24.11.17__py3-none-any.whl → 24.11.19__py3-none-any.whl

not1mm/plugins/jidx_ph.py

@@ -54,12 +54,10 @@ def interface(self):
     self.field4.show()
     self.snt_label.setText("SNT")
     self.field1.setAccessibleName("RST Sent")
-    label = self.field3.findChild(QtWidgets.QLabel)
-    label.setText("SentNR")
-    self.field3.setAccessibleName("Sent Number")
-    label = self.field4.findChild(QtWidgets.QLabel)
-    label.setText("RcvNR")
-    self.field4.setAccessibleName("Received Number")
+    self.other_label.setText("SentNR")
+    self.other_1.setAccessibleName("Sent Number")
+    self.exch_label.setText("RcvNR")
+    self.other_2.setAccessibleName("Received Number")
 
 
 def reset_label(self):  # pylint: disable=unused-argument
@@ -69,34 +67,22 @@ def reset_label(self):  # pylint: disable=unused-argument
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
-        self.callsign: self.field1.findChild(QtWidgets.QLineEdit),
-        self.field1.findChild(QtWidgets.QLineEdit): self.field2.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field2.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.callsign: self.sent,
+        self.sent: self.receive,
+        self.receive: self.other_1,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
     }
 
 
 def set_tab_prev(self):
     """Set TAB Advances"""
     self.tab_prev = {
-        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
-        self.field1.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field2.findChild(QtWidgets.QLineEdit): self.field1.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field2.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
+        self.callsign: self.other_2,
+        self.sent: self.callsign,
+        self.receive: self.sent,
+        self.other_1: self.receive,
+        self.other_2: self.other_1,
     }
 
 
@@ -128,7 +114,7 @@ def prefill(self):
             serial_nr = "001"
         SentExchange.replace("#", str(serial_nr))
 
-    field = self.field3.findChild(QtWidgets.QLineEdit)
+    field = self.other_1
     if len(field.text()) == 0:
         field.setText(SentExchange)
 
@@ -380,3 +366,94 @@ def recalculate_mults(self):
         else:
             contact["IsMultiplier1"] = 0
         self.database.change_contact(contact)
+
+
+def process_esm(self, new_focused_widget=None, with_enter=False):
+    """ESM State Machine"""
+
+    # self.pref["run_state"]
+
+    # -----===== Assigned F-Keys =====-----
+    # self.esm_dict["CQ"]
+    # self.esm_dict["EXCH"]
+    # self.esm_dict["QRZ"]
+    # self.esm_dict["AGN"]
+    # self.esm_dict["HISCALL"]
+    # self.esm_dict["MYCALL"]
+    # self.esm_dict["QSOB4"]
+
+    # ----==== text fields ====----
+    # self.callsign
+    # self.sent
+    # self.receive
+    # self.other_1
+    # self.other_2
+
+    if new_focused_widget is not None:
+        self.current_widget = self.inputs_dict.get(new_focused_widget)
+
+    # print(f"checking esm {self.current_widget=} {with_enter=} {self.pref.get("run_state")=}")
+
+    for a_button in [
+        self.esm_dict["CQ"],
+        self.esm_dict["EXCH"],
+        self.esm_dict["QRZ"],
+        self.esm_dict["AGN"],
+        self.esm_dict["HISCALL"],
+        self.esm_dict["MYCALL"],
+        self.esm_dict["QSOB4"],
+    ]:
+        if a_button is not None:
+            self.restore_button_color(a_button)
+
+    buttons_to_send = []
+
+    if self.pref.get("run_state"):
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) < 3:
+                self.make_button_green(self.esm_dict["CQ"])
+                buttons_to_send.append(self.esm_dict["CQ"])
+            elif len(self.callsign.text()) > 2:
+                self.make_button_green(self.esm_dict["HISCALL"])
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["HISCALL"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+
+        elif self.current_widget in ["other_2"]:
+            if self.other_2.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")
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)
+    else:
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) > 2:
+                self.make_button_green(self.esm_dict["MYCALL"])
+                buttons_to_send.append(self.esm_dict["MYCALL"])
+
+        elif self.current_widget in ["other_2"]:
+            if self.other_2.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")
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)

not1mm/plugins/k1usn_sst.py

@@ -69,12 +69,10 @@ def interface(self):
     self.field2.hide()
     self.field3.show()
     self.field4.show()
-    namefield = self.field3.findChild(QtWidgets.QLabel)
-    namefield.setText("Name")
-    self.field3.setAccessibleName("Name")
-    spc = self.field4.findChild(QtWidgets.QLabel)
-    spc.setText("SPC")
-    self.field4.setAccessibleName("SPC")
+    self.other_label.setText("Name")
+    self.other_1.setAccessibleName("Name")
+    self.exch_label.setText("SPC")
+    self.other_2.setAccessibleName("SPC")
 
 
 def reset_label(self):
@@ -84,22 +82,18 @@ def reset_label(self):
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
-        self.callsign: self.field3.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.callsign: self.other_1,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
     }
 
 
 def set_tab_prev(self):
     """Set TAB Advances"""
     self.tab_prev = {
-        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
+        self.callsign: self.other_2,
+        self.other_1: self.callsign,
+        self.other_2: self.other_1,
     }
 
 

not1mm/plugins/lz-dx.py

@@ -116,12 +116,10 @@ def interface(self):
     self.field2.show()
     self.field3.hide()
     self.field4.show()
-    label = self.field3.findChild(QtWidgets.QLabel)
-    label.setText("Sent")
-    self.field3.setAccessibleName("Sent")
-    label = self.field4.findChild(QtWidgets.QLabel)
-    label.setText("District/ITU")
-    self.field4.setAccessibleName("District or ITU")
+    self.other_label.setText("Sent")
+    self.other_1.setAccessibleName("Sent")
+    self.exch_label.setText("District/ITU")
+    self.other_2.setAccessibleName("District or ITU")
 
 
 def reset_label(self):
@@ -131,30 +129,22 @@ def reset_label(self):
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
-        self.callsign: self.field1.findChild(QtWidgets.QLineEdit),
-        self.field1.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field2.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.callsign: self.sent,
+        self.sent: self.other_2,
+        self.receive: self.other_2,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
     }
 
 
 def set_tab_prev(self):
     """Set TAB Advances"""
     self.tab_prev = {
-        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
-        self.field1.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field2.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field3.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
+        self.callsign: self.other_2,
+        self.sent: self.callsign,
+        self.receive: self.callsign,
+        self.other_1: self.callsign,
+        self.other_2: self.other_1,
     }
 
 
@@ -201,17 +191,16 @@ def set_contact_vars(self):
 
 def prefill(self):
     """Fill SentNR"""
-    field = self.field3.findChild(QtWidgets.QLineEdit)
     sent_sxchange_setting = self.contest_settings.get("SentExchange", "")
     if sent_sxchange_setting.strip() == "#":
         result = self.database.get_serial()
         serial_nr = str(result.get("serial_nr", "1")).zfill(3)
         if serial_nr == "None":
             serial_nr = "001"
-        if len(field.text()) == 0:
-            field.setText(serial_nr)
+        if len(self.other_1.text()) == 0:
+            self.other_1.setText(serial_nr)
     else:
-        field.setText(sent_sxchange_setting)
+        self.other_1.setText(sent_sxchange_setting)
 
 
 def show_mults(self):

not1mm/plugins/naqp_cw.py

@@ -82,13 +82,11 @@ def interface(self):
     self.field3.show()
     self.field4.show()
     self.snt_label.setText("SNT")
-    self.field1.setAccessibleName("RST Sent")
-    namefield = self.field3.findChild(QtWidgets.QLabel)
-    namefield.setText("Name")
-    self.field3.setAccessibleName("Name")
-    spc = self.field4.findChild(QtWidgets.QLabel)
-    spc.setText("State")
-    self.field4.setAccessibleName("State")
+    self.sent.setAccessibleName("RST Sent")
+    self.other_label.setText("Name")
+    self.other_1.setAccessibleName("Name")
+    self.exch_label.setText("State")
+    self.other_2.setAccessibleName("State")
 
 
 def reset_label(self):
@@ -98,22 +96,18 @@ def reset_label(self):
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
-        self.callsign: self.field3.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.callsign: self.other_1,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
     }
 
 
 def set_tab_prev(self):
     """Set TAB Advances"""
     self.tab_prev = {
-        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
+        self.callsign: self.other_2,
+        self.other_1: self.callsign,
+        self.other_2: self.other_1,
     }
 
 

not1mm/plugins/naqp_rtty.py

@@ -85,13 +85,11 @@ def interface(self):
     self.field3.show()
     self.field4.show()
     self.snt_label.setText("SNT")
-    self.field1.setAccessibleName("RST Sent")
-    namefield = self.field3.findChild(QtWidgets.QLabel)
-    namefield.setText("Name")
-    self.field3.setAccessibleName("Name")
-    spc = self.field4.findChild(QtWidgets.QLabel)
-    spc.setText("State")
-    self.field4.setAccessibleName("State")
+    self.sent.setAccessibleName("RST Sent")
+    self.other_label.setText("Name")
+    self.other_1.setAccessibleName("Name")
+    self.exch_label.setText("State")
+    self.other_2.setAccessibleName("State")
 
 
 def reset_label(self):
@@ -101,22 +99,18 @@ def reset_label(self):
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
-        self.callsign: self.field3.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.callsign: self.other_1,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
     }
 
 
 def set_tab_prev(self):
     """Set TAB Advances"""
     self.tab_prev = {
-        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
+        self.callsign: self.other_2,
+        self.other_1: self.callsign,
+        self.other_2: self.other_1,
     }
 
 

not1mm/plugins/naqp_ssb.py

@@ -52,13 +52,11 @@ def interface(self):
     self.field3.show()
     self.field4.show()
     self.snt_label.setText("SNT")
-    self.field1.setAccessibleName("RST Sent")
-    namefield = self.field3.findChild(QtWidgets.QLabel)
-    namefield.setText("Name")
-    self.field3.setAccessibleName("Name")
-    spc = self.field4.findChild(QtWidgets.QLabel)
-    spc.setText("State")
-    self.field4.setAccessibleName("State")
+    self.sent.setAccessibleName("RST Sent")
+    self.other_label.setText("Name")
+    self.other_1.setAccessibleName("Name")
+    self.exch_label.setText("State")
+    self.other_2.setAccessibleName("State")
 
 
 def reset_label(self):
@@ -68,22 +66,18 @@ def reset_label(self):
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
-        self.callsign: self.field3.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.callsign: self.other_1,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
     }
 
 
 def set_tab_prev(self):
     """Set TAB Advances"""
     self.tab_prev = {
-        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
+        self.callsign: self.other_2,
+        self.other_1: self.callsign,
+        self.other_2: self.other_1,
     }
 
 

not1mm/plugins/phone_weekly_test.py

@@ -73,12 +73,10 @@ def interface(self):
     self.field2.hide()
     self.field3.show()
     self.field4.show()
-    namefield = self.field3.findChild(QtWidgets.QLabel)
-    namefield.setText("Name")
-    self.field3.setAccessibleName("Name")
-    spc = self.field4.findChild(QtWidgets.QLabel)
-    spc.setText("State")
-    self.field4.setAccessibleName("State")
+    self.other_label.setText("Name")
+    self.other_1.setAccessibleName("Name")
+    self.exch_label.setText("State")
+    self.other_2.setAccessibleName("State")
 
 
 def reset_label(self):
@@ -88,22 +86,18 @@ def reset_label(self):
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
-        self.callsign: self.field3.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.callsign: self.other_1,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
     }
 
 
 def set_tab_prev(self):
     """Set TAB Advances"""
     self.tab_prev = {
-        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
-        self.field3.findChild(QtWidgets.QLineEdit): self.callsign,
-        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
+        self.callsign: self.other_2,
+        self.other_1: self.callsign,
+        self.other_2: self.other_1,
     }
 
 
@@ -408,3 +402,94 @@ def recalculate_mults(self):
         cmd["cmd"] = "UPDATELOG"
         cmd["station"] = platform.node()
         self.multicast_interface.send_as_json(cmd)
+
+
+def process_esm(self, new_focused_widget=None, with_enter=False):
+    """ESM State Machine"""
+
+    # self.pref["run_state"]
+
+    # -----===== Assigned F-Keys =====-----
+    # self.esm_dict["CQ"]
+    # self.esm_dict["EXCH"]
+    # self.esm_dict["QRZ"]
+    # self.esm_dict["AGN"]
+    # self.esm_dict["HISCALL"]
+    # self.esm_dict["MYCALL"]
+    # self.esm_dict["QSOB4"]
+
+    # ----==== text fields ====----
+    # self.callsign
+    # self.sent
+    # self.receive
+    # self.other_1
+    # self.other_2
+
+    if new_focused_widget is not None:
+        self.current_widget = self.inputs_dict.get(new_focused_widget)
+
+    # print(f"checking esm {self.current_widget=} {with_enter=} {self.pref.get("run_state")=}")
+
+    for a_button in [
+        self.esm_dict["CQ"],
+        self.esm_dict["EXCH"],
+        self.esm_dict["QRZ"],
+        self.esm_dict["AGN"],
+        self.esm_dict["HISCALL"],
+        self.esm_dict["MYCALL"],
+        self.esm_dict["QSOB4"],
+    ]:
+        if a_button is not None:
+            self.restore_button_color(a_button)
+
+    buttons_to_send = []
+
+    if self.pref.get("run_state"):
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) < 3:
+                self.make_button_green(self.esm_dict["CQ"])
+                buttons_to_send.append(self.esm_dict["CQ"])
+            elif len(self.callsign.text()) > 2:
+                self.make_button_green(self.esm_dict["HISCALL"])
+                self.make_button_green(self.esm_dict["EXCH"])
+                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_1.text() == "" or self.other_2.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")
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)
+    else:
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) > 2:
+                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_1.text() == "" or self.other_2.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")
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)

not1mm/plugins/raem.py

@@ -28,6 +28,21 @@
 #  	Find rules at:	https://raem.srr.ru/rules/
 #  	Cabrillo name:	RAEM
 
+# Label and field names
+# callsign_label, callsign
+# snt_label, sent
+# rcv_label, receive
+# other_label, other_1
+# exch_label, other_2
+
+# command button names
+# esc_stop
+# log_it
+# mark
+# spot_it
+# wipe
+
+
 import datetime
 import logging
 
@@ -77,11 +92,11 @@ def interface(self):
     self.field3.show()
     self.field4.show()
     self.snt_label.setText("Sent S/N")
-    self.field1.setAccessibleName("Sent Serial Number")
+    self.sent.setAccessibleName("Sent Serial Number")
     self.other_label.setText("Rcv S/N")
-    self.field3.setAccessibleName("Serial Number")
+    self.other_1.setAccessibleName("Serial Number")
     self.exch_label.setText("Exchange")
-    self.field4.setAccessibleName("Exchange")
+    self.other_2.setAccessibleName("Exchange")
     self.sent.setText("")
 
 
@@ -92,34 +107,20 @@ def reset_label(self):  # pylint: disable=unused-argument
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
-        self.callsign: self.field1.findChild(QtWidgets.QLineEdit),
-        self.field1.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
-        # self.field2.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-        #     QtWidgets.QLineEdit
-        # ),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.callsign: self.sent,
+        self.sent: self.other_1,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
     }
 
 
 def set_tab_prev(self):
     """Set TAB Advances"""
     self.tab_prev = {
-        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
-        self.field1.findChild(QtWidgets.QLineEdit): self.callsign,
-        # self.field2.findChild(QtWidgets.QLineEdit): self.field1.findChild(
-        #     QtWidgets.QLineEdit
-        # ),
-        self.field3.findChild(QtWidgets.QLineEdit): self.field1.findChild(
-            QtWidgets.QLineEdit
-        ),
-        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
-            QtWidgets.QLineEdit
-        ),
+        self.callsign: self.other_2,
+        self.sent: self.callsign,
+        self.other_1: self.sent,
+        self.other_2: self.other_1,
     }