not1mm 25.2.26__tar.gz → 25.3.1__tar.gz

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.
Files changed (180) hide show
  1. {not1mm-25.2.26 → not1mm-25.3.1}/PKG-INFO +4 -1
  2. {not1mm-25.2.26 → not1mm-25.3.1}/README.md +3 -0
  3. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/__main__.py +2 -0
  4. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/version.py +1 -1
  5. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm.egg-info/PKG-INFO +4 -1
  6. {not1mm-25.2.26 → not1mm-25.3.1}/pyproject.toml +1 -1
  7. {not1mm-25.2.26 → not1mm-25.3.1}/LICENSE +0 -0
  8. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/__init__.py +0 -0
  9. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/bandmap.py +0 -0
  10. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/checkwindow.py +0 -0
  11. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/JetBrainsMono-ExtraLight.ttf +0 -0
  12. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/MASTER.SCP +0 -0
  13. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/about.ui +0 -0
  14. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/alpha bravo charlie delta.txt +0 -0
  15. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/bandmap.ui +0 -0
  16. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/check.png +0 -0
  17. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/checkwindow.ui +0 -0
  18. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/configuration.ui +0 -0
  19. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/contests.sql +0 -0
  20. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/cty.json +0 -0
  21. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/cwmacros.txt +0 -0
  22. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/donors.html +0 -0
  23. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/editcontact.ui +0 -0
  24. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/editmacro.ui +0 -0
  25. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/greendot.png +0 -0
  26. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/k6gte-not1mm.desktop +0 -0
  27. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/k6gte.not1mm-128.png +0 -0
  28. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/k6gte.not1mm-32.png +0 -0
  29. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/k6gte.not1mm-64.png +0 -0
  30. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/logwindow.ui +0 -0
  31. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/logwindowx.ui +0 -0
  32. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/main.ui +0 -0
  33. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/new_contest.ui +0 -0
  34. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/not1mm.html +0 -0
  35. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/opon.ui +0 -0
  36. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/0.wav +0 -0
  37. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/1.wav +0 -0
  38. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/2.wav +0 -0
  39. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/3.wav +0 -0
  40. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/4.wav +0 -0
  41. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/5.wav +0 -0
  42. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/6.wav +0 -0
  43. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/7.wav +0 -0
  44. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/73.wav +0 -0
  45. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/8.wav +0 -0
  46. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/9.wav +0 -0
  47. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/a.wav +0 -0
  48. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/again.wav +0 -0
  49. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/b.wav +0 -0
  50. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/c.wav +0 -0
  51. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/contest.wav +0 -0
  52. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/cq.wav +0 -0
  53. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/cq2.wav +0 -0
  54. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/d.wav +0 -0
  55. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/e.wav +0 -0
  56. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/f.wav +0 -0
  57. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/g.wav +0 -0
  58. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/h.wav +0 -0
  59. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/i.wav +0 -0
  60. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/j.wav +0 -0
  61. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/k.wav +0 -0
  62. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/k6gte.wav +0 -0
  63. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/l.wav +0 -0
  64. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/m.wav +0 -0
  65. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/mynumber.wav +0 -0
  66. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/n.wav +0 -0
  67. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/nil.wav +0 -0
  68. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/o.wav +0 -0
  69. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/p.wav +0 -0
  70. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/q.wav +0 -0
  71. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/r.wav +0 -0
  72. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/roger.wav +0 -0
  73. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/s.wav +0 -0
  74. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/space.wav +0 -0
  75. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/t.wav +0 -0
  76. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/thankyou.wav +0 -0
  77. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/thankyouqrz.wav +0 -0
  78. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/u.wav +0 -0
  79. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/v.wav +0 -0
  80. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/w.wav +0 -0
  81. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/x.wav +0 -0
  82. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/y.wav +0 -0
  83. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/yourcall.wav +0 -0
  84. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/phonetics/z.wav +0 -0
  85. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/pickcontest.ui +0 -0
  86. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/radio_green.png +0 -0
  87. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/radio_grey.png +0 -0
  88. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/radio_red.png +0 -0
  89. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/ratewindow.ui +0 -0
  90. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/reddot.png +0 -0
  91. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/rttymacros.txt +0 -0
  92. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/settings.ui +0 -0
  93. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/splash.png +0 -0
  94. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/ssbmacros.txt +0 -0
  95. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/data/vfo.ui +0 -0
  96. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/fsutils.py +0 -0
  97. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/__init__.py +0 -0
  98. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/about.py +0 -0
  99. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/cat_interface.py +0 -0
  100. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/cwinterface.py +0 -0
  101. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/database.py +0 -0
  102. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/edit_contact.py +0 -0
  103. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/edit_macro.py +0 -0
  104. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/edit_opon.py +0 -0
  105. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/edit_station.py +0 -0
  106. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/fldigi_sendstring.py +0 -0
  107. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/ft8_watcher.py +0 -0
  108. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/ham_utility.py +0 -0
  109. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/lookup.py +0 -0
  110. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/multicast.py +0 -0
  111. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/n1mm.py +0 -0
  112. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/new_contest.py +0 -0
  113. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/plugin_common.py +0 -0
  114. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/select_contest.py +0 -0
  115. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/settings.py +0 -0
  116. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/super_check_partial.py +0 -0
  117. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lib/versiontest.py +0 -0
  118. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/logwindow.py +0 -0
  119. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/lookupservice.py +0 -0
  120. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/10_10_fall_cw.py +0 -0
  121. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/10_10_spring_cw.py +0 -0
  122. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/10_10_summer_phone.py +0 -0
  123. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/10_10_winter_phone.py +0 -0
  124. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/__init__.py +0 -0
  125. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_10m.py +0 -0
  126. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_160m.py +0 -0
  127. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_dx_cw.py +0 -0
  128. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_dx_ssb.py +0 -0
  129. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_field_day.py +0 -0
  130. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_rtty_ru.py +0 -0
  131. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_ss_cw.py +0 -0
  132. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_ss_phone.py +0 -0
  133. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_vhf_jan.py +0 -0
  134. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_vhf_jun.py +0 -0
  135. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/arrl_vhf_sep.py +0 -0
  136. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/canada_day.py +0 -0
  137. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/cq_160_cw.py +0 -0
  138. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/cq_160_ssb.py +0 -0
  139. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/cq_wpx_cw.py +0 -0
  140. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/cq_wpx_rtty.py +0 -0
  141. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/cq_wpx_ssb.py +0 -0
  142. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/cq_ww_cw.py +0 -0
  143. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/cq_ww_rtty.py +0 -0
  144. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/cq_ww_ssb.py +0 -0
  145. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/cwt.py +0 -0
  146. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/darc_xmas.py +0 -0
  147. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/general_logging.py +0 -0
  148. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/helvetia.py +0 -0
  149. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/iaru_fieldday_r1_cw.py +0 -0
  150. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/iaru_fieldday_r1_ssb.py +0 -0
  151. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/iaru_hf.py +0 -0
  152. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/icwc_mst.py +0 -0
  153. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/jidx_cw.py +0 -0
  154. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/jidx_ph.py +0 -0
  155. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/k1usn_sst.py +0 -0
  156. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/labre_rs_digi.py +0 -0
  157. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/lz-dx.py +0 -0
  158. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/naqp_cw.py +0 -0
  159. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/naqp_rtty.py +0 -0
  160. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/naqp_ssb.py +0 -0
  161. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/phone_weekly_test.py +0 -0
  162. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/raem.py +0 -0
  163. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/randomgram.py +0 -0
  164. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/ref_cw.py +0 -0
  165. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/ref_ssb.py +0 -0
  166. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/stew_perry_topband.py +0 -0
  167. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/weekly_rtty.py +0 -0
  168. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/plugins/winter_field_day.py +0 -0
  169. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/radio.py +0 -0
  170. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/ratewindow.py +0 -0
  171. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/rtc_service.py +0 -0
  172. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/test.py +0 -0
  173. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/vfo.py +0 -0
  174. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm/voice_keying.py +0 -0
  175. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm.egg-info/SOURCES.txt +0 -0
  176. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm.egg-info/dependency_links.txt +0 -0
  177. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm.egg-info/entry_points.txt +0 -0
  178. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm.egg-info/requires.txt +0 -0
  179. {not1mm-25.2.26 → not1mm-25.3.1}/not1mm.egg-info/top_level.txt +0 -0
  180. {not1mm-25.2.26 → not1mm-25.3.1}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: not1mm
3
- Version: 25.2.26
3
+ Version: 25.3.1
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
@@ -240,6 +240,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
240
240
 
241
241
  ## Recent Changes
242
242
 
243
+ - [25-3-1] Add {OTHER1} and {OTHER2} macros.
243
244
  - [25-2-26] Switch to a Run state if engaging auto_cq.
244
245
  - [25-2-22] Add Auto CQ.
245
246
  - [25-2-12] Merged PR from @alduhoo Adding RandomGram event.
@@ -680,6 +681,8 @@ You can include a limited set of substitution instructions.
680
681
  | {SNT} | Sends 5nn (cw) or 599 (ssb) |
681
682
  | {SENTNR} | Sends whats in the SentNR field. |
682
683
  | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
684
+ | {OTHER1} | Sends whats in the SentNR/Name field without altering it. |
685
+ | {OTHER2} | Sends whats in the Comment field without altering it. |
683
686
  | {LOGIT} | Log the contact after macro pressed. |
684
687
  | {MARK} | Mark the current call in the bandmap. |
685
688
  | {SPOT} | Spot the current call to the cluster. |
@@ -209,6 +209,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
209
209
 
210
210
  ## Recent Changes
211
211
 
212
+ - [25-3-1] Add {OTHER1} and {OTHER2} macros.
212
213
  - [25-2-26] Switch to a Run state if engaging auto_cq.
213
214
  - [25-2-22] Add Auto CQ.
214
215
  - [25-2-12] Merged PR from @alduhoo Adding RandomGram event.
@@ -649,6 +650,8 @@ You can include a limited set of substitution instructions.
649
650
  | {SNT} | Sends 5nn (cw) or 599 (ssb) |
650
651
  | {SENTNR} | Sends whats in the SentNR field. |
651
652
  | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
653
+ | {OTHER1} | Sends whats in the SentNR/Name field without altering it. |
654
+ | {OTHER2} | Sends whats in the Comment field without altering it. |
652
655
  | {LOGIT} | Log the contact after macro pressed. |
653
656
  | {MARK} | Mark the current call in the bandmap. |
654
657
  | {SPOT} | Spot the current call to the cluster. |
@@ -2773,6 +2773,8 @@ class MainWindow(QtWidgets.QMainWindow):
2773
2773
  macro = macro.replace("#", next_serial)
2774
2774
  macro = macro.replace("{MYCALL}", self.station.get("Call", ""))
2775
2775
  macro = macro.replace("{HISCALL}", self.callsign.text())
2776
+ macro = macro.replace("{OTHER1}", self.other_1.text())
2777
+ macro = macro.replace("{OTHER2}", self.other_2.text())
2776
2778
  if self.radio_state.get("mode") == "CW":
2777
2779
  macro = macro.replace("{SNT}", self.sent.text().replace("9", "n"))
2778
2780
  else:
@@ -1,3 +1,3 @@
1
1
  """It's the version"""
2
2
 
3
- __version__ = "25.2.26"
3
+ __version__ = "25.3.1"
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: not1mm
3
- Version: 25.2.26
3
+ Version: 25.3.1
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
@@ -240,6 +240,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
240
240
 
241
241
  ## Recent Changes
242
242
 
243
+ - [25-3-1] Add {OTHER1} and {OTHER2} macros.
243
244
  - [25-2-26] Switch to a Run state if engaging auto_cq.
244
245
  - [25-2-22] Add Auto CQ.
245
246
  - [25-2-12] Merged PR from @alduhoo Adding RandomGram event.
@@ -680,6 +681,8 @@ You can include a limited set of substitution instructions.
680
681
  | {SNT} | Sends 5nn (cw) or 599 (ssb) |
681
682
  | {SENTNR} | Sends whats in the SentNR field. |
682
683
  | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
684
+ | {OTHER1} | Sends whats in the SentNR/Name field without altering it. |
685
+ | {OTHER2} | Sends whats in the Comment field without altering it. |
683
686
  | {LOGIT} | Log the contact after macro pressed. |
684
687
  | {MARK} | Mark the current call in the bandmap. |
685
688
  | {SPOT} | Spot the current call to the cluster. |
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "not1mm"
7
- version = "25.2.26"
7
+ version = "25.3.1"
8
8
  description = "NOT1MM Logger"
9
9
  readme = "README.md"
10
10
  requires-python = ">=3.9"
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes