not1mm 24.11.26.1__py3-none-any.whl → 24.11.27__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- not1mm/__main__.py +3 -0
- not1mm/data/configuration.ui +77 -67
- not1mm/lib/settings.py +5 -0
- not1mm/lib/version.py +1 -1
- not1mm/radio.py +5 -4
- {not1mm-24.11.26.1.dist-info → not1mm-24.11.27.dist-info}/METADATA +2 -1
- {not1mm-24.11.26.1.dist-info → not1mm-24.11.27.dist-info}/RECORD +11 -11
- {not1mm-24.11.26.1.dist-info → not1mm-24.11.27.dist-info}/LICENSE +0 -0
- {not1mm-24.11.26.1.dist-info → not1mm-24.11.27.dist-info}/WHEEL +0 -0
- {not1mm-24.11.26.1.dist-info → not1mm-24.11.27.dist-info}/entry_points.txt +0 -0
- {not1mm-24.11.26.1.dist-info → not1mm-24.11.27.dist-info}/top_level.txt +0 -0
not1mm/__main__.py
CHANGED
@@ -2920,6 +2920,7 @@ class MainWindow(QtWidgets.QMainWindow):
|
|
2920
2920
|
self.pref.get("CAT_ip", "127.0.0.1"),
|
2921
2921
|
int(self.pref.get("CAT_port", 12345)),
|
2922
2922
|
)
|
2923
|
+
self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
|
2923
2924
|
self.rig_control.moveToThread(self.radio_thread)
|
2924
2925
|
self.radio_thread.started.connect(self.rig_control.run)
|
2925
2926
|
self.radio_thread.finished.connect(self.rig_control.deleteLater)
|
@@ -2936,6 +2937,7 @@ class MainWindow(QtWidgets.QMainWindow):
|
|
2936
2937
|
self.pref.get("CAT_ip", "127.0.0.1"),
|
2937
2938
|
int(self.pref.get("CAT_port", 4532)),
|
2938
2939
|
)
|
2940
|
+
self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
|
2939
2941
|
self.rig_control.moveToThread(self.radio_thread)
|
2940
2942
|
self.radio_thread.started.connect(self.rig_control.run)
|
2941
2943
|
self.radio_thread.finished.connect(self.rig_control.deleteLater)
|
@@ -2947,6 +2949,7 @@ class MainWindow(QtWidgets.QMainWindow):
|
|
2947
2949
|
self.pref.get("CAT_ip", "127.0.0.1"),
|
2948
2950
|
int(self.pref.get("CAT_port", 0000)),
|
2949
2951
|
)
|
2952
|
+
self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
|
2950
2953
|
self.rig_control.moveToThread(self.radio_thread)
|
2951
2954
|
self.radio_thread.started.connect(self.rig_control.run)
|
2952
2955
|
self.radio_thread.finished.connect(self.rig_control.deleteLater)
|
not1mm/data/configuration.ui
CHANGED
@@ -377,6 +377,43 @@
|
|
377
377
|
<string>CAT</string>
|
378
378
|
</attribute>
|
379
379
|
<layout class="QGridLayout" name="gridLayout_4">
|
380
|
+
<item row="1" column="3">
|
381
|
+
<widget class="QLineEdit" name="rigcontrolport_field">
|
382
|
+
<property name="font">
|
383
|
+
<font>
|
384
|
+
<family>JetBrains Mono ExtraLight</family>
|
385
|
+
<pointsize>12</pointsize>
|
386
|
+
<bold>false</bold>
|
387
|
+
<strikeout>false</strikeout>
|
388
|
+
</font>
|
389
|
+
</property>
|
390
|
+
<property name="accessibleName">
|
391
|
+
<string>port number</string>
|
392
|
+
</property>
|
393
|
+
<property name="accessibleDescription">
|
394
|
+
<string>port number of rig control d or f l rig.</string>
|
395
|
+
</property>
|
396
|
+
<property name="inputMethodHints">
|
397
|
+
<set>Qt::InputMethodHint::ImhDigitsOnly</set>
|
398
|
+
</property>
|
399
|
+
<property name="text">
|
400
|
+
<string>4532</string>
|
401
|
+
</property>
|
402
|
+
</widget>
|
403
|
+
</item>
|
404
|
+
<item row="5" column="0" colspan="4">
|
405
|
+
<spacer name="verticalSpacer_3">
|
406
|
+
<property name="orientation">
|
407
|
+
<enum>Qt::Vertical</enum>
|
408
|
+
</property>
|
409
|
+
<property name="sizeHint" stdset="0">
|
410
|
+
<size>
|
411
|
+
<width>20</width>
|
412
|
+
<height>40</height>
|
413
|
+
</size>
|
414
|
+
</property>
|
415
|
+
</spacer>
|
416
|
+
</item>
|
380
417
|
<item row="1" column="1">
|
381
418
|
<widget class="QLineEdit" name="rigcontrolip_field">
|
382
419
|
<property name="font">
|
@@ -398,7 +435,38 @@
|
|
398
435
|
</property>
|
399
436
|
</widget>
|
400
437
|
</item>
|
401
|
-
<item row="3" column="
|
438
|
+
<item row="3" column="1" colspan="3">
|
439
|
+
<spacer name="verticalSpacer_2">
|
440
|
+
<property name="orientation">
|
441
|
+
<enum>Qt::Vertical</enum>
|
442
|
+
</property>
|
443
|
+
<property name="sizeHint" stdset="0">
|
444
|
+
<size>
|
445
|
+
<width>20</width>
|
446
|
+
<height>40</height>
|
447
|
+
</size>
|
448
|
+
</property>
|
449
|
+
</spacer>
|
450
|
+
</item>
|
451
|
+
<item row="1" column="0">
|
452
|
+
<widget class="QLabel" name="label_6">
|
453
|
+
<property name="font">
|
454
|
+
<font>
|
455
|
+
<family>JetBrains Mono ExtraLight</family>
|
456
|
+
<pointsize>12</pointsize>
|
457
|
+
<bold>false</bold>
|
458
|
+
<strikeout>false</strikeout>
|
459
|
+
</font>
|
460
|
+
</property>
|
461
|
+
<property name="text">
|
462
|
+
<string>Rig Control IP:</string>
|
463
|
+
</property>
|
464
|
+
<property name="alignment">
|
465
|
+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
466
|
+
</property>
|
467
|
+
</widget>
|
468
|
+
</item>
|
469
|
+
<item row="4" column="0" colspan="4">
|
402
470
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
403
471
|
<property name="sizeConstraint">
|
404
472
|
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
|
@@ -513,50 +581,6 @@
|
|
513
581
|
</item>
|
514
582
|
</layout>
|
515
583
|
</item>
|
516
|
-
<item row="2" column="1" colspan="3">
|
517
|
-
<spacer name="verticalSpacer_2">
|
518
|
-
<property name="orientation">
|
519
|
-
<enum>Qt::Vertical</enum>
|
520
|
-
</property>
|
521
|
-
<property name="sizeHint" stdset="0">
|
522
|
-
<size>
|
523
|
-
<width>20</width>
|
524
|
-
<height>40</height>
|
525
|
-
</size>
|
526
|
-
</property>
|
527
|
-
</spacer>
|
528
|
-
</item>
|
529
|
-
<item row="1" column="0">
|
530
|
-
<widget class="QLabel" name="label_6">
|
531
|
-
<property name="font">
|
532
|
-
<font>
|
533
|
-
<family>JetBrains Mono ExtraLight</family>
|
534
|
-
<pointsize>12</pointsize>
|
535
|
-
<bold>false</bold>
|
536
|
-
<strikeout>false</strikeout>
|
537
|
-
</font>
|
538
|
-
</property>
|
539
|
-
<property name="text">
|
540
|
-
<string>Rig Control IP:</string>
|
541
|
-
</property>
|
542
|
-
<property name="alignment">
|
543
|
-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
544
|
-
</property>
|
545
|
-
</widget>
|
546
|
-
</item>
|
547
|
-
<item row="0" column="2">
|
548
|
-
<spacer name="verticalSpacer">
|
549
|
-
<property name="orientation">
|
550
|
-
<enum>Qt::Vertical</enum>
|
551
|
-
</property>
|
552
|
-
<property name="sizeHint" stdset="0">
|
553
|
-
<size>
|
554
|
-
<width>20</width>
|
555
|
-
<height>40</height>
|
556
|
-
</size>
|
557
|
-
</property>
|
558
|
-
</spacer>
|
559
|
-
</item>
|
560
584
|
<item row="1" column="2">
|
561
585
|
<widget class="QLabel" name="label_7">
|
562
586
|
<property name="font">
|
@@ -575,8 +599,8 @@
|
|
575
599
|
</property>
|
576
600
|
</widget>
|
577
601
|
</item>
|
578
|
-
<item row="
|
579
|
-
<spacer name="
|
602
|
+
<item row="0" column="2">
|
603
|
+
<spacer name="verticalSpacer">
|
580
604
|
<property name="orientation">
|
581
605
|
<enum>Qt::Vertical</enum>
|
582
606
|
</property>
|
@@ -588,30 +612,16 @@
|
|
588
612
|
</property>
|
589
613
|
</spacer>
|
590
614
|
</item>
|
591
|
-
<item row="
|
592
|
-
<widget class="
|
593
|
-
<property name="font">
|
594
|
-
<font>
|
595
|
-
<family>JetBrains Mono ExtraLight</family>
|
596
|
-
<pointsize>12</pointsize>
|
597
|
-
<bold>false</bold>
|
598
|
-
<strikeout>false</strikeout>
|
599
|
-
</font>
|
600
|
-
</property>
|
601
|
-
<property name="accessibleName">
|
602
|
-
<string>port number</string>
|
603
|
-
</property>
|
604
|
-
<property name="accessibleDescription">
|
605
|
-
<string>port number of rig control d or f l rig.</string>
|
606
|
-
</property>
|
607
|
-
<property name="inputMethodHints">
|
608
|
-
<set>Qt::InputMethodHint::ImhDigitsOnly</set>
|
609
|
-
</property>
|
615
|
+
<item row="2" column="0">
|
616
|
+
<widget class="QLabel" name="label_27">
|
610
617
|
<property name="text">
|
611
|
-
<string>
|
618
|
+
<string>CAT Poll Interval (ms):</string>
|
612
619
|
</property>
|
613
620
|
</widget>
|
614
621
|
</item>
|
622
|
+
<item row="2" column="1">
|
623
|
+
<widget class="QLineEdit" name="catpoll_field"/>
|
624
|
+
</item>
|
615
625
|
</layout>
|
616
626
|
</widget>
|
617
627
|
<widget class="QWidget" name="cw_tab">
|
not1mm/lib/settings.py
CHANGED
@@ -99,6 +99,7 @@ class Settings(QtWidgets.QDialog):
|
|
99
99
|
)
|
100
100
|
self.rigcontrolip_field.setText(str(self.preference.get("CAT_ip", "")))
|
101
101
|
self.rigcontrolport_field.setText(str(self.preference.get("CAT_port", "")))
|
102
|
+
self.catpoll_field.setText(str(self.preference.get("CAT_polldelta", 500)))
|
102
103
|
self.userigctld_radioButton.setChecked(bool(self.preference.get("userigctld")))
|
103
104
|
self.useflrig_radioButton.setChecked(bool(self.preference.get("useflrig")))
|
104
105
|
|
@@ -215,6 +216,10 @@ class Settings(QtWidgets.QDialog):
|
|
215
216
|
self.preference["CAT_port"] = int(self.rigcontrolport_field.text())
|
216
217
|
except ValueError:
|
217
218
|
...
|
219
|
+
try:
|
220
|
+
self.preference["CAT_polldelta"] = int(self.catpoll_field.text())
|
221
|
+
except ValueError:
|
222
|
+
...
|
218
223
|
self.preference["userigctld"] = self.userigctld_radioButton.isChecked()
|
219
224
|
self.preference["useflrig"] = self.useflrig_radioButton.isChecked()
|
220
225
|
self.preference["cwip"] = self.cwip_field.text()
|
not1mm/lib/version.py
CHANGED
not1mm/radio.py
CHANGED
@@ -27,8 +27,8 @@ class Radio(QObject):
|
|
27
27
|
vfoa = "14030000"
|
28
28
|
mode = "CW"
|
29
29
|
bw = "500"
|
30
|
-
delta =
|
31
|
-
poll_time = datetime.datetime.now() + datetime.timedelta(
|
30
|
+
delta = 500
|
31
|
+
poll_time = datetime.datetime.now() + datetime.timedelta(milliseconds=delta)
|
32
32
|
time_to_quit = False
|
33
33
|
online = False
|
34
34
|
interface = None
|
@@ -72,7 +72,7 @@ class Radio(QObject):
|
|
72
72
|
while not self.time_to_quit:
|
73
73
|
if datetime.datetime.now() > self.poll_time:
|
74
74
|
self.poll_time = datetime.datetime.now() + datetime.timedelta(
|
75
|
-
|
75
|
+
milliseconds=self.delta
|
76
76
|
)
|
77
77
|
vfoa = self.cat.get_vfo()
|
78
78
|
self.online = False
|
@@ -102,7 +102,8 @@ class Radio(QObject):
|
|
102
102
|
)
|
103
103
|
except QEventLoop:
|
104
104
|
...
|
105
|
-
QThread.msleep(
|
105
|
+
# QThread.msleep(int(self.delta / 2))
|
106
|
+
QThread.msleep(1)
|
106
107
|
|
107
108
|
def store_last_data_mode(self, the_mode: str = ""):
|
108
109
|
"""if the last mode is a data mode, save it."""
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: not1mm
|
3
|
-
Version: 24.11.
|
3
|
+
Version: 24.11.27
|
4
4
|
Summary: NOT1MM Logger
|
5
5
|
Author-email: Michael Bridak <michael.bridak@gmail.com>
|
6
6
|
Project-URL: Homepage, https://github.com/mbridak/not1mm
|
@@ -238,6 +238,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
|
|
238
238
|
|
239
239
|
## Recent Changes (Polishing the Turd)
|
240
240
|
|
241
|
+
- [24-11-27] Added CAT poll interval.
|
241
242
|
- [24-11-26-1] Changed ESC to stop CW, CTRL-W to wipe input fields.
|
242
243
|
- [24-11-26] Trying something different with rigctld parsing.
|
243
244
|
- [24-11-15] Fix CQWW points, fix mode showing as RPRT.
|
@@ -1,11 +1,11 @@
|
|
1
1
|
not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
2
|
-
not1mm/__main__.py,sha256=
|
2
|
+
not1mm/__main__.py,sha256=SOPb_t3oI7vk8v1MhgTTeU-axyfU464n-pTDciNWp3U,142786
|
3
3
|
not1mm/bandmap.py,sha256=X6mMHXS1kXBbUPZCaKgiVJ6Dz6DE6LEQqtEXfT3telg,30811
|
4
4
|
not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
|
5
5
|
not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
|
6
6
|
not1mm/logwindow.py,sha256=TvpzQTNB92hISlUO3iWBqtlPmlebdhOkAArx0DNGcOs,43966
|
7
7
|
not1mm/lookupservice.py,sha256=4c36x_1G3Sy69gQfJ6El7vHLIKTjLGH67ziPPoeYweM,2648
|
8
|
-
not1mm/radio.py,sha256=
|
8
|
+
not1mm/radio.py,sha256=c4m7Ci38uKGKxB0JUT5uOKalI_Mm8Vmixu5D_roN5z4,5400
|
9
9
|
not1mm/test.py,sha256=RN71m2S9MPIOJMaoCi0wZhwEhpEZunvtosZxaKahRB4,101
|
10
10
|
not1mm/vfo.py,sha256=ggPyWtxMbdSE5RwdK0nDRwDNqOxdpb_pvnzZdbzZVQE,11136
|
11
11
|
not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
|
@@ -16,7 +16,7 @@ not1mm/data/alpha bravo charlie delta.txt,sha256=d5QMmSWEUAe4Rj1XbNjTPLa_5Be4Se6
|
|
16
16
|
not1mm/data/bandmap.ui,sha256=hvovf1YKyfUVVbKl6Ib2zU4RdUrFsQwm-255wVeKXZE,7180
|
17
17
|
not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
|
18
18
|
not1mm/data/checkwindow.ui,sha256=PRD98K0julJ9EfWqoE89dT8UPuPKQzGiWBk_efAko3o,5141
|
19
|
-
not1mm/data/configuration.ui,sha256=
|
19
|
+
not1mm/data/configuration.ui,sha256=nDiLlttOOCnejEMxOFkPNpXHJErD92NdGA1llXUtzL0,70329
|
20
20
|
not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
|
21
21
|
not1mm/data/cty.json,sha256=dPG9K1Pm4Rxd4uJom_gQ8y-sbqiZfILpl4kBAFnOveU,4877142
|
22
22
|
not1mm/data/cwmacros.txt,sha256=NztufsX6R52gAO7VyJ2AHr7wOh41pJTwHKh5Lcs32ds,468
|
@@ -112,9 +112,9 @@ not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
|
|
112
112
|
not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
|
113
113
|
not1mm/lib/plugin_common.py,sha256=AABdx9DoTT8Znrup7AkfmKGC22hshMsEypiMqV0iKw0,10671
|
114
114
|
not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
|
115
|
-
not1mm/lib/settings.py,sha256=
|
115
|
+
not1mm/lib/settings.py,sha256=pyCa6EUhDs97g1KTmWS8RLXCSbrB9ruv7LV48_nuEAk,13781
|
116
116
|
not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
|
117
|
-
not1mm/lib/version.py,sha256=
|
117
|
+
not1mm/lib/version.py,sha256=BVfhJOFbNpsOQC-VGvIE1WaBxXeaCFAcsvT7JJoC_Gs,49
|
118
118
|
not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
|
119
119
|
not1mm/plugins/10_10_fall_cw.py,sha256=AsvB2VUd6Qb2_FzZkSBkSd1_qeP8Dt-B-exF1Pzb9tk,14469
|
120
120
|
not1mm/plugins/10_10_spring_cw.py,sha256=nA4v0oqlp-ivvKqNPakb19I-wE_ElhvH5bCzDRx00JU,14474
|
@@ -162,9 +162,9 @@ not1mm/plugins/ref_ssb.py,sha256=G2Gz4kApchmOZQVnBexEokSEvdb-mZWJAfyJ1D6JDGY,204
|
|
162
162
|
not1mm/plugins/stew_perry_topband.py,sha256=Gy_vv6tgkR-3vmvsUVO0pVfHMkUJSxpt7G4secn0RH8,15084
|
163
163
|
not1mm/plugins/weekly_rtty.py,sha256=PI0_AtEdZZKGAuKnP-b2EYn9xwCN1Ablk38trbNP3Rc,19603
|
164
164
|
not1mm/plugins/winter_field_day.py,sha256=9w3tDL9ZWiENSTERc3vzDbBktvI7pnyNvlH6fDjAi08,14841
|
165
|
-
not1mm-24.11.
|
166
|
-
not1mm-24.11.
|
167
|
-
not1mm-24.11.
|
168
|
-
not1mm-24.11.
|
169
|
-
not1mm-24.11.
|
170
|
-
not1mm-24.11.
|
165
|
+
not1mm-24.11.27.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
166
|
+
not1mm-24.11.27.dist-info/METADATA,sha256=g0tZw6wt92Dez6gSk74-ELL6RtHR79YCrh5AxGvs0hs,36836
|
167
|
+
not1mm-24.11.27.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
|
168
|
+
not1mm-24.11.27.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
|
169
|
+
not1mm-24.11.27.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
|
170
|
+
not1mm-24.11.27.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|