Commit graph

469 commits

Author SHA1 Message Date
DJ2LS
b637b917bc first attempt with message checksum 2022-12-27 22:57:54 +01:00
DJ2LS
76522db082 process rigctld response only if needed 2022-12-27 18:17:12 +01:00
DJ2LS
d572772df3 use busy detection while opening a channel 2022-12-27 17:11:46 +01:00
DJ2LS
424384c7ed 3nd test run with saving data from tnc 2022-12-26 10:49:37 +01:00
DJ2LS
e2d4b58e30 2nd test run with saving data from tnc 2022-12-26 10:35:58 +01:00
DJ2LS
76f24f2b31 first test run with saving data from tnc 2022-12-26 10:25:50 +01:00
DJ2LS
af851d15f3 beacon now with full grid 2022-12-25 17:08:20 +01:00
DJ2LS
f896dd84c5 reduced connection attempts to 10 2022-12-25 14:24:39 +01:00
DJ2LS
a946ca6555 dont send beacon when busy 2022-12-25 09:19:55 +01:00
DJ2LS
443d7931b7 small ctest adjustments 2022-12-24 23:13:21 +01:00
DJ2LS
33e0c2d497 disabled updating last received timestamp when sending nack 2022-12-24 18:39:51 +01:00
DJ2LS
af7c9cbafb reduced amount of n max retries per burst to fit which fits more to 180s timeout 2022-12-24 18:07:49 +01:00
DJ2LS
a546f0f387 better logging for debugging data received when in wrong tnc state 2022-12-24 17:55:31 +01:00
DJ2LS
f979fb3d7b increased logging for finding reason for failing ctest 2022-12-23 10:30:32 +01:00
DJ2LS
934bb20010
attempt fixing disconnect 2022-12-19 21:57:57 +01:00
DJ2LS
9d26472607 dxsnr for cq/qrv 2022-12-19 16:46:18 +01:00
DJ2LS
847c3928df some ssid fixes 2022-12-19 16:04:30 +01:00
DJ2LS
f64c4ff0dd some ssid fixes 2022-12-19 16:00:47 +01:00
DJ2LS
1937606526 some ssid fixes 2022-12-19 15:42:48 +01:00
DJ2LS
12d1477c36 another adjustments to cli tools 2022-12-16 17:09:48 +01:00
DJ2LS
dfa07f9e77 increased frame timeouts and better logging for debugging protocol error 2022-12-13 09:10:40 +01:00
DJ2LS
50bbcfd7ff increased frame timeouts and better logging for debugging protocol error 2022-12-13 08:59:10 +01:00
DJ2LS
819832127e attempt using lzma instead of zlib 2022-12-12 15:02:57 +01:00
DJ2LS
6e3edb5b30 attempt using threading.Event().wait() instead of time.sleep() 2022-12-12 12:28:52 +01:00
DJ2LS
10b925d70b fixed bug in listening state machine which caused high CPU load 2022-12-12 11:43:42 +01:00
DJ2LS
2cdea7eaa9 adjusted search range for rx buffer 2022-12-12 10:06:45 +01:00
DJ2LS
19bcde01b0 increased logging for frame nack 2022-12-11 13:07:56 +01:00
DJ2LS
2e12b2ed92 increase amount of NACK frames for failed data frame 2022-12-11 12:23:37 +01:00
DJ2LS
11512d76bf reduced logging and added transmit queue size for debugging purposes 2022-12-11 11:57:37 +01:00
DJ2LS
d9a7d392ce attempt with reduced transmission timeout to 180s 2022-12-11 11:13:55 +01:00
DJ2LS
8c0c13f227 attempt with increased data frame ACK 2022-12-11 11:00:58 +01:00
DJ2LS
ddf6cb0ee0 report IRS SNR for Ping 2022-12-10 20:46:17 +01:00
DJ2LS
f2dd278bce reduced minimum SNR for datac1 2022-12-09 14:55:09 +01:00
DJ2LS
83b3f6a71c process disconnect frame only while not disconnected 2022-12-07 17:02:24 +01:00
DJ2LS
12933e96b7 process disconnect frame only while not disconnected 2022-12-07 16:54:00 +01:00
DJ2LS
90c4bf9360 optimised ping and connection ssid 2022-12-07 16:30:59 +01:00
DJ2LS
c3f198fda9 make sure RX_BUFFER.maxsize is always int 2022-12-07 15:41:37 +01:00
DJ2LS
9468ceb6fc fixed a bug in callsign parsing 2022-12-05 16:57:45 +01:00
DJ2LS
02c08a71a8 better logging for modem_error_state 2022-12-05 15:49:10 +01:00
DJ2LS
ac62fe4448 more logging for TypeError when saving data 2022-12-05 15:46:57 +01:00
DJ2LS
d5a0464fd9 first attempt with catching modem error states for early NACK 2022-12-05 15:23:03 +01:00
DJ2LS
fa7360f1f3 catch python error for possible bug 2022-12-05 08:43:19 +01:00
DJ2LS
9941c7ea4d arq cleanup improvements 2022-12-05 08:23:18 +01:00
DJ2LS
8b2412de96 added respond to call 2022-12-04 16:56:12 +01:00
DJ2LS
45a5e60b2b small comment improvement 2022-12-04 16:12:56 +01:00
DJ2LS
37da268547 changed mycallsign / dxcallsign order for network-messages 2022-12-04 13:04:29 +01:00
DJ2LS
564f4c106e first version overriding own callsign ssid 2022-12-04 12:52:25 +01:00
DJ2LS
cd2b0dc133 fixed send raw callsign override 2022-12-04 12:22:35 +01:00
DJ2LS
966198a9c3 handle foreign pings 2022-12-03 14:05:39 +01:00
DJ2LS
913bce2ea5 handle foreign pings 2022-12-03 14:04:09 +01:00
DJ2LS
048b5c85b5 introduced self.dxcallsign 2022-12-03 13:59:05 +01:00
DJ2LS
df52b15e0f reduced arq session timer again for avoiding disconnection problems 2022-12-01 12:15:52 +01:00
DJ2LS
9295b8e8ed reduced timeouts - another attempt 2022-12-01 11:15:49 +01:00
DJ2LS
93e5d301cd increased arq timeout again to avoid timing issues 2022-12-01 10:14:52 +01:00
DJ2LS
f3defd8600 fixed network message 2022-12-01 10:09:44 +01:00
DJ2LS
b57fb299b4 improved network info messages for arq session, also increased heartbeat timer 2022-12-01 09:50:44 +01:00
DJ2LS
a25ff279ad better logging of network messages 2022-12-01 09:06:28 +01:00
DJ2LS
9314e680c9 small fix adding callsigns to network info messages 2022-12-01 09:04:11 +01:00
DJ2LS
af1fc99e23 improved logging for increasing speed level 2022-12-01 08:51:21 +01:00
DJ2LS
4cf35381c0 add mycallsign and dxcallsign to network message if they not exist 2022-11-30 19:35:23 +01:00
DJ2LS
f4c120bc37 added snr check before increasing speed level 2022-11-30 17:58:50 +01:00
DJ2LS
aab4fdf17f adjusted logging #289 2022-11-20 18:38:48 +01:00
DJ2LS
1811e4a02e adjusted logging #289 2022-11-20 18:37:44 +01:00
DJ2LS
4c877357f7 adjusted logging 2022-11-20 18:34:45 +01:00
DJ2LS
41d3c7fc82 disabled session-close double call and increase N disconnect frames 2022-11-20 16:39:42 +01:00
DJ2LS
d3f64ec60d added failed state to connect white list #289 2022-11-20 12:54:59 +01:00
DJ2LS
89369f8208 small fixes for #288 2022-11-20 12:03:45 +01:00
DJ2LS
ccff03705d small fixes for #288 2022-11-20 12:02:53 +01:00
DJ2LS
ea599f51e3 first test run with overriding connection attempts #288 2022-11-20 11:58:15 +01:00
DJ2LS
a8a643f15a first test run with overriding connection attempts #288 2022-11-20 11:54:43 +01:00
DJ2LS
38281ec06c first test run with overriding connection attempts #288 2022-11-20 11:44:29 +01:00
DJ2LS
7d99f89911 improved channel busy detection 2022-11-18 00:03:18 +01:00
DJ2LS
503fa52696 arq waiting modal if channel busy 2022-11-17 22:17:50 +01:00
DJ2LS
d71fb3c640 wait with arq transmission if channel busy 2022-11-17 22:09:16 +01:00
DJ2LS
cd9b8e5173 interrupt arq session while opening 2022-11-17 14:55:20 +01:00
DJ2LS
0326cf612a fixes #281 2022-11-12 12:40:32 +01:00
DJ2LS
61c813f141 first irs snr test 2022-11-11 12:57:14 +01:00
DJ2LS
b761471ec3 snr fix 2022-11-09 20:47:46 +01:00
DJ2LS
508fbe05af removed add to heard station when disconnecting closes #278 2022-11-09 12:19:56 +01:00
DJ2LS
37c69031da moved randbytes to np.random.bytes for python3.7 compatibility 2022-11-07 15:14:20 +01:00
dj2ls
58dd443325 added sig1 naming 2022-11-02 22:48:50 +01:00
dj2ls
6bb9932ce6 some pep8 changes 2022-11-02 15:29:22 +01:00
dj2ls
65dde27e6b small pep8 improvement 2022-10-28 11:11:47 +02:00
dj2ls
58e44a2dbb inline comment 2022-10-28 11:03:15 +02:00
dj2ls
4ce36dba5e inline comment 2022-10-28 11:02:23 +02:00
dj2ls
eea9ff9919 adjusted enqueue tx frame for N>1 frames and send ident frame after disconenct 2022-10-28 10:55:50 +02:00
dj2ls
5acdc338ba improved session disconnect inline documentation 2022-10-26 09:05:47 +02:00
dj2ls
7b0535193d improved session disconnect to avoid heartbeat toggle 2022-10-26 08:56:55 +02:00
dj2ls
9e312b3b3a increased waiting time for ARQ SESSION file transfer 2022-10-26 08:25:47 +02:00
Paul Kronenwetter
cf25cadc3c Suggested identification frame 2022-10-21 15:59:26 -04:00
dj2ls
616fb214d2 improved file transfer during arq session 2022-10-12 13:01:20 +02:00
dj2ls
5553009d74 improved file transfer during arq session 2022-10-12 12:54:37 +02:00
dj2ls
d98358b6ce first fixed connection session 2022-10-12 07:40:39 +02:00
dj2ls
dee94b0acb additional timeout logging 2022-10-10 10:20:56 +02:00
dj2ls
3600516a0b additional tx mode options when sending sig 2022-10-10 09:39:26 +02:00
dj2ls
b0e3d2286e enable sig modes only when needed 2022-10-10 09:00:45 +02:00
dj2ls
dad9230f3d dirty fix of stopping transmission 2022-10-06 11:57:54 +02:00
dj2ls
d365255a95 arq cleanup after sending close frames 2022-10-06 11:47:19 +02:00
dj2ls
d865edcfe7 removed delay between repeated frames 2022-10-06 11:36:14 +02:00
dj2ls
47f6e54b6d first working arq transmission with session id 2022-10-06 11:35:12 +02:00
dj2ls
1db840e1f4 attempt to fix rx data 2022-10-06 11:21:36 +02:00
dj2ls
7a682219cc several pep improvements 2022-10-05 20:27:38 +02:00
dj2ls
3d044189ac move to session id instead of crc 2022-10-05 19:24:50 +02:00
dj2ls
0bc136099c 4 carrier test 2022-09-16 17:28:00 +02:00
dj2ls
c0588f758a 3 carrier test 2022-09-16 17:07:58 +02:00
dj2ls
dba7f63de8 cleanup and improved logging 2022-09-08 15:47:23 +02:00
dj2ls
b3595fb033 cleanup and improved logging 2022-09-08 15:36:53 +02:00
dj2ls
f19381a6e5 first working SNR measured data channel 2022-09-08 15:21:45 +02:00
dj2ls
5f18c7a37b first test with SNR measurement on initial opening a data channel 2022-09-08 14:54:39 +02:00
dj2ls
cb37f39b66 increased connection attempts and reduced interval time 2022-09-08 11:18:50 +02:00
dj2ls
1924189bdc minor fix with different channel constellation 2022-09-08 10:18:47 +02:00
dj2ls
863444c010 change buffer size via gui, some small buffer improvements 2022-09-05 11:54:50 +02:00
dj2ls
42560fda6f buffer size as startup argment for tnc. Not yet changeable via GUI 2022-09-05 10:47:03 +02:00
dj2ls
830b62583b first version with RX_BUFFER as queue #233 2022-09-05 10:37:50 +02:00
dj2ls
dbffd1f01d removed mode 255 from mode list 2022-09-05 09:04:35 +02:00
Paul Kronenwetter
c84a4a29a1 Remove unused received_mycall_crc 2022-07-04 17:27:35 -04:00
Paul Kronenwetter
cd00eaa851 Restore Python 3.6 compatibility 2022-07-04 17:18:10 -04:00
Paul Kronenwetter
4a50c9c9d0 Remove compression factor calculation.
This is done in arq_transmit and should not be needed here.
2022-07-03 14:06:01 -04:00
Paul Kronenwetter
7f649f98df Extract queues from data_handler and modem.
Eliminates a cyclical import identified by pylint.
2022-07-03 13:41:06 -04:00
Paul Kronenwetter
9b7056a774 Misc additions. 2022-07-02 16:20:51 -04:00
Paul Kronenwetter
953e981e18 Avoid setting global / class state for unrelated frame. 2022-07-02 16:20:14 -04:00
Paul Kronenwetter
06c11e0537 Remove unnecessary callsign checks.
Add notes.
2022-07-02 16:19:33 -04:00
Paul Kronenwetter
ee82cfe967 Use dispatcher for command and received frame handling. 2022-07-02 16:14:05 -04:00
Paul Kronenwetter
5619a71340 Add information to sock logs.
Minor formatting changes.
Other minor log changes.
2022-06-24 14:55:59 -04:00
Paul Kronenwetter
5922c722ad
Merge branch 'main' into refactor_N2KIQ_data_enums 2022-06-24 10:03:42 -04:00
Paul Kronenwetter
1d760d61af Rename ACK to BURST_ACK. 2022-06-24 09:48:50 -04:00
Paul Kronenwetter
efc9950090 Remove manual mode. 2022-06-24 09:42:13 -04:00
Paul Kronenwetter
62cfdea72b Add FREEDV_MODE enum usage in test frame. 2022-06-24 09:39:56 -04:00
Paul Kronenwetter
d16e98f4cd Remove datac0 from high/low bandwidth mode lists.
Datac0 causes frame CRC errors, removing from mode lists.
Shorten codec2.FREEDV_MODE by import alias.
Use FREEDV_MODE enum in logs for easier debugging.
Minor reformatting.
2022-06-24 09:22:46 -04:00
Paul Kronenwetter
275e017a05 Restore a section errantly removed. 2022-06-23 18:16:32 -04:00
Paul Kronenwetter
4a23984360 Remove allmodes (255) option from TNC.
First attempt.
2022-06-21 18:47:18 -04:00
Paul Kronenwetter
55e229c62a Use FRAME_TYPE enum instead of plain int.
Update FRAME_TYPE enum for missing items.
2022-06-21 18:33:55 -04:00
Paul Kronenwetter
1deed67bfb
Merge pull request #219 from DJ2LS/issue_218_fix_with_test
Issue 218 fix with test
2022-06-20 20:02:14 -04:00
Paul Kronenwetter
9cb2cebddd Merge remote-tracking branch 'origin/main' into issue_205_ping_no_call 2022-06-19 17:11:21 -04:00
Paul Kronenwetter
71bc562189 Fix for issue #218. 2022-06-19 16:45:06 -04:00
Paul Kronenwetter
4a8f9ce6d0 Correct merge omission 2022-06-19 08:47:56 -04:00
Paul Kronenwetter
292754af2d Initial cut of fix for issue #206. 2022-06-17 19:48:47 -04:00
Paul Kronenwetter
f1b4f33eed Merge branch 'main' into tests_N2KIQ_202206 2022-06-17 06:45:03 -04:00
Paul Kronenwetter
b8ac18bc54
Merge branch 'main' into bugfix_issue_207 2022-06-15 20:06:31 -04:00
Paul Kronenwetter
f695e6e2af Collapse repeated code to a function.
Add function parameter and return types.
Move logging to a class variable.
Extended use of FREEDV_MODE enum.
Moved TESTING check to arq_cleanup.
2022-06-15 19:40:14 -04:00
Paul Kronenwetter
38f468adce Various refactorings.
Type hints, trailing backslash, range usage, etc.
2022-06-15 19:40:11 -04:00
Paul Kronenwetter
7d163ac189 Remove excess trailing spaces. 2022-06-15 19:37:55 -04:00
dj2ls
f758e10a35 removed static.INFO fields 2022-06-15 10:54:34 +02:00
dj2ls
5a2023b2c0 updated arq session state 2022-06-15 10:40:54 +02:00
dj2ls
a19a6c13c1 added qrv info toast 2022-06-09 21:31:12 +02:00
dj2ls
1909087c6b file transfer now working 2022-06-09 14:11:39 +02:00
dj2ls
a4df21c0a2 further changes of gui 2022-06-07 11:31:59 +02:00
dj2ls
8e4a3f4d33 first change of gui 2022-06-07 10:08:15 +02:00
dj2ls
0c0e8dd8ca use uuid and mycallsign within class 2022-06-06 21:07:41 +02:00
dj2ls
79f1f8e9b2 added simple message identifier 2022-06-06 20:50:36 +02:00
dj2ls
acd8b345c1 reduced message information 2022-06-06 20:44:35 +02:00
dj2ls
6613142fce updated messages 2022-06-06 20:31:15 +02:00
Paul Kronenwetter
4fd8c4932a Fix for issue #207.
Add a few debugging logs.
2022-06-05 14:09:38 -04:00
DJ2LS
d159a5140d first change of info fields 2022-06-05 19:11:09 +02:00
Paul Kronenwetter
8cc1e721b6 Make argument name more useful.
Also fix a missed bandwith -> bandwidth typo fix.
2022-05-30 16:40:58 -04:00
Paul Kronenwetter
ae3fafde8d Implement send_data_to_socket_queue.
Implements capability requested in issue 200.
Remove similar duplicated code in `arq_data_received`, `arq_transmit`,
`frame_nack_received`, `arq_open_data_channel`, `received_ping_ack`,
`received_beacon` and `received_qrv`.
2022-05-30 11:41:24 -04:00
Paul Kronenwetter
b0742e114a Correct usage of tempbuffer list. 2022-05-29 08:42:38 -04:00
Paul Kronenwetter
6a565ffe41 Merge branch 'main' into refactor_N2KIQ-202205-2 2022-05-28 11:52:05 -04:00
DJ2LS
1fa8f0f2ae smaller changes... 2022-05-28 14:31:58 +02:00
DJ2LS
adf800b822 changed bandwith typo --> this could break some things.. 2022-05-28 14:08:33 +02:00
Paul Kronenwetter
2fa9aead44 Another round of formatting changes.
Implement class-level logging in places.
2022-05-27 22:17:15 -04:00
Paul Kronenwetter
98c1030c24 Incorporate some changes from pep8_improvements.
Simplify structlog calls.
Other refactoring.
2022-05-25 21:23:30 -04:00
Paul Kronenwetter
08202bbaec Prefer double- over single-quote.
Other minor fixes.
2022-05-25 18:27:33 -04:00
DJ2LS
e05bc262ad and some more typos and whitespace correction.. 2022-05-23 14:26:14 +02:00
DJ2LS
507e3a5b06
Merge branch 'main' into pep8_improvements 2022-05-23 09:46:42 +02:00
DJ2LS
b6face744b First run reducing number of problems 2022-05-23 09:37:24 +02:00
Paul Kronenwetter
a456ff54f7 Use min/max for speed_level adjustments.
Rearranged more comments.
2022-05-22 22:13:43 -04:00
Paul Kronenwetter
ee1305a2dc Bandwidth spelling. 2022-05-22 21:11:40 -04:00
Paul Kronenwetter
2c0728770c Collapse repeated code to a function.
Add function parameter and return types.
Move logging to a class variable.
Extended use of FREEDV_MODE enum.
Moved TESTING check to arq_cleanup.
2022-05-22 20:54:12 -04:00
dj2ls
b62aa05dbe removed nested state check 2022-05-20 14:38:43 +02:00
dj2ls
5317c8081a fixed speed level 2022-05-19 22:37:27 +02:00
dj2ls
1f66f54f5f first attempt of fixing #189 2022-05-19 22:15:24 +02:00
Paul Kronenwetter
8a5e290a30 Various refactorings.
Type hints, trailing backslash, range usage, etc.
2022-05-15 11:07:56 -04:00
Paul Kronenwetter
3a70b87e21 Remove excess newlines. 2022-05-15 11:06:14 -04:00
Paul Kronenwetter
9753735c40 Remove excess trailing spaces. 2022-05-15 11:06:07 -04:00
Paul Kronenwetter
6e17caf3cf Making check_callsign evaluation more consistent. 2022-05-03 20:08:26 -04:00
Paul Kronenwetter
bcc15287c9
Corrects issue #173 fix
I didn't look carefully enough at `helpers.check_callsign` to see that it returns a list. The first element of the list is `True`/`False`.
2022-05-02 00:39:27 +00:00
Paul Kronenwetter
0e43f65bc2 Add function docstring to received_session_close. 2022-05-01 11:41:40 -04:00
Paul Kronenwetter
d2e38b77eb Implements another TODO from #173 .
Corrects previous fix as well.
2022-05-01 11:34:31 -04:00
Paul Kronenwetter
7b4f75f66c Implements TODO from #173 . 2022-05-01 11:07:54 -04:00
dj2ls
0e8e3d1b67 fixed file transfer for 24bit crc 2022-05-01 11:19:59 +02:00
dj2ls
ffff256623 arq disconnect improvement
this should fix and closes #173
2022-04-30 13:03:24 +02:00
Paul Kronenwetter
e4b901adad Adding callsign for ID after stop transmission. 2022-04-24 18:43:50 -04:00
Paul Kronenwetter
aefee60bad Initial attempt to fix issue #179. 2022-04-24 13:30:43 -04:00
dj2ls
107daa1b47 increased disconnect bursts
lets see if this improves
#173
2022-04-24 16:11:36 +02:00
dj2ls
57e4af83af first test with 24bit crc
moved from 16bit crc to 24bit crc...First test for ping and file transfer seems to be working... This has been too easy... 🤔
2022-04-19 11:09:11 +02:00
dj2ls
a90abb122f enable/disable cq response
Enable and disable CQ response via GUI. Also moved settings to settings modal - with a small redesign. Auto updater still WIP
2022-04-18 17:17:53 +02:00
dj2ls
88149830df first test with 6bit gridsquare encoding
same for grid as call - we should think about saving the callsign and gridsquare as string and not as bytes. Also increased disconnect burst number where a toggle loop occured...
2022-04-17 22:30:15 +02:00
dj2ls
53af74f757 first test with 6bit callsign encoding
seems to work, but we have to redesign the way how we handle callsigns. This is really confusing...
2022-04-17 22:16:13 +02:00
dj2ls
2daafd183a removed some info lines 2022-04-16 16:28:04 +02:00
Paul Kronenwetter
62b939fbc9 Replaced sleep with helpers.wait in transmit_qrv. 2022-04-15 19:59:12 -04:00
Paul Kronenwetter
9f9b5e98e2 Remove errant inclusion of NOCALL ping logging. 2022-04-15 15:24:12 -04:00
Paul Kronenwetter
82935dcaae Proof of concept automatic response to CQ.
Uses new QRV frame rather than new BREPLY frame. Also changes CQ
behavior to send only one frame instead of 3.
NOTE: This implementation will respond *three* times to previous release
software (v0.3.3-alpha.3 and earlier).
2022-04-15 15:17:14 -04:00
Paul Kronenwetter
08faa53f26 WIP: Proof of concept using BEACON and new BREPLY frames. 2022-04-15 14:41:20 -04:00
Paul Kronenwetter
195310dda1 Removing unneeded code.
Bytearray fills with zero upon allocation.
2022-04-15 11:26:53 -04:00
Paul Kronenwetter
802185b31a Removing commented frequency_offset code. 2022-04-15 11:03:14 -04:00
Paul Kronenwetter
02bc780dce Remove frequency_offset from received_ping. 2022-04-15 09:01:33 -04:00
DJ2LS
faefd84ae5 Revert "black code formatting"
This reverts commit 92cfa367f3.
2022-04-11 11:10:32 +02:00
dj2ls
92cfa367f3 black code formatting 2022-04-11 11:03:54 +02:00
Paul Kronenwetter
8e8a2c8432
Merge branch 'DJ2LS:main' into correct_typos 2022-04-10 17:32:50 -04:00