Added ability to select ADC1 or ADC2 from the floating rcvr widget.

2018-01-13 08:07:56 -05:00
parent 7f760f11ed
commit efde2f1a1f
16 changed files with 328 additions and 49 deletions
@@ -1,7 +1,7 @@
 [General]
-cudaSDR%20BETA%20=v0.3.2.13
+cudaSDR%20BETA=v0.3.2.13+
 cudaSDR%20BETA%20=v0.3.2.13+
-saved=Friday 29 December 2017 10:07:10
+saved=Saturday 13 January 2018 08:01:05

 [ChirpWSPR]
 chirpAmplitude=75
@@ -114,8 +114,8 @@ pennylane=false
 audio_port=15000
 hpsdr_local_ipAddress=192.168.1.1
 listen_port=11000
-metis_port=49359
-server_ipAddress=192.168.15.1
+metis_port=50792
+server_ipAddress=192.168.1.1
 server_port=52685
 socketBufferSize=32

@@ -167,6 +167,7 @@ txState80m=0
 txStateGen=0

 [receiver0]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -201,7 +202,7 @@ attenuatorGen=off
 audioVolume=34
 averaging=on
 averagingCnt=5
-centerFrequency=3716500
+centerFrequency=3713673
 clickVFO=on
 dBmPanScaleMax10cm=-10
 dBmPanScaleMax10m=-30
@@ -297,8 +298,8 @@ lastCenterFrequency60m=5260000
 lastCenterFrequency630m=472000
 lastCenterFrequency6m=50000000
 lastCenterFrequency70cm=420000000
-lastCenterFrequency80m=3716500
-lastCenterFrequencyGen=1375098
+lastCenterFrequency80m=3713673
+lastCenterFrequencyGen=1374997
 lastVfoFrequency10cm=902000000
 lastVfoFrequency10m=28676442
 lastVfoFrequency125cm=222000000
@@ -319,17 +320,18 @@ lastVfoFrequency60m=5260000
 lastVfoFrequency630m=472000
 lastVfoFrequency6m=50000000
 lastVfoFrequency70cm=420000000
-lastVfoFrequency80m=3740100
-lastVfoFrequencyGen=13959500
+lastVfoFrequency80m=3793000
+lastVfoFrequencyGen=1371299
 mouseWheelFreqStep=100
 panLocked=off
 panMode=FILLEDLINE
-vfoFrequency=3740100
+vfoFrequency=3793000
 waterfallMode=ENHANCED
 waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver1]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -364,7 +366,7 @@ attenuatorGen=off
 audioVolume=40
 averaging=on
 averagingCnt=5
-centerFrequency=28000000
+centerFrequency=14209365
 clickVFO=on
 dBmPanScaleMax10cm=-10
 dBmPanScaleMax10m=-53
@@ -374,7 +376,7 @@ dBmPanScaleMax13cm=-10
 dBmPanScaleMax15m=-10
 dBmPanScaleMax160m=-19
 dBmPanScaleMax17m=-10
-dBmPanScaleMax20m=-34
+dBmPanScaleMax20m=-15
 dBmPanScaleMax2200m=-10
 dBmPanScaleMax23cm=-10
 dBmPanScaleMax2m=-10
@@ -386,7 +388,7 @@ dBmPanScaleMax60m=-10
 dBmPanScaleMax630m=-10
 dBmPanScaleMax6m=-10
 dBmPanScaleMax70cm=-10
-dBmPanScaleMax80m=-44
+dBmPanScaleMax80m=-49
 dBmPanScaleMaxGen=-10
 dBmPanScaleMin10cm=-120
 dBmPanScaleMin10m=-163
@@ -396,7 +398,7 @@ dBmPanScaleMin13cm=-120
 dBmPanScaleMin15m=-120
 dBmPanScaleMin160m=-129
 dBmPanScaleMin17m=-120
-dBmPanScaleMin20m=-144
+dBmPanScaleMin20m=-125
 dBmPanScaleMin2200m=-120
 dBmPanScaleMin23cm=-120
 dBmPanScaleMin2m=-120
@@ -408,7 +410,7 @@ dBmPanScaleMin60m=-120
 dBmPanScaleMin630m=-120
 dBmPanScaleMin6m=-120
 dBmPanScaleMin70cm=-120
-dBmPanScaleMin80m=-154
+dBmPanScaleMin80m=-159
 dBmPanScaleMinGen=-120
 dspCore=qtdsp
 dspMode10cm=LSB
@@ -434,8 +436,8 @@ dspMode70cm=LSB
 dspMode80m=LSB
 dspModeGen=LSB
 fftAuto=off
-filterHi=-150
-filterLo=-3050
+filterHi=3050
+filterLo=150
 framesPerSecond=25
 freqRulerPosition=5
 grid=on
@@ -461,16 +463,16 @@ lastCenterFrequency630m=472000
 lastCenterFrequency6m=50000000
 lastCenterFrequency70cm=420000000
 lastCenterFrequency80m=3673284
-lastCenterFrequencyGen=7201153
+lastCenterFrequencyGen=27998784
 lastVfoFrequency10cm=902000000
-lastVfoFrequency10m=28000000
+lastVfoFrequency10m=28025492
 lastVfoFrequency125cm=222000000
 lastVfoFrequency12m=24890000
 lastVfoFrequency13cm=902000000
 lastVfoFrequency15m=21000000
 lastVfoFrequency160m=1864900
 lastVfoFrequency17m=18068000
-lastVfoFrequency20m=14255000
+lastVfoFrequency20m=14219200
 lastVfoFrequency2200m=135700
 lastVfoFrequency23cm=902000000
 lastVfoFrequency2m=144000000
@@ -483,16 +485,17 @@ lastVfoFrequency630m=472000
 lastVfoFrequency6m=50000000
 lastVfoFrequency70cm=420000000
 lastVfoFrequency80m=3680200
-lastVfoFrequencyGen=27958000
+lastVfoFrequencyGen=27980600
 mouseWheelFreqStep=100
 panLocked=off
 panMode=FILLEDLINE
-vfoFrequency=28000000
+vfoFrequency=14219200
 waterfallMode=ENHANCED
 waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver10]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -656,6 +659,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver11]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -700,7 +704,7 @@ dBmPanScaleMax13cm=-10
 dBmPanScaleMax15m=-10
 dBmPanScaleMax160m=-19
 dBmPanScaleMax17m=-10
-dBmPanScaleMax20m=-10
+dBmPanScaleMax20m=-23
 dBmPanScaleMax2200m=-10
 dBmPanScaleMax23cm=-10
 dBmPanScaleMax2m=-10
@@ -722,7 +726,7 @@ dBmPanScaleMin13cm=-120
 dBmPanScaleMin15m=-120
 dBmPanScaleMin160m=-129
 dBmPanScaleMin17m=-120
-dBmPanScaleMin20m=-120
+dBmPanScaleMin20m=-133
 dBmPanScaleMin2200m=-120
 dBmPanScaleMin23cm=-120
 dBmPanScaleMin2m=-120
@@ -819,6 +823,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver12]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -853,7 +858,7 @@ attenuatorGen=off
 audioVolume=23
 averaging=on
 averagingCnt=5
-centerFrequency=7000000
+centerFrequency=7012632
 clickVFO=on
 dBmPanScaleMax10cm=-10
 dBmPanScaleMax10m=-10
@@ -869,7 +874,7 @@ dBmPanScaleMax23cm=-10
 dBmPanScaleMax2m=-10
 dBmPanScaleMax30m=-10
 dBmPanScaleMax33cm=-10
-dBmPanScaleMax40m=-10
+dBmPanScaleMax40m=-23
 dBmPanScaleMax5cm=-10
 dBmPanScaleMax60m=-10
 dBmPanScaleMax630m=-10
@@ -891,7 +896,7 @@ dBmPanScaleMin23cm=-120
 dBmPanScaleMin2m=-120
 dBmPanScaleMin30m=-120
 dBmPanScaleMin33cm=-120
-dBmPanScaleMin40m=-120
+dBmPanScaleMin40m=-133
 dBmPanScaleMin5cm=-120
 dBmPanScaleMin60m=-120
 dBmPanScaleMin630m=-120
@@ -943,7 +948,7 @@ lastCenterFrequency23cm=902000000
 lastCenterFrequency2m=144000000
 lastCenterFrequency30m=10100000
 lastCenterFrequency33cm=902000000
-lastCenterFrequency40m=7000000
+lastCenterFrequency40m=7012632
 lastCenterFrequency5cm=902000000
 lastCenterFrequency60m=5260000
 lastCenterFrequency630m=472000
@@ -965,7 +970,7 @@ lastVfoFrequency23cm=902000000
 lastVfoFrequency2m=144000000
 lastVfoFrequency30m=10117200
 lastVfoFrequency33cm=902000000
-lastVfoFrequency40m=7000000
+lastVfoFrequency40m=7019532
 lastVfoFrequency5cm=902000000
 lastVfoFrequency60m=5260000
 lastVfoFrequency630m=472000
@@ -976,12 +981,13 @@ lastVfoFrequencyGen=10051000
 mouseWheelFreqStep=100
 panLocked=off
 panMode=FILLEDLINE
-vfoFrequency=7000000
+vfoFrequency=7019532
 waterfallMode=ENHANCED
 waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver13]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -1145,6 +1151,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver14]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -1308,6 +1315,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver15]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -1365,7 +1373,7 @@ dBmPanScaleMax630m=-10
 dBmPanScaleMax6m=-5
 dBmPanScaleMax70cm=-10
 dBmPanScaleMax80m=-9
-dBmPanScaleMaxGen=-3
+dBmPanScaleMaxGen=-30
 dBmPanScaleMin10cm=-120
 dBmPanScaleMin10m=-136
 dBmPanScaleMin125cm=-120
@@ -1387,7 +1395,7 @@ dBmPanScaleMin630m=-120
 dBmPanScaleMin6m=-115
 dBmPanScaleMin70cm=-120
 dBmPanScaleMin80m=-119
-dBmPanScaleMinGen=-113
+dBmPanScaleMinGen=-140
 dspCore=qtdsp
 dspMode10cm=LSB
 dspMode10m=LSB
@@ -1471,6 +1479,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver16]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -1634,6 +1643,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver17]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -1797,6 +1807,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver18]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -1960,6 +1971,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver19]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -2123,6 +2135,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver2]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -2157,7 +2170,7 @@ attenuatorGen=off
 audioVolume=23
 averaging=on
 averagingCnt=5
-centerFrequency=10100000
+centerFrequency=10099616
 clickVFO=on
 dBmPanScaleMax10cm=-10
 dBmPanScaleMax10m=-10
@@ -2254,7 +2267,7 @@ lastCenterFrequency630m=472000
 lastCenterFrequency6m=50000000
 lastCenterFrequency70cm=420000000
 lastCenterFrequency80m=3672000
-lastCenterFrequencyGen=1800000
+lastCenterFrequencyGen=10099616
 lastVfoFrequency10cm=902000000
 lastVfoFrequency10m=28000000
 lastVfoFrequency125cm=222000000
@@ -2267,7 +2280,7 @@ lastVfoFrequency20m=14000000
 lastVfoFrequency2200m=135700
 lastVfoFrequency23cm=902000000
 lastVfoFrequency2m=144000000
-lastVfoFrequency30m=10117200
+lastVfoFrequency30m=10116816
 lastVfoFrequency33cm=902000000
 lastVfoFrequency40m=7000000
 lastVfoFrequency5cm=902000000
@@ -2280,12 +2293,13 @@ lastVfoFrequencyGen=10051000
 mouseWheelFreqStep=100
 panLocked=off
 panMode=FILLEDLINE
-vfoFrequency=10117200
+vfoFrequency=10116816
 waterfallMode=ENHANCED
 waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver3]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -2432,7 +2446,7 @@ lastVfoFrequency23cm=902000000
 lastVfoFrequency2m=144000000
 lastVfoFrequency30m=10117200
 lastVfoFrequency33cm=902000000
-lastVfoFrequency40m=7067548
+lastVfoFrequency40m=7122200
 lastVfoFrequency5cm=902000000
 lastVfoFrequency60m=5260000
 lastVfoFrequency630m=472000
@@ -2443,12 +2457,13 @@ lastVfoFrequencyGen=10051000
 mouseWheelFreqStep=100
 panLocked=off
 panMode=FILLEDLINE
-vfoFrequency=7067548
+vfoFrequency=7122200
 waterfallMode=ENHANCED
 waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver4]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -2612,6 +2627,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver5]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -2775,6 +2791,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver6]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -2938,6 +2955,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver7]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -3101,6 +3119,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver8]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30
@@ -3264,6 +3283,7 @@ waterfallOffsetHi=20
 waterfallOffsetLo=-5

 [receiver9]
+adcMode=ADC1
 agcAttacktime=1
 agcDecaytime=250
 agcFixedGain=30