diff --git a/rigs/IC-785x.rig b/rigs/IC-785x.rig index fc0a8f0..9551b36 100644 --- a/rigs/IC-785x.rig +++ b/rigs/IC-785x.rig @@ -262,482 +262,477 @@ Commands\48\String=\\x15\\x05 Commands\48\Min=0 Commands\48\Max=255 Commands\48\Command29=true -Commands\49\Type=Overflow Status -Commands\49\String=\\x15\\x07 +Commands\49\Type=Power Meter +Commands\49\String=\\x15\\x11 Commands\49\Min=0 -Commands\49\Max=1 -Commands\49\Command29=true -Commands\50\Type=Power Meter -Commands\50\String=\\x15\\x11 +Commands\49\Max=255 +Commands\49\Command29=false +Commands\50\Type=SWR Meter +Commands\50\String=\\x15\\x12 Commands\50\Min=0 Commands\50\Max=255 Commands\50\Command29=false -Commands\51\Type=SWR Meter -Commands\51\String=\\x15\\x12 +Commands\51\Type=ALC Meter +Commands\51\String=\\x15\\x13 Commands\51\Min=0 Commands\51\Max=255 Commands\51\Command29=false -Commands\52\Type=ALC Meter -Commands\52\String=\\x15\\x13 +Commands\52\Type=Comp Meter +Commands\52\String=\\x15\\x14 Commands\52\Min=0 Commands\52\Max=255 Commands\52\Command29=false -Commands\53\Type=Comp Meter -Commands\53\String=\\x15\\x14 +Commands\53\Type=Vd Meter +Commands\53\String=\\x15\\x15 Commands\53\Min=0 Commands\53\Max=255 Commands\53\Command29=false -Commands\54\Type=Vd Meter -Commands\54\String=\\x15\\x15 +Commands\54\Type=Id Meter +Commands\54\String=\\x15\\x16 Commands\54\Min=0 Commands\54\Max=255 Commands\54\Command29=false -Commands\55\Type=Id Meter -Commands\55\String=\\x15\\x16 +Commands\55\Type=Preamp Status +Commands\55\String=\\x16\\x02 Commands\55\Min=0 -Commands\55\Max=255 -Commands\55\Command29=false -Commands\56\Type=Preamp Status -Commands\56\String=\\x16\\x02 +Commands\55\Max=2 +Commands\55\Command29=true +Commands\56\Type=AGC Time Constant +Commands\56\String=\\x16\\x12 Commands\56\Min=0 -Commands\56\Max=2 +Commands\56\Max=3 Commands\56\Command29=true -Commands\57\Type=AGC Time Constant -Commands\57\String=\\x16\\x12 +Commands\57\Type=Noise Blanker +Commands\57\String=\\x16\\x22 Commands\57\Min=0 -Commands\57\Max=3 +Commands\57\Max=1 Commands\57\Command29=true -Commands\58\Type=Noise Blanker -Commands\58\String=\\x16\\x22 +Commands\58\Type=Audio Peak Filter +Commands\58\String=\\x16\\x32 Commands\58\Min=0 -Commands\58\Max=1 +Commands\58\Max=3 Commands\58\Command29=true -Commands\59\Type=Audio Peak Filter -Commands\59\String=\\x16\\x32 +Commands\59\Type=Noise Reduction +Commands\59\String=\\x16\\x40 Commands\59\Min=0 -Commands\59\Max=3 +Commands\59\Max=1 Commands\59\Command29=true -Commands\60\Type=Noise Reduction -Commands\60\String=\\x16\\x40 +Commands\60\Type=Auto Notch +Commands\60\String=\\x16\\x41 Commands\60\Min=0 Commands\60\Max=1 Commands\60\Command29=true -Commands\61\Type=Auto Notch -Commands\61\String=\\x16\\x41 +Commands\61\Type=Repeater Tone +Commands\61\String=\\x16\\x42 Commands\61\Min=0 Commands\61\Max=1 Commands\61\Command29=true -Commands\62\Type=Repeater Tone -Commands\62\String=\\x16\\x42 +Commands\62\Type=Repeater TSQL +Commands\62\String=\\x16\\x43 Commands\62\Min=0 Commands\62\Max=1 Commands\62\Command29=true -Commands\63\Type=Repeater TSQL -Commands\63\String=\\x16\\x43 +Commands\63\Type=Compressor Status +Commands\63\String=\\x16\\x44 Commands\63\Min=0 Commands\63\Max=1 -Commands\63\Command29=true -Commands\64\Type=Compressor Status -Commands\64\String=\\x16\\x44 +Commands\63\Command29=false +Commands\64\Type=Monitor Status +Commands\64\String=\\x16\\x45 Commands\64\Min=0 Commands\64\Max=1 Commands\64\Command29=false -Commands\65\Type=Monitor Status -Commands\65\String=\\x16\\x45 +Commands\65\Type=Vox Status +Commands\65\String=\\x16\\x46 Commands\65\Min=0 Commands\65\Max=1 Commands\65\Command29=false -Commands\66\Type=Vox Status -Commands\66\String=\\x16\\x46 +Commands\66\Type=Break-In Status +Commands\66\String=\\x16\\x47 Commands\66\Min=0 Commands\66\Max=1 Commands\66\Command29=false -Commands\67\Type=Break-In Status -Commands\67\String=\\x16\\x47 +Commands\67\Type=Manual Notch +Commands\67\String=\\x16\\x48 Commands\67\Min=0 Commands\67\Max=1 -Commands\67\Command29=false -Commands\68\Type=Manual Notch -Commands\68\String=\\x16\\x48 +Commands\67\Command29=true +Commands\68\Type=DIGI-Sel Status +Commands\68\String=\\x16\\x4e Commands\68\Min=0 Commands\68\Max=1 Commands\68\Command29=true -Commands\69\Type=DIGI-Sel Status -Commands\69\String=\\x16\\x4e +Commands\69\Type=Twin Peak Filter +Commands\69\String=\\x16\\x4f Commands\69\Min=0 Commands\69\Max=1 Commands\69\Command29=true -Commands\70\Type=Twin Peak Filter -Commands\70\String=\\x16\\x4f +Commands\70\Type=Dial Lock Status +Commands\70\String=\\x16\\x50 Commands\70\Min=0 Commands\70\Max=1 -Commands\70\Command29=true -Commands\71\Type=Dial Lock Status -Commands\71\String=\\x16\\x50 +Commands\70\Command29=false +Commands\71\Type=RX Antenna +Commands\71\String=\\x16\\x53 Commands\71\Min=0 Commands\71\Max=1 -Commands\71\Command29=false -Commands\72\Type=RX Antenna -Commands\72\String=\\x16\\x53 +Commands\71\Command29=true +Commands\72\Type=DSP IF Filter +Commands\72\String=\\x16\\x56 Commands\72\Min=0 Commands\72\Max=1 Commands\72\Command29=true -Commands\73\Type=DSP IF Filter -Commands\73\String=\\x16\\x56 +Commands\73\Type=SSB Bandwidth +Commands\73\String=\\x16\\x58 Commands\73\Min=0 -Commands\73\Max=1 -Commands\73\Command29=true -Commands\74\Type=SSB Bandwidth -Commands\74\String=\\x16\\x58 +Commands\73\Max=2 +Commands\73\Command29=false +Commands\74\Type=Main/Sub Tracking +Commands\74\String=\\x16\\x5e Commands\74\Min=0 -Commands\74\Max=2 +Commands\74\Max=1 Commands\74\Command29=false -Commands\75\Type=Main/Sub Tracking -Commands\75\String=\\x16\\x5e +Commands\75\Type=IP Plus Status +Commands\75\String=\\x16\\x65 Commands\75\Min=0 Commands\75\Max=1 -Commands\75\Command29=false -Commands\76\Type=IP Plus Status -Commands\76\String=\\x16\\x65 +Commands\75\Command29=true +Commands\76\Type=Send CW +Commands\76\String=\\x17 Commands\76\Min=0 -Commands\76\Max=1 -Commands\76\Command29=true -Commands\77\Type=Send CW -Commands\77\String=\\x17 +Commands\76\Max=30 +Commands\76\Command29=false +Commands\77\Type=Power Control +Commands\77\String=\\x18 Commands\77\Min=0 -Commands\77\Max=30 +Commands\77\Max=1 Commands\77\Command29=false -Commands\78\Type=Power Control -Commands\78\String=\\x18 +Commands\78\Type=Transceiver ID +Commands\78\String=\\x19 Commands\78\Min=0 -Commands\78\Max=1 +Commands\78\Max=0 Commands\78\Command29=false -Commands\79\Type=Transceiver ID -Commands\79\String=\\x19 -Commands\79\Min=0 -Commands\79\Max=0 +Commands\79\Type=Memory Contents +Commands\79\String=\\x1a\\00 +Commands\79\Min=1 +Commands\79\Max=101 Commands\79\Command29=false -Commands\80\Type=Memory Contents -Commands\80\String=\\x1a\\00 +Commands\80\Type=Band Stacking Reg +Commands\80\String=\\x1a\\x01 Commands\80\Min=1 -Commands\80\Max=101 +Commands\80\Max=11 Commands\80\Command29=false -Commands\81\Type=Band Stacking Reg -Commands\81\String=\\x1a\\x01 -Commands\81\Min=1 -Commands\81\Max=11 -Commands\81\Command29=false -Commands\82\Type=Filter Width -Commands\82\String=\\x1a\\x03 +Commands\81\Type=Filter Width +Commands\81\String=\\x1a\\x03 +Commands\81\Min=0 +Commands\81\Max=10000 +Commands\81\Command29=true +Commands\82\Type=Quick Split +Commands\82\String=\\x1a\\x05\\x00\\x33 Commands\82\Min=0 -Commands\82\Max=10000 +Commands\82\Max=1 Commands\82\Command29=true -Commands\83\Type=Quick Split -Commands\83\String=\\x1a\\x05\\x00\\x33 +Commands\83\Type=ACC1 Mod Level +Commands\83\String=\\x1a\\x05\\x00\\x58 Commands\83\Min=0 -Commands\83\Max=1 -Commands\83\Command29=true -Commands\84\Type=ACC1 Mod Level -Commands\84\String=\\x1a\\x05\\x00\\x58 +Commands\83\Max=255 +Commands\83\Command29=false +Commands\84\Type=ACC2 Mod Level +Commands\84\String=\\x1a\\x05\\x00\\x59 Commands\84\Min=0 Commands\84\Max=255 Commands\84\Command29=false -Commands\85\Type=ACC2 Mod Level -Commands\85\String=\\x1a\\x05\\x00\\x59 +Commands\85\Type=USB Mod Level +Commands\85\String=\\x1a\\x05\\x00\\x61 Commands\85\Min=0 Commands\85\Max=255 Commands\85\Command29=false -Commands\86\Type=USB Mod Level -Commands\86\String=\\x1a\\x05\\x00\\x61 +Commands\86\Type=LAN Mod Level +Commands\86\String=\\x1a\\x05\\x00\\x62 Commands\86\Min=0 Commands\86\Max=255 Commands\86\Command29=false -Commands\87\Type=LAN Mod Level -Commands\87\String=\\x1a\\x05\\x00\\x62 +Commands\87\Type=Data Off Mod Input +Commands\87\String=\\x1a\\x05\\x00\\x63 Commands\87\Min=0 -Commands\87\Max=255 +Commands\87\Max=10 Commands\87\Command29=false -Commands\88\Type=Data Off Mod Input -Commands\88\String=\\x1a\\x05\\x00\\x63 +Commands\88\Type=DATA1 Mod Input +Commands\88\String=\\x1a\\x05\\x00\\x64 Commands\88\Min=0 Commands\88\Max=10 Commands\88\Command29=false -Commands\89\Type=DATA1 Mod Input -Commands\89\String=\\x1a\\x05\\x00\\x64 +Commands\89\Type=DATA2 Mod Input +Commands\89\String=\\x1a\\x05\\x00\\x65 Commands\89\Min=0 Commands\89\Max=10 Commands\89\Command29=false -Commands\90\Type=DATA2 Mod Input -Commands\90\String=\\x1a\\x05\\x00\\x65 +Commands\90\Type=DATA3 Mod Input +Commands\90\String=\\x1a\\x05\\x00\\x66 Commands\90\Min=0 Commands\90\Max=10 Commands\90\Command29=false -Commands\91\Type=DATA3 Mod Input -Commands\91\String=\\x1a\\x05\\x00\\x66 +Commands\91\Type=REF Adjust +Commands\91\String=\\x1a\\x05\\x00\\x75 Commands\91\Min=0 -Commands\91\Max=10 +Commands\91\Max=255 Commands\91\Command29=false -Commands\92\Type=REF Adjust -Commands\92\String=\\x1a\\x05\\x00\\x75 +Commands\92\Type=System Date +Commands\92\String=\\x1a\\x05\\x00\\x95 Commands\92\Min=0 -Commands\92\Max=255 +Commands\92\Max=0 Commands\92\Command29=false -Commands\93\Type=System Date -Commands\93\String=\\x1a\\x05\\x00\\x95 +Commands\93\Type=System Time +Commands\93\String=\\x1a\\x05\\x00\\x96 Commands\93\Min=0 Commands\93\Max=0 Commands\93\Command29=false -Commands\94\Type=System Time -Commands\94\String=\\x1a\\x05\\x00\\x96 +Commands\94\Type=CLOCK2 Setting +Commands\94\String=\\x1a\\x05\\x01\\x00 Commands\94\Min=0 Commands\94\Max=0 Commands\94\Command29=false -Commands\95\Type=CLOCK2 Setting -Commands\95\String=\\x1a\\x05\\x01\\x00 +Commands\95\Type=CLOCK2 UTC Offset +Commands\95\String=\\x1a\\x05\\x01\\x01 Commands\95\Min=0 Commands\95\Max=0 Commands\95\Command29=false -Commands\96\Type=CLOCK2 UTC Offset +Commands\96\Type=UTC Offset Commands\96\String=\\x1a\\x05\\x01\\x01 Commands\96\Min=0 Commands\96\Max=0 Commands\96\Command29=false -Commands\97\Type=UTC Offset -Commands\97\String=\\x1a\\x05\\x01\\x01 +Commands\97\Type=CLOCK 2 Name +Commands\97\String=\\x1a\\x05\\x01\\x02 Commands\97\Min=0 Commands\97\Max=0 Commands\97\Command29=false -Commands\98\Type=CLOCK 2 Name -Commands\98\String=\\x1a\\x05\\x01\\x02 +Commands\98\Type=Quick Dual Watch +Commands\98\String=\\x1a\\x05\\x01\\x12 Commands\98\Min=0 -Commands\98\Max=0 +Commands\98\Max=1 Commands\98\Command29=false -Commands\99\Type=Quick Dual Watch -Commands\99\String=\\x1a\\x05\\x01\\x12 +Commands\99\Type=CIV Transceive +Commands\99\String=\\x1a\\x05\\x01\\x55 Commands\99\Min=0 Commands\99\Max=1 Commands\99\Command29=false -Commands\100\Type=CIV Transceive -Commands\100\String=\\x1a\\x05\\x01\\x55 -Commands\100\Min=0 -Commands\100\Max=1 +Commands\100\Type=Dash Ratio +Commands\100\String=\\x1a\\x05\\x02\\x51 +Commands\100\Min=28 +Commands\100\Max=45 Commands\100\Command29=false -Commands\101\Type=Dash Ratio -Commands\101\String=\\x1a\\x05\\x02\\x51 -Commands\101\Min=28 -Commands\101\Max=45 -Commands\101\Command29=false -Commands\102\Type=Data Mode Filter -Commands\102\String=\\x1a\\x06 +Commands\101\Type=Data Mode Filter +Commands\101\String=\\x1a\\x06 +Commands\101\Min=0 +Commands\101\Max=65535 +Commands\101\Command29=true +Commands\102\Type=AF Mute Status +Commands\102\String=\\x1a\\x09 Commands\102\Min=0 -Commands\102\Max=65535 +Commands\102\Max=1 Commands\102\Command29=true -Commands\103\Type=AF Mute Status -Commands\103\String=\\x1a\\x09 +Commands\103\Type=Transceiver Status +Commands\103\String=\\x1c\\x00 Commands\103\Min=0 Commands\103\Max=1 -Commands\103\Command29=true -Commands\104\Type=Transceiver Status -Commands\104\String=\\x1c\\x00 +Commands\103\Command29=false +Commands\104\Type=Tuner/ATU Status +Commands\104\String=\\x1c\\x01 Commands\104\Min=0 Commands\104\Max=1 Commands\104\Command29=false -Commands\105\Type=Tuner/ATU Status -Commands\105\String=\\x1c\\x01 +Commands\105\Type=XFC Status +Commands\105\String=\\x1c\\x02 Commands\105\Min=0 Commands\105\Max=1 Commands\105\Command29=false -Commands\106\Type=XFC Status -Commands\106\String=\\x1c\\x02 +Commands\106\Type=Read TX Freq +Commands\106\String=\\x1c\\x03 Commands\106\Min=0 Commands\106\Max=1 Commands\106\Command29=false -Commands\107\Type=Read TX Freq -Commands\107\String=\\x1c\\x03 +Commands\107\Type=CI-V Output +Commands\107\String=\\x1c\\x04 Commands\107\Min=0 Commands\107\Max=1 Commands\107\Command29=false -Commands\108\Type=CI-V Output -Commands\108\String=\\x1c\\x04 -Commands\108\Min=0 -Commands\108\Max=1 +Commands\108\Type=RIT Frequency +Commands\108\String=\\x21\\x00 +Commands\108\Min=-9999 +Commands\108\Max=9999 Commands\108\Command29=false -Commands\109\Type=RIT Frequency -Commands\109\String=\\x21\\x00 -Commands\109\Min=-9999 -Commands\109\Max=9999 +Commands\109\Type=RIT Status +Commands\109\String=\\x21\\x01 +Commands\109\Min=0 +Commands\109\Max=1 Commands\109\Command29=false -Commands\110\Type=RIT Status -Commands\110\String=\\x21\\x01 +Commands\110\Type=RIT TX Status +Commands\110\String=\\x21\\x02 Commands\110\Min=0 Commands\110\Max=1 Commands\110\Command29=false -Commands\111\Type=RIT TX Status -Commands\111\String=\\x21\\x02 +Commands\111\Type=Selected Freq +Commands\111\String=\\x25\\x00 Commands\111\Min=0 -Commands\111\Max=1 +Commands\111\Max=0 Commands\111\Command29=false -Commands\112\Type=Selected Freq -Commands\112\String=\\x25\\x00 +Commands\112\Type=Unselected Freq +Commands\112\String=\\x25\\x01 Commands\112\Min=0 Commands\112\Max=0 Commands\112\Command29=false -Commands\113\Type=Unselected Freq -Commands\113\String=\\x25\\x01 +Commands\113\Type=Selected Mode +Commands\113\String=\\x26\\x00 Commands\113\Min=0 Commands\113\Max=0 Commands\113\Command29=false -Commands\114\Type=Selected Mode -Commands\114\String=\\x26\\x00 +Commands\114\Type=Unselected Mode +Commands\114\String=\\x26\\x01 Commands\114\Min=0 Commands\114\Max=0 Commands\114\Command29=false -Commands\115\Type=Unselected Mode -Commands\115\String=\\x26\\x01 +Commands\115\Type=Scope Main Wave Data +Commands\115\String=\\x27\\x00\\x00 Commands\115\Min=0 Commands\115\Max=0 Commands\115\Command29=false -Commands\116\Type=Scope Main Wave Data -Commands\116\String=\\x27\\x00\\x00 +Commands\116\Type=Scope Sub Wave Data +Commands\116\String=\\x27\\x00\\x01 Commands\116\Min=0 Commands\116\Max=0 Commands\116\Command29=false -Commands\117\Type=Scope Sub Wave Data -Commands\117\String=\\x27\\x00\\x01 +Commands\117\Type=Scope On/Off +Commands\117\String=\\x27\\x10 Commands\117\Min=0 -Commands\117\Max=0 +Commands\117\Max=1 Commands\117\Command29=false -Commands\118\Type=Scope On/Off -Commands\118\String=\\x27\\x10 +Commands\118\Type=Scope Data Output +Commands\118\String=\\x27\\x11 Commands\118\Min=0 Commands\118\Max=1 Commands\118\Command29=false -Commands\119\Type=Scope Data Output -Commands\119\String=\\x27\\x11 +Commands\119\Type=Scope Main/Sub +Commands\119\String=\\x27\\x12 Commands\119\Min=0 Commands\119\Max=1 Commands\119\Command29=false -Commands\120\Type=Scope Main/Sub -Commands\120\String=\\x27\\x12 +Commands\120\Type=Scope Single/Dual +Commands\120\String=\\x27\\x13 Commands\120\Min=0 Commands\120\Max=1 Commands\120\Command29=false -Commands\121\Type=Scope Single/Dual -Commands\121\String=\\x27\\x13 +Commands\121\Type=Scope Main Mode +Commands\121\String=\\x27\\x14\\x00 Commands\121\Min=0 -Commands\121\Max=1 +Commands\121\Max=4 Commands\121\Command29=false -Commands\122\Type=Scope Main Mode -Commands\122\String=\\x27\\x14\\x00 +Commands\122\Type=Scope Sub Mode +Commands\122\String=\\x27\\x14\\x01 Commands\122\Min=0 Commands\122\Max=4 Commands\122\Command29=false -Commands\123\Type=Scope Sub Mode -Commands\123\String=\\x27\\x14\\x01 +Commands\123\Type=Scope Main Span +Commands\123\String=\\x27\\x15\\x00 Commands\123\Min=0 -Commands\123\Max=4 +Commands\123\Max=7 Commands\123\Command29=false -Commands\124\Type=Scope Main Span -Commands\124\String=\\x27\\x15\\x00 +Commands\124\Type=Scope Sub Span +Commands\124\String=\\x27\\x15\\x01 Commands\124\Min=0 Commands\124\Max=7 Commands\124\Command29=false -Commands\125\Type=Scope Sub Span -Commands\125\String=\\x27\\x15\\x01 -Commands\125\Min=0 -Commands\125\Max=7 +Commands\125\Type=Scope Main Edge +Commands\125\String=\\x27\\x16\\x00 +Commands\125\Min=1 +Commands\125\Max=4 Commands\125\Command29=false -Commands\126\Type=Scope Main Edge -Commands\126\String=\\x27\\x16\\x00 +Commands\126\Type=Scope Sub Edge +Commands\126\String=\\x27\\x16\\x01 Commands\126\Min=1 Commands\126\Max=4 Commands\126\Command29=false -Commands\127\Type=Scope Sub Edge -Commands\127\String=\\x27\\x16\\x01 -Commands\127\Min=1 -Commands\127\Max=4 +Commands\127\Type=Scope Main Hold +Commands\127\String=\\x27\\x17\\x00 +Commands\127\Min=0 +Commands\127\Max=1 Commands\127\Command29=false -Commands\128\Type=Scope Main Hold -Commands\128\String=\\x27\\x17\\x00 +Commands\128\Type=Scope Sub Hold +Commands\128\String=\\x27\\x17\\x01 Commands\128\Min=0 Commands\128\Max=1 Commands\128\Command29=false -Commands\129\Type=Scope Sub Hold -Commands\129\String=\\x27\\x17\\x01 -Commands\129\Min=0 -Commands\129\Max=1 +Commands\129\Type=Scope Main Ref +Commands\129\String=\\x27\\x19\\x00 +Commands\129\Min=-30 +Commands\129\Max=10 Commands\129\Command29=false -Commands\130\Type=Scope Main Ref -Commands\130\String=\\x27\\x19\\x00 +Commands\130\Type=Scope Sub Ref +Commands\130\String=\\x27\\x19\\x01 Commands\130\Min=-30 Commands\130\Max=10 Commands\130\Command29=false -Commands\131\Type=Scope Sub Ref -Commands\131\String=\\x27\\x19\\x01 -Commands\131\Min=-30 -Commands\131\Max=10 +Commands\131\Type=Scope Main Speed +Commands\131\String=\\x27\\x1a\\x00 +Commands\131\Min=0 +Commands\131\Max=2 Commands\131\Command29=false -Commands\132\Type=Scope Main Speed -Commands\132\String=\\x27\\x1a\\x00 +Commands\132\Type=Scope Sub Speed +Commands\132\String=\\x27\\x1a\\x01 Commands\132\Min=0 Commands\132\Max=2 Commands\132\Command29=false -Commands\133\Type=Scope Sub Speed -Commands\133\String=\\x27\\x1a\\x01 +Commands\133\Type=Scope During TX +Commands\133\String=\\x27\\x1b Commands\133\Min=0 -Commands\133\Max=2 +Commands\133\Max=1 Commands\133\Command29=false -Commands\134\Type=Scope During TX -Commands\134\String=\\x27\\x1b +Commands\134\Type=Scope Center Type +Commands\134\String=\\x27\\x1c Commands\134\Min=0 -Commands\134\Max=1 +Commands\134\Max=2 Commands\134\Command29=false -Commands\135\Type=Scope Center Type -Commands\135\String=\\x27\\x1c +Commands\135\Type=Scope Main VBW +Commands\135\String=\\x27\\x1d\\x00 Commands\135\Min=0 -Commands\135\Max=2 +Commands\135\Max=1 Commands\135\Command29=false -Commands\136\Type=Scope Main VBW -Commands\136\String=\\x27\\x1d\\x00 +Commands\136\Type=Scope Sub VBW +Commands\136\String=\\x27\\x1d\\x01 Commands\136\Min=0 Commands\136\Max=1 Commands\136\Command29=false -Commands\137\Type=Scope Sub VBW -Commands\137\String=\\x27\\x1d\\x01 -Commands\137\Min=0 -Commands\137\Max=1 +Commands\137\Type=Scope Fixed Edge Freq +Commands\137\String=\\x27\\x1e +Commands\137\Min=1 +Commands\137\Max=12 Commands\137\Command29=false -Commands\138\Type=Scope Fixed Edge Freq -Commands\138\String=\\x27\\x1e -Commands\138\Min=1 -Commands\138\Max=12 +Commands\138\Type=Scope Main RBW +Commands\138\String=\\x27\\x1f\\x00 +Commands\138\Min=0 +Commands\138\Max=2 Commands\138\Command29=false -Commands\139\Type=Scope Main RBW -Commands\139\String=\\x27\\x1f\\x00 +Commands\139\Type=Scope Sub RBW +Commands\139\String=\\x27\\x1f\\x01 Commands\139\Min=0 Commands\139\Max=2 Commands\139\Command29=false -Commands\140\Type=Scope Sub RBW -Commands\140\String=\\x27\\x1f\\x01 +Commands\140\Type=Main/Sub Prefix +Commands\140\String=\\x29 Commands\140\Min=0 -Commands\140\Max=2 +Commands\140\Max=1 Commands\140\Command29=false -Commands\141\Type=Main/Sub Prefix -Commands\141\String=\\x29 +Commands\141\Type=Command Error FA +Commands\141\String=\\xfa Commands\141\Min=0 -Commands\141\Max=1 +Commands\141\Max=0 Commands\141\Command29=false -Commands\142\Type=Command Error FA -Commands\142\String=\\xfa +Commands\142\Type=Command OK FB +Commands\142\String=\\xfb Commands\142\Min=0 Commands\142\Max=0 Commands\142\Command29=false -Commands\143\Type=Command OK FB -Commands\143\String=\\xfb -Commands\143\Min=0 -Commands\143\Max=0 -Commands\143\Command29=false -Commands\size=143 +Commands\size=142 Spans\1\Num=0 Spans\1\Name=±2.5 KHz Spans\1\Freq=2500 diff --git a/rigs/ic-7610.rig b/rigs/ic-7610.rig index e951215..c8e7454 100644 --- a/rigs/ic-7610.rig +++ b/rigs/ic-7610.rig @@ -261,7 +261,7 @@ Commands\48\Type=Overflow Status Commands\48\String=\\x15\\x07 Commands\48\Min=0 Commands\48\Max=1 -Commands\48\Command29=true +Commands\48\Command29=false Commands\49\Type=Power Meter Commands\49\String=\\x15\\x11 Commands\49\Min=0 @@ -677,13 +677,13 @@ Commands\131\String=\\x27\\x1c Commands\131\Min=0 Commands\131\Max=2 Commands\131\Command29=false -Commands\132\Type=Scope Sub VBW -Commands\132\String=\\x27\\x1d\\x01 +Commands\132\Type=Scope Main VBW +Commands\132\String=\\x27\\x1d\\x00 Commands\132\Min=0 Commands\132\Max=1 Commands\132\Command29=false -Commands\133\Type=Scope Main VBW -Commands\133\String=\\x27\\x1d\\x00 +Commands\133\Type=Scope Sub VBW +Commands\133\String=\\x27\\x1d\\x01 Commands\133\Min=0 Commands\133\Max=1 Commands\133\Command29=false diff --git a/wfmain.cpp b/wfmain.cpp index b17ccab..a47af95 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -1019,6 +1019,19 @@ void wfmain::setupPlots() oorIndicator->setPositionAlignment(Qt::AlignVCenter | Qt::AlignHCenter); oorIndicator->position->setType(QCPItemPosition::ptAxisRectRatio); // Positioned relative to the current plot rect oorIndicator->setText("SCOPE OUT OF RANGE"); + oorIndicator->position->setCoords(0.5f,0.5f); + + ovfIndicator = new QCPItemText(plot); + ovfIndicator->setVisible(false); + ovfIndicator->setAntialiased(true); + ovfIndicator->setPen(QPen(Qt::red)); + ovfIndicator->setColor(Qt::red); + ovfIndicator->setFont(QFont(font().family(), 10)); + ovfIndicator->setPositionAlignment(Qt::AlignLeft | Qt::AlignTop); + ovfIndicator->position->setType(QCPItemPosition::ptAxisRectRatio); // Positioned relative to the current plot rect + ovfIndicator->setText(" OVF "); + ovfIndicator->position->setCoords(0.01f,0.0f); + //ovfIndicator->setVisible(true); ui->plot->addGraph(); // primary ui->plot->addGraph(0, 0); // secondary, peaks, same axis as first. @@ -4279,6 +4292,10 @@ void wfmain::initPeriodicCommands() if (rigCaps.commands.contains(funcSMeter)) queue->add(priorityHighest,queueItem(funcSMeter,true)); + if (rigCaps.commands.contains(funcOverflowStatus)) + queue->add(priorityHigh,queueItem(funcOverflowStatus,true)); + + if (rigCaps.hasSpectrum) { queue->add(priorityMediumHigh,queueItem(funcScopeMainMode,true)); @@ -4588,12 +4605,14 @@ void wfmain::receiveSpectrumData(scopeData spectrum) if (spectrum.oor && !oorIndicator->visible()) { oorIndicator->setVisible(true); - oorIndicator->position->setCoords(0.5f,0.5f); //oorIndicator->position->setCoords((oldLowerFreq+oldUpperFreq)/2,ui->topLevelSlider->value() - 20); qInfo(logSystem()) << "Scope out of range"; } else if (!spectrum.oor && oorIndicator->visible()) { oorIndicator->setVisible(false); } + + //ovfIndicator->setVisible(true); + } } @@ -9045,6 +9064,7 @@ void wfmain::receiveValue(cacheItem val){ case funcVariousSql: break; case funcOverflowStatus: + ovfIndicator->setVisible(val.value.value()); break; case funcCenterMeter: receiveMeter(meter_t::meterCenter,val.value.value()); diff --git a/wfmain.h b/wfmain.h index fac3842..30f009e 100644 --- a/wfmain.h +++ b/wfmain.h @@ -861,6 +861,7 @@ private: QCPItemRect* passbandIndicator; QCPItemRect* pbtIndicator; QCPItemText* oorIndicator; + QCPItemText* ovfIndicator; void setAppTheme(bool isCustom); void prepareWf(); void prepareWf(unsigned int wfLength);