Roeland Jansen
dfc101eabe
Merge branch 'audio-enhance'
2021-08-07 21:35:55 +02:00
Phil Taylor
3a2db789a2
Add ritctl model to rigCaps
2021-08-07 18:34:34 +01:00
Phil Taylor
84261a49cc
Add split/duplex support
2021-08-07 13:34:47 +01:00
Roeland Jansen
69d2a374b6
Merge branch 'audio-enhance'
2021-08-07 11:33:00 +02:00
Phil Taylor
c4ed4d2de4
More rigctl features/fixes
2021-08-07 01:14:41 +01:00
Roeland Jansen
2a524fca1d
Merge branch 'audio-enhance'
2021-08-05 09:08:02 +02:00
Phil Taylor
1e2a0db604
More rigctld fixes
2021-08-05 01:23:15 +01:00
Phil Taylor
ee2cf70dc0
Add rigctld config to ui and fix some bugs
2021-08-04 20:49:32 +01:00
Roeland Jansen
3f1fc957ac
Merge branch 'ui-enhance'
2021-07-27 12:11:17 +02:00
Elliott Liggett
a777864a0b
Fixed error in IC-7410 attenuator spec.
2021-07-26 09:03:09 -07:00
Roeland Jansen
886ca86a90
Merge branch 'ui-enhance'
2021-07-20 08:07:28 +02:00
Elliott Liggett
decdfe370b
Added center tuning for IC-R8600, partially moved meter balistics
...
(average and peak) to the meter class.
2021-07-18 14:27:21 -07:00
Phil Taylor
0440097f53
Add missing break
2021-07-16 20:14:59 +01:00
Phil Taylor
e4dea63029
Get antenna status on start-up and slow poll for it.
2021-07-16 19:33:15 +01:00
Phil Taylor
e40545cf77
Add RX antenna selection for rigs that support it
2021-07-16 17:08:55 +01:00
Elliott Liggett
b6cac33ee9
Added more support for the IC-7600 in rigCaps.
2021-07-09 15:15:04 -07:00
Elliott Liggett
e50b032716
Added time, date, and UTC offset commands. Currently initiated by the
...
debug button. There seems to be a bug in the 7300 where the UTC offset
has one hour subtracted, ie, -7 HRS becomes -8 HRS. The hex command
appears to be sent correctly.
2021-07-09 12:02:50 -07:00
Elliott Liggett
9799e4f745
Added local af gain and wf length to the preferences.
2021-07-05 16:45:19 -07:00
Elliott Liggett
df6a0fbc33
Mode changes from the combo box now use the que. There are still other
...
methods to change mode which will transition shortly.
2021-06-25 23:56:19 -07:00
Elliott Liggett
241f0db2c3
Quick hack for WFM
2021-06-24 12:40:23 -07:00
Elliott Liggett
761dbd18a0
New unified outgoing command queue. Tested on IC-9700 and IC-718 (to
...
remote wfview server). CPU usage seems higher but please check your
system.
Timing seems to be acceptable but could probably use some tweaks. S-
meter polling is 25ms for fast radios, and slower rates for slower
radios. Half-duplex serial radios receive 3x slower polling to make room
for replies.
For Freq, Mode, etc "regular" constant polling (new feature):
IC-9700 polling is 5 per second, IC-718 is 1-2 per second.
Just helps keep the UI in sync with changes taking place at the rig. The
polling is slow enough that it doesn't impact anything. But quick enough
that it catches discrepencies pretty quickly.
2021-06-20 13:34:32 -07:00
Elliott Liggett
2508b4d71c
Additional support for the IC-R8600, including wider scope spans.
2021-06-18 22:45:12 -07:00
Elliott Liggett
cc92aa1b5c
Added full duplex comms parameter to rigCaps. We assume half-duplex
...
until we receive a reply to rigID.
2021-06-18 12:41:56 -07:00
Elliott Liggett
2392bdd932
Additional data corruption checking.
2021-06-15 10:28:20 -07:00
Elliott Liggett
9664238917
Preliminary IC-718 support. Very basic.
2021-06-08 14:42:19 -07:00
Elliott Liggett
f78a60482b
Merge remote-tracking branch 'origin/rtaudio' into sequence
...
Accepted "theirs" for merge issues.
Conflicts:
audiohandler.h
wfview.pro
2021-06-05 22:37:24 -07:00
Phil Taylor
24ce16b0b9
Add QtMultimedia as default audio
2021-06-04 08:24:26 +01:00
Elliott Liggett
71b5cc4755
Merge remote-tracking branch 'origin/rtaudio' into sequence
2021-06-02 09:27:28 -07:00
Phil Taylor
c7c4a326da
Fix for crash when remote requests tone.
2021-06-01 00:25:20 +01:00
Elliott Liggett
82e57b1fc4
IC-7700 support
2021-05-31 14:01:13 -07:00
Elliott Liggett
b5167a6a97
Waterfal length may now be adjusted. Let's see what range of length
...
seems good and limit the control accordingly. Also there may be a memory
leak in the prepareWf() function where the colormap is created when the
image is resized.
2021-05-30 23:26:36 -07:00
Elliott Liggett
d601983beb
CIV may now be changed as-needed while running.
2021-05-30 15:08:22 -07:00
Roeland Jansen
7ea69b88e4
Merge branch 'lan-alpha'
2021-05-22 20:18:17 +02:00
Phil Taylor
5ee6ff48ba
Add debugging and fix silly error in audiooutput combobox
2021-05-22 17:02:51 +01:00
Phil Taylor
aab453a782
Stop preamps/attenuators lists growing every time we reconnect.
2021-05-22 09:50:45 +01:00
Elliott Liggett
d4f46e60f1
Changed method for adding modes to rigs and populating the rig menu.
...
This should be easier to maintain and better in the long run.
2021-05-21 23:46:15 -07:00
Elliott Liggett
e7bbc13d31
Fixed missing break in switchs.
2021-05-21 15:26:40 -07:00
Phil Taylor
b669605e11
Add baud rate detection for remote rigs
2021-05-21 16:30:52 +01:00
Elliott Liggett
d776fb4331
Added IC-756 Pro. Tested UI and back-end response with 7300 and fake
...
RigID reply.
2021-05-20 16:15:25 -07:00
Elliott Liggett
8e85d0365f
Added additional support for the IC-756 Pro III. Essentially untested.
2021-05-20 15:57:30 -07:00
Phil Taylor
b5d6063269
Merge branch 'ui-enhance' into lan-alpha
2021-05-20 08:32:15 +01:00
Phil Taylor
e30cf248af
Add more features to rigstate
2021-05-20 08:31:51 +01:00
Elliott Liggett
a717ce4565
Model ID text format fixed. Shows IC-0x followed by the raw rig ID
...
received.
2021-05-19 21:51:24 -07:00
Elliott Liggett
75aea11c39
Fixed issue where unknown rigs were identified as 0xff. All rigs are now
...
identified using rigCaps.modelID, populated with the raw response from
the Rig ID query. Enumerations of known rig types continue to fall into
rigCaps.model, and unknwn rigs will match to rigCaps.model=modelUnknown,
as before.
2021-05-19 21:47:14 -07:00
Elliott Liggett
7857680845
Changed UI a little, and added manual CI-V options. Seems to work well.
2021-05-18 00:29:06 -07:00
Elliott Liggett
851c8a6e62
Fixed attenuator on IC-7000
2021-05-16 19:45:26 -07:00
Elliott Liggett
fddda526ae
Added IC-7200 support. This has not been tested.
2021-05-16 00:07:24 -07:00
Elliott Liggett
45e1c9d817
Change to correct bug when CI-V is user-specified and rigCaps were never
...
populated.
2021-05-15 16:57:08 -07:00
Elliott Liggett
cb0f5f6e84
Making the s-meter error command easier to read.
2021-05-15 15:36:57 -07:00
Phil Taylor
8f135b8ddd
Add --debug option to increase debugging for release builds
2021-05-15 18:53:16 +01:00
Elliott Liggett
a6f336c384
BSR debug code.
2021-05-15 10:10:08 -07:00
Elliott Liggett
e148bc94f4
Added basic IC-7410 rigcaps. Have not gone further than this with the
...
rig.
2021-05-14 23:58:22 -07:00
Elliott Liggett
e3a6207cbd
Selecting an antenna now sets that antenna for TX and RX.
2021-05-14 20:12:16 -07:00
Elliott Liggett
6e087a9e4b
Filter selection now checks for data mode.
2021-05-14 19:49:37 -07:00
Elliott Liggett
497b4c8743
Preliminary IC-7000 support. TODO: Input selection, modes, filters,
...
reported bug with frequency input and s-meter.
2021-05-14 19:04:47 -07:00
Elliott Liggett
908ec96567
Data Mode now sends the currently selected filter.
2021-05-08 23:46:44 -07:00
Elliott Liggett
51fcf4f583
Preliminary (and untested) support for the IC-910H.
2021-05-08 13:45:52 -07:00
Elliott Liggett
5a034a7ebd
Found a missing default in a switch case.
2021-05-08 13:33:05 -07:00
Elliott Liggett
d16f92bd7e
removing debug info we didn't need.
2021-05-07 23:26:45 -07:00
Elliott Liggett
3a9967cb8c
Fixed BSR mode and filter selection.
2021-05-07 15:46:47 -07:00
Elliott Liggett
14b0ba2151
The band stacking register now uses the newer integer frequency parsing.
...
We also communicate a little slower to the serial rigs, which seems more
reliable.
2021-05-07 14:52:19 -07:00
Phil Taylor
e041e6d1c5
Add code to select virtual serial port
2021-05-05 14:11:00 +01:00
Roeland Jansen
ce7a70872e
reverted last change -- need to modify the display code here, not rigcaps
2021-05-04 18:42:14 +02:00
Roeland Jansen
64e0b0f2c4
ant sel starts with '1' on the rigs
2021-05-04 18:31:45 +02:00
Elliott Liggett
5daeb0506d
Unified frequency-type MHz to use same code as Hz.
2021-05-01 21:53:05 -07:00
Elliott Liggett
6251cc4342
Added more modes for the IC-R8600.
2021-05-01 00:54:42 -07:00
Elliott Liggett
fa869dd270
Different timing on command polling for serial rigs.
2021-04-30 22:15:30 -07:00
Elliott Liggett
e6c5980287
Merge remote-tracking branch 'origin/lan-alpha' into ui-enhance
2021-04-29 17:02:14 -07:00
Elliott Liggett
e67f3efa42
Merge branch 'ui-enhance' of gitlab.com:eliggett/wfview into ui-enhance
2021-04-27 20:36:41 -07:00
Elliott Liggett
96a32f9069
Additional bands added, Airband, WFM
2021-04-27 20:18:17 -07:00
Roeland Jansen
42acb81450
added 630/2200m for 705; probably like the 7300 hardly useable for TX though. Also added auomatic switching to the view pane after non-BSR bands are selected
2021-04-27 21:49:31 +02:00
Roeland Jansen
b5a943c333
added 630/2200m to 7300/7610/785x
2021-04-27 21:39:31 +02:00
Phil Taylor
e5746dcc82
Merge branch 'ui-enhance' into lan-alpha
2021-04-27 09:01:12 +01:00
Elliott Liggett
7109c2b396
Added dynamic band buttons. Fixed multiple bugs related to various
...
differences in band stacking register addresses (for example, the GEN
band on the 705 has a different address from the 7100 and the 7300).
This code was only tested with the 9700.
2021-04-26 18:24:28 -07:00
Phil Taylor
119d328b17
Merge branch 'ui-enhance' into lan-alpha
2021-04-25 10:58:40 +01:00
Phil Taylor
40ba0385ca
More work on rigctld
2021-04-25 10:58:25 +01:00
Elliott Liggett
80cc3e6dc0
Added ability to read RIT status. Added RIT to initial rig query. Added
...
variables to handle delayed command timing values. Fixed bug in
frequency parsing code that had existed for some time. Changed tic marks
on RIT knob because I wanted more of them. Bumped startup initial rig
state queries to 100ms. May consider faster queries on startup since we
are going to need more things queried on startup.
2021-04-25 00:23:52 -07:00
Elliott Liggett
f619e9eca1
Receiver Incremental Tuning is in. The UI does not check the rig's
...
initial state yet, but the functions are partially in rigCommander for
that purpose.
2021-04-24 00:31:51 -07:00
Elliott Liggett
5bfb287294
Found two missing defaults in switch cases inside rigcommander.cpp.
2021-04-23 23:24:34 -07:00
Phil Taylor
93fc8a9f67
Merge branch 'ui-enhance' into lan-alpha
2021-04-21 09:17:31 +01:00
Elliott Liggett
3fa0dfaecd
Merge remote-tracking branch 'origin/lan-alpha' into ui-enhance
2021-04-20 08:54:23 -07:00
Phil Taylor
6623c2ced0
rigctl working (sort of) with WSJT-X
2021-04-20 12:29:10 +01:00
Elliott Liggett
2e5a4f05a4
Preliminary commit for power-on and power-off functionality. Is not
...
correct for most rigs.
2021-04-19 22:55:39 -07:00
Elliott Liggett
3f2a66f8f8
Added ATU featureon 7610.
2021-04-11 16:38:58 +00:00
Elliott Liggett
ce3c4dfe54
Now grabs scope state on startup. Found bug, did not fix, in the
...
frequency parsing code. Worked aroud it by using doubles for now.
2021-04-11 00:42:25 -07:00
Elliott Liggett
aac777eb07
Preamp and attenuator are now queried on startup. Additionally, the
...
preamp is checked when the attenuator is changed, and the attenuator is
checked with the preamp is changed. This helps the user understand if
the rig allows only one or the other to be active (such as the IC-9700).
2021-04-10 22:48:32 -07:00
Elliott Liggett
6b967a52b9
Antenna selection might work, untested.
2021-04-09 15:57:16 -07:00
Elliott Liggett
aff2e281e8
Preamp code is in. Can't read the current preamp state yet but we can
...
set it. Nicer names for preamp and attenuator menu items.
2021-04-09 10:04:20 -07:00
Elliott Liggett
2cbbb26f00
Preamp data is now tracked (but not used yet)
2021-04-08 00:05:40 -07:00
Elliott Liggett
92f019b787
Attenuators are in! Please try them out!
2021-04-07 23:35:24 -07:00
Elliott Liggett
e4bbf62474
We can now read the repeater access mode and update the UI. What remains
...
is to be able to set the mode.
2021-04-04 23:46:44 -07:00
Elliott Liggett
e7f2d1eba8
Working read/write of Tone, TSQL, and DTCS tones/code. Some code is also
...
present now to change the mode being used (tone, tsql, DTCS, or some
combo of the two).
2021-04-04 23:33:56 -07:00
Elliott Liggett
8cc78e37bb
Tone, TSQL, and DTCS code added, but not complete.
2021-04-04 00:36:21 -07:00
Phil Taylor
6bba4eb6dc
Set AFGain to 100% on LAN connections
2021-03-23 18:19:47 +00:00
Phil Taylor
c2091e9c4e
Add local volume control for UDP connections.
2021-03-22 18:53:34 +00:00
Elliott Liggett
a26a352389
Changed frequency parameters to (mostly) unsigned 64-bit ints. This
...
makes all the rounding code very simple and removes many annoying lines
of code designed to handle errors induced by using doubles for the
frequency.
2021-03-22 00:11:43 -07:00
Elliott Liggett
4df9b66d8b
Removed extra debug.
2021-03-07 15:53:34 -08:00
Phil Taylor
7f7e4b9d52
Stop input combos growing every time rig is reconnected.
2021-03-06 09:07:23 +00:00
Phil Taylor
80e0e808e2
Fixes for pty
2021-03-05 12:53:23 +00:00
Phil Taylor
51883a4e0e
Revert "Update rigcommander.cpp"
...
This reverts commit c3b8f32bb6
.
2021-03-04 23:44:45 +00:00
Phil Taylor
c3b8f32bb6
Update rigcommander.cpp
2021-03-04 23:44:22 +00:00
Phil Taylor
adaabec575
Move pseudoterm into dedicated class
2021-03-04 20:19:05 +00:00
Elliott Liggett
b6440c7973
Removed old testing code.
2021-03-02 23:26:20 -08:00
Elliott Liggett
f1cb92c996
Quieter debugging.
2021-03-02 22:11:01 -08:00
Elliott Liggett
260b48f07f
Merge remote-tracking branch 'origin/lan-alpha' into ui-enhance
2021-03-02 20:47:56 -08:00
Elliott Liggett
8a04c23d7f
Started work on sending out the current span to the UI of the spectrum.
2021-03-02 20:47:20 -08:00
Phil Taylor
91a60bf918
Create udpPreferences struct and remove civPort and audioPort from UI
2021-03-01 19:53:12 +00:00
Phil Taylor
18b287a047
Merge remote-tracking branch 'origin/ui-enhance' into lan-alpha
2021-03-01 08:30:04 +00:00
Elliott Liggett
5577aebf8b
Removed the last annoying legs of the center/fixed two-mode system.
2021-02-28 21:47:45 -08:00
Elliott Liggett
5a673e256c
Added support for Scroll modes in latest firmware. Removed setCenter...
...
signals and replaced with setScopeMode signals. Fixed a bug where we
could not query the scope mode.
2021-02-28 21:41:27 -08:00
Phil Taylor
b4ea60e5d2
Merge remote-tracking branch 'origin/ui-enhance' into lan-alpha
2021-02-28 20:23:31 +00:00
Phil Taylor
aef03a6b7e
Add audio handling to UDP server
2021-02-28 20:10:07 +00:00
Roeland Jansen
005b25a635
added 0 to model number in reference command to 7300
2021-02-27 21:18:26 +01:00
Elliott Liggett
8dcda65d1c
More changes for Edge 4 with regards to updated firmware.
2021-02-27 00:05:06 -08:00
Elliott Liggett
0b22ef27ab
Added support for 4 fixed scope edges. Untested.
2021-02-26 20:12:17 -08:00
Phil Taylor
27eb855adb
Create rx audio packets with timestamp
...
Lots of other changes but if this works OK, I will update tx audio to use the same system.
2021-02-27 00:37:00 +00:00
Elliott Liggett
6b67c0ab2b
2-day old code merge: remote-tracking branch 'origin/lan-alpha' into ui-enhance
2021-02-26 00:13:52 -08:00
Elliott Liggett
af2191da16
Cleaned up meter code, we can now query any meter we wish very easily,
...
either queued or directly.
2021-02-25 23:57:37 -08:00
Elliott Liggett
b14c8392c7
Fixed meter polling issue.
2021-02-25 22:51:43 -08:00
Phil Taylor
ef79801081
Add logging categories
2021-02-23 21:21:22 +00:00
Phil Taylor
6c54421f16
Fix small Windows compile warnings
2021-02-22 11:11:08 +00:00
Elliott Liggett
24d802597a
Removed more unneeded debug and three unused functions. Just cleaning
...
house.
2021-02-21 22:13:21 -08:00
Elliott Liggett
c4113aea6f
Cleaned out some qDebug() that wasn't needed anymore. Output is now very
...
quiet on "release" type builds.
2021-02-21 21:54:25 -08:00
Phil Taylor
ba0509ba61
Fix txaudio and move udphandler into its own thread
2021-02-21 14:53:42 +00:00
Elliott Liggett
c3e0fa7dbd
S-Meter working! Power meter working!
...
Needs more testing, but it's here! 100ms polling time.
2021-02-20 20:41:19 -08:00
Elliott Liggett
a9d430b271
Merge remote-tracking branch 'origin/lan-alpha' into ui-enhance
2021-02-20 00:23:58 -08:00
Elliott Liggett
9793b9e1cb
Audio input gain slider now adjusts whatever the active MOD source is.
...
Text follows drop-down menu selection.
2021-02-20 00:05:23 -08:00
Phil Taylor
69db5e0efc
Another fix for the server crash.
2021-02-19 09:32:30 +00:00
Elliott Liggett
3538e545d9
We can now set the modulation input and read the modulation input for
...
both data on and data off.
Next step is to change the "Mic" slider to adjust whatever input is
selected.
2021-02-19 00:14:40 -08:00
Elliott Liggett
98d9c470c5
Merge remote-tracking branch 'origin/lan-alpha' into ui-enhance
2021-02-18 21:48:09 -08:00
Elliott Liggett
5c50b82dba
Duplex controls now function. NB: "Auto" mode works as follows: User
...
selects "auto", rig does nothing, user changes frequency or band, and
then, the rig will automatically select the correct duplex mode. This is
the same way the rig works from the front panel.
2021-02-18 21:47:19 -08:00
Phil Taylor
cf1ee895cf
Fix error when deleting server connections
...
I still think that maybe this should be done better?
2021-02-18 13:49:19 +00:00
Phil Taylor
ba60181c69
Merge remote-tracking branch 'origin/ui-enhance' into lan-alpha
2021-02-18 09:15:01 +00:00
Phil Taylor
7966568f17
Connect Civ to/from server
2021-02-18 09:14:41 +00:00
Elliott Liggett
3c93dc5fd0
Added code to get and set split and duplex mode. Untested.
2021-02-17 23:41:01 -08:00
Elliott Liggett
ce2f20753c
Completed code to set and get modulation levels for ACC, USB, and LAN
...
sources, as well as source selection/verification.
2021-02-17 23:26:10 -08:00
Elliott Liggett
a229fc9ccb
Contains code to set modulation input (mic, acc, usb, lan), and to set
...
the gain of each type. Is not tested.
2021-02-17 00:00:28 -08:00
Elliott Liggett
2c9e46626e
Preliminary changes to UI for repeater duplex. Staged change in
...
rigcommander.
2021-02-15 23:52:14 -08:00
Elliott Liggett
ca2a8e1235
Added code to check the scope reference level. Will add a on-startup
...
check next.
2021-02-15 22:33:21 -08:00
Elliott Liggett
a0e9392617
Added scope reference setting. Write-only for now. UI slider works.
2021-02-15 21:40:31 -08:00
Elliott Liggett
6938ed8a60
Full support for set and read mic gain and tx power. Code also exists to
...
set and read microphone compressor level, vox gain, anti vox, and self
audio monitor.
2021-02-15 20:32:14 -08:00
Elliott Liggett
91ce7f16d0
Added more support for levels (TX power and Mic Gain). Does not change
...
levels, just displays on debug button.
2021-02-15 17:15:28 -08:00
Elliott Liggett
7d0b926958
Added request and parse functions for most level and metering data.
2021-02-15 15:17:48 -08:00
Elliott Liggett
de09bac4c4
Fixed issue decoding reference adjust values.
2021-02-14 22:59:44 -08:00
Elliott Liggett
66e02a045a
Filters are now read correctly from mode messages. Filter setup menu is
...
still a placeholder.
2021-02-13 23:42:51 -08:00
Elliott Liggett
5d3c386c87
Added filter selection support.
...
TODO: Read current filter from rig.
2021-02-13 10:02:45 -08:00
Elliott Liggett
47276bfaa3
Fixed issue with DV and LSB modes.
2021-02-12 23:35:17 -08:00
Elliott Liggett
be52cb49bb
Fixed DD and DV mode selection.
2021-02-12 23:18:01 -08:00
Elliott Liggett
9f2d64d943
Added per-rig customization to UI: Modes and ATU status.
2021-02-12 22:42:34 -08:00
Elliott Liggett
50c638ed4b
Added preliminary support for IC-R8600. Untested.
2021-02-12 11:52:16 -08:00