From 988742f067fd9f10358e1f616333885fa3b1a10f Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 31 Jul 2019 22:50:50 +0200 Subject: [PATCH] REST API: config: put device and channel settings in their own include file --- doc/img/ModCWControls1.png | Bin 0 -> 6027 bytes doc/img/ModCWControls1.xcf | Bin 0 -> 29538 bytes doc/img/ModCWControls2.png | Bin 0 -> 3961 bytes doc/img/ModCWControls2.xcf | Bin 0 -> 18843 bytes sdrbase/resources/webapi.qrc | 2 + sdrbase/resources/webapi/doc/html2/index.html | 198 +----------------- .../doc/swagger/include/ChannelSettings.yaml | 61 ++++++ .../doc/swagger/include/DeviceSettings.yaml | 74 +++++++ .../webapi/doc/swagger/include/Preset.yaml | 4 +- .../resources/webapi/doc/swagger/swagger.yaml | 166 ++------------- .../api/swagger/include/ChannelSettings.yaml | 61 ++++++ .../api/swagger/include/DeviceSettings.yaml | 74 +++++++ .../sdrangel/api/swagger/include/Preset.yaml | 4 +- swagger/sdrangel/api/swagger/swagger.yaml | 166 ++------------- swagger/sdrangel/code/html2/index.html | 198 +----------------- .../code/qt5/client/SWGChannelConfig.cpp | 10 +- .../code/qt5/client/SWGChannelConfig.h | 8 +- .../code/qt5/client/SWGDeviceConfig.cpp | 10 +- .../code/qt5/client/SWGDeviceConfig.h | 8 +- .../code/qt5/client/SWGModelFactory.h | 8 - 20 files changed, 328 insertions(+), 724 deletions(-) create mode 100644 doc/img/ModCWControls1.png create mode 100644 doc/img/ModCWControls1.xcf create mode 100644 doc/img/ModCWControls2.png create mode 100644 doc/img/ModCWControls2.xcf create mode 100644 sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml create mode 100644 sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml create mode 100644 swagger/sdrangel/api/swagger/include/ChannelSettings.yaml create mode 100644 swagger/sdrangel/api/swagger/include/DeviceSettings.yaml diff --git a/doc/img/ModCWControls1.png b/doc/img/ModCWControls1.png new file mode 100644 index 0000000000000000000000000000000000000000..72c943a1db970e1473711ebe22e3eba63d88540e GIT binary patch literal 6027 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 literal 0 HcmV?d00001 diff --git a/doc/img/ModCWControls1.xcf b/doc/img/ModCWControls1.xcf new file mode 100644 index 0000000000000000000000000000000000000000..a5b35e75ea826064bfa8660fc88bb91fb63843ff GIT binary patch literal 29538 zcmeHQ3wTu3wchi{BoGN8538aKk&MxF$cqzRp+xYa2+2$WiIKJ!LP$a&B$&hswzo-b zHCnG#sme!18EtJv<)H#e2E{18YONRLR;%8kMFkbDR3NXJbI$$OK94z*naLzH}yNQ?d6qKWsEV?eEhiuK-Wls$%H?n0CBVLW{d#W zXn++kRt2gP-xw5Ep&V9$Zk?qyt5=s**Q3pe=gz4uE2%GAZojdzeue$2dAV+)jNq)5 zt4k`%oE5c|%T;a@ORlS5S5;=OtEsA7e%a9E@`}=$s+wARGB2F970XKOX_M0U6{eD| zk}iYjvM{0=-5$9@qHF8cl$2IhSJ>0Fv4C6`4yodtH&j>F+bgR}SCrL}d`)?IU0J=Z zAW4U!6il!v-3RqD9cC={PR54g=8XCsV;5K$yZB?q92tyVzL&A|3mMD8t)H3A*cB+R zev`49&5CfXS?%OJl%Vk^VYO%339Zp=sM8~q0dZ=b9_J9Xj)ILd)Q1}C@rL?2hWao= zeK_jq*K{$;seo7m&1gy&sCd$gOo`+a`=~ElTkotYSyxsI6raQKWWw1KF_lEz)$*EZ zG!~Xr*J&+hUFA(>_VlTmAt*c?tK8`|m21nY=pmI<*H@NQRhHD**YSr|RZ?AX1MJbB zSXS-4fp@s9q^``lyt1~ew7#;Y+Fn&(3%Q;KiKm>Io{=>z3zaDu(XgZu zWJ@b=sH?9mUuUl>E3Zd$SYC+c_T}rUOIBBwswi$hx@s#bp&QJPD@IdSFUxak zMSHAxe3rL@ahAVRJJo$Ivv9Dnt_3c)+m(lBZE?piG1uj$(&DzVj(nHfH9sfM#c5XN z%X7PO@XUzjhY(DGs%CdL2(EmU3lx{z>^8ZmLo4f|J__f%O{lAa^YELQValn*XT3fxX%|!QN zN-eEkDlJ}23H8>Up50zf!<5kU(3C(kd8HPb5~}`IZ%eDWRZ_a(q*kxlE4H?f3Sek& z^?G+cz7x_a0>Zm#61%-#72|L5?jXz#od-g#Esv81oCVV&#k5XiSm#El?QPk~byH@O z>P>Z^#sTxX#F6Aknn-j9=7k2876;~)>~JI{+AmGwG|UTpcA6JxCWkbU=EbXBNnlKJ zsB9o5Im`}I67`5#ftWZh5geo-5dI{`M4H1yha-TwgfP%V#ZZrzjJw2P0zat};}DZB z;WVh2=}0mqiH<}*o-&bC$9b~U);O}!*Cxx2c%Aqfjb#k$O5b|4^QByfC=@Fb^SWh= z9HX`^tm8Y!4@5|D#-uS!>OXuVvw$ua7@F!yw}K%Ufi# zEOuu@U5&B*xa>`dOW7koZ$SFrl`o`OUnrk6Vjq^r5q6w>!hmhRQr>fU+~s>@ddk`i zq~Bu#;)!$vs?&PodtF~WnW8Hcd?)A*Np132xL^JCOYS$`^`o*{IK3rlS+tS|$xG8v z{0ir#$y=*eT#i!FRfY?STZ*?7@WU4Xii7EKJ3)U5@ZW$>7#lhsGh7T<3AhRHOTcds zJ4|CN;je(t0G;RuZ;s*L0VD&aQlAYY`U&T(V>b8HAh5V+z$5hq%&dXry^uG6#S7U! zfhzBSya6l@$oB~pc`2vS+BlU-jj~nN3o^O3MicOg@l7A#(uAq!u=CuP8lW$?Oyjv! zk@rGghrZr6;#1`vkk!G-pctk4q=CL=T7M4KU~UVBep>C+ zKH4WH8o`c(ZN34K8v5*$&C<;e55_fM^QwLJ`GL?w2?gW2usM`IPme)sPp5CCvb2Ji z9AAf|;;4wXJ<{U{#v9iZ)f?iIsm}EEqI-|PUXP8?a?lFYNp&xziQC;ct|Mu}X zn6`X-E^EHl8{)C>d#*lH4r>@d$YRPrypA3P%m&a^0GPmQj9rEjYo1?Pm`<;Ct6i`Y za(a9TSs7D>De3y2exP?jppRt)EAJ&`Lw>)!2{P4WL%XIIRJ}orK!{ZF?&e_|(?EYxO z1-csj-4+OBYJ=rQXe_$Ixe-bfs@G_4|Aw6m*2w4^89V<&z)?Vl!l-Q9p8L-)+uluj6DzC&i_GTdd{uShI2Ugj-?S z`fG^CdhBV9J*{;BLsJTK|E2JBvYp)NV7*sf##lvwSODG?{Gv1y)p6HOEj*okCWWVi z^`XFpZ}Xd{hoW=~FFYKKyRe|I3od{?oIWpA-)SQUiyxM}Amn0?O z6Fr3!0e4b2Zlv18jhvWtDQT&G1Te&*5GoAj!?}jOW z$AO(XOoCq;-Hy*C4zysL9SQ7e8`aJ-BCA|W82XGkBjy`SF zWymXPL=+rS!{goKgTUfG536@PU|>s1Lyz}jECX1)7z6ErF8NpvjAa0e17o2*&?Sw9 zFku{p=@(O&K90h4V@(Ou$Ew-ti`9iPRxQu`c8FD(+k$g*(X6ZoeV{F?zx@SUd_%l_ z!0oTU_H0}e#u&b=CF|dlmt#r)~G{lb&^~F6` z&6%`a$h6bzgWe%{SFzK4hKN0aG0q2sdymqYBfJZ_9{tK@XP!yhg~7^ZC)0-!be#vF zqhWY_$yCy%;*t@RA`A%1W+OxUz-H5C6Ee#WLdN2;G8@k_BPd0^-Sg1K_3M#o_TU7B z1$l1&LuxgSb>GKx*@U+-D}*+39?FgTH+$Ce2Dt7;0{bCN`hh@4l<`&v+3a~>;|2_( zAxMMYsKky<9uJWe?GOed32)4EV*=fhRZ^4J&>qQWkz{3PFNs|reC4B5HX)$>akUD) zzUbEQlqUB};v1Za8YW5lfH%PQ4Nq*V;+=t>y3{I-;y>}m37t(*p<7i!@{w}wbZgbr ze3bk*qU(%bz19BByAMo)kQPc~R{mmiskPf*Uv;T%*yJtpM>-O_meKOpdJ`Lz_({K& z@6{2M=lB2ZM^HrVg(HsNg$b(&h@3n3P5Dk8fiCUx5o6O4d}OB8HP$+2!2y|$S81w2 z)h{nMv^%D6{>XRY?K{rbr_bECX0%jDhyRmdaRowO&La_C*w8 zUqm6cu|`(d)_9&8Vqc_M<#}p(rnjR$+n%9AxM$x3M|tppeB%ALpkPaEh&S;(`022a zzFVBpTJ6Y#lTL~U`?lE1>CxA?cEYVMZS~QqnSNXAnH1<|*vXj=)?4Kkj8y~(_f{DS z{3!*x8D~pqj5&^|U$;%rBr=4rz5?p39v}=Nix}((UMxdgo`}O~}A2C+u-T zUa7{qrFjU72&-2S%=So*BRRa=+lsU}PPC(E99Xw`rB)gc)oyRgGdKaSWU-;?PMk+4 z3aZ-z)fTlH$8Zk*8O{J*ady3#_Xu5aR=t&UMK)Z)$MWu#x^kpGmQKY(Ta2n#p>2;m zIda2DhvUS05_OGZW^hF;gm(lU4nO#$DJWvSe7IzCpGaK=C<2Q~W}R%g&687v1#W6>4P0pd)!c4fV$ z)U>b}w~l3fhHpdR%=pZSfV5!xlx)VP;C%X&A22rUX25y?vI^6l2D}J(o3ZS>0Up2( zKpS8`;3L2>^oQD2zqlhYI(8B-|-&5Yo@24Z>h$!e?n&I>QEG)_B}Px>Ve(RB8lg!edzX zriYMerqI}f1JND?ohZ9K4?T#aH6i1ei6c+7jA5}J1i0u_DMORl7_Li{B$Tqma5G>%;1TLkNgMBA z!#$}%VDaEPUQr<)X<*38kTrlshHO+&WRX}J)|g5;-C^iKE$AV)H4X({dE9;bs#hb6 z#y3=*ZXTh5T zHJTv@)0L$XyoC6=BGu@2hZ;uTEPp1}iP=NFgqlZR%?ds6TQu_&S3%UZ)0j}@=`2YB}MdU~DVwym&JHRk^Nge&*&;sp; zV+QNhjaMfl2>0qX1Fv55ey&zDrIEUthfi^9ngG8Jrp?>KSbj5OixKu$6ceq%bX4e= zdd1wU=VWDO3X_H7)8^f{xn<9m+lyyS$`sOte_mPC_R{P7|Fm!4OLt!7OcPRtudl3q z<%NBZ72f&s-e>ncehqL=;j3wduROQ!>C`OetuO8IzTmmanJ&Z#(hk8aeEORmf>13l z7KFB@Lh<8I4*XDPlA8n}>(k?cP5A2S=l4FlzalGV#@tuEEzK`gWH?Fib`q>OBnS^5 zxKo(&&7#8Nf^g3VLeskk1YyOy$H8)R>J2Y=_q?z@eOl_zUu8$Qrse~M!mc~GRL-V0{ASADM+<)mq1`*5X}iifNf;^|e&Z*zKAQ4z z)~{MfC~MO@5NdjO)+YrddzxEJE#JKG+KbJ*ckSG@w{ggS(9VfPL+xp}aPwl>nq%49oU9bu#UOy}dQ%^Rlk|IVk3!+LPq+taEai{{N8QPZ#8cvX0HDS~g(+}}R;gy{*> zi+) zS2U;KPmhFW5#IkPUTyyAEzfg$#lkTQ#R{d1iiHUa{X{nl-PK=pom{~=$_vI6h~)}L zc|k&f#xY}F#a35jju=6_@eNKc%O8_3mMI;S<=gV5qMOY(cdgCOr=h^M_K3pf9^=;8 z+%~sViXRy}_CId-j1O*}F-5rjy4fWMpH?~J+@?Zlp*t>Azz+e)bzCnz@_F}XTV`>A z<*rzlZ>cQ5>56lS%N0$QyAoV<>r3-u^L$G{%ZtksOBGsaUP4|p+Opg+x#BW~e_3uq zF7b!Ml`I&uKrB)CN){w6AikyZ$IKU(D!8Td6XwIJ(ux+(A2r{bb>GPQ#JlF>z2!@r zh8X0W)iGMIK`ds$Kl!eEnnpJH@40I-y%SQo!P~UZgR_W^`Q|vg+DZ7Mcr>FKO<4?N_&K`>6Bj!oo!{T1;aUJ<`lemoVURv*Y?GgcjMY`GSZG@4 zUnOn=um7e)H3czRTohTPyuei8zxDXf3Ty@9Pu_|y(e5ZODDb@Ax$lkwYk~iVf0goM zwAd-qAnlH_{QMgaNq_lazBS)}`*R&`9I#Zvtw|eM4M#NcS!->90nBD%> zAFUdkT@a&1ZehBlSk9(Jabf67=a1IHxv=Zj$wRytEw&3@{@2ht zPtBxg58eZDo>`D4AXYZGk5nhzhZ6P~U5w&bMmogQG;$|loD6p?%T`qlukx*0HjTo~ zNREbF%SduQsgWJcD(r>CRgoM`6;Z1cYB)z@r1$1%dh+$+XsU{>#qFOQJ=!UE9zA*p z4Q>4Bj)sdKEG~XUexbPdpg}acqv4|WtD^S@iAHlYRmHKzei|}XS2dcW2_q84(S%4u zcQj!{qB)unk*JO)tVFMlrmEOh-2LKl`J26{XwNpPqcIv#9~@0EdlW}wWbW0`1T*&L zXpEfU9F1|+g*uwxbsNUf1i65zd}|rvYyysi?=mC1o0MdPG-7f}WOtJ?F>OZn@ND0V zw28FmjpS~U(}cv4iGCq1IkLN%kvJ+*oDs?0WD_+zvb!T45HE94HvCfMeBn^qq&>x#MneX4H>Je8qM8= z5sBh%LL{QQn=m5L+)ao`RCg0rqE~m5ooGw!-uAWpk1eQZ&o-*NF&a=G+)Xfh6nA4} z?$zA{Gxp|gjGW=zjd9h5x|`s28{XaYZ~>vQ4cv{Kb zjmBqg5^r0-!L~tMe_Ipk*mI$8>|hM^_4|+5j)?o$N1|^yBI8@zM>YiL*ozqCL+H{? z*j9+;y|Hv1T31leJI8Aq^YhDk>qGh_b_rtdEUTll6yUpG;_}`GvS3?apoiYCV0!5N zMntd4>(4hF4)J^lA7c2PI5S1=PI?OknUNX6dSt@U4L+C+f8=l2zwh=fCW*eR( z$ZR997|k{Ui_vVuvjohR(?jop#Av+m$S_`nc0tC=eR+Z!&KZrDUIZhQ0M2Nd~Jx-QikMCe#kKY=kOQWxO1@w0ShXJ5n zkNI3b7T^G60pK9z}Tc) zsC>`kP81Z&OMkTNosaZJ5CzI~7tG+hFvyBpGDimk_c< z_Qui_V~LUMG0#=cU(fT$?{{CXd(S=hblJ~AOqZx}L> zm_%u5Md;(Sb!lig8BGnYnxm(G5JQmW+qj<1UAR<6@2EjM%ZoF5y!sy(A4v9cW3TC@ z#p=tX6^dL>N^RJ?MRc}+&Pcp@6Im*)H?c~x{~3+(l>J_H2k<-rFNH&V4!jHq_;^+YM{$)c#QagBmGVay!O zbe>(_Us069+>Wn-B?%wk|9)pUXK36eY9CFwU{?q3pc^ey(nk$2qMfr=B=cbw@@CJy z7}rJn9oBL4EewTTESARBW00flQH8z78l=A9*JQ>*_B&47s41O6qV*o4q@6& z@64`nXLwXKJ$Th>mDrz}={jrV z6d@%l2CiflboUfpjZ;g?Oou#z>3TLx<#`g^rsYb(#dpQJ^KY;cD?kl$6G?;g31D~# z##`#4gT4p>XUA!p8C-MllTH^e$7-9LHv?@y&KAao1;R6nhUAbv#blDRfoN@5T9u^B z$P4w_xe({rS29o`&wg}NZ)+Fe%WP# zyGq}_eLH_xSPO4`&9V1-O_HAwV>DuU;i27h&cnI5srI>{-mi{?A|L^y8X6mw*dr4Y zIr?h^L_`u_?b3NOQJ8-3VOsJMT(^(66L|#%OQ!NPpX#B$fi6HG*;Q3l1opCIG7inl z%ezN+d^IVyL9e&3kF^hd{CIBUXjSW;v2pCFtNtQeYY+i9$+B_nO*W zL&z9jciD?`58?uee2syWNb0J^zCeLe?fmP1XU@>?>dj+G(eeGXc z6JHpq<*Y8!`gi0!z%f0?AQ(=-3n(qz@WC_czXmC})FJoz<<@4(oQPWK{@IU1kJlRW z3PQxA5bbxoXF&Qovq)}{Oc$$IZV*WS-o3M2TwD^fu;5^=!<`>mt#(>)tfNgR6G%Y7 zG$=?DIJS}!*_D-*&&wsFsr_YObMww%(Y9bi%A(4=fa5+U2m%Qt1RAb4vN^0GOrFK& zLOGr;w!hMOEN!37j$1FHIxWL9l$;pfSP;6GwiY(glzoi45Jxs_Y5!1DON)h#t#f17 ziJuXV$0Pmy7XlhJ{8xB#F+Y3Dv3x=tOo~`{OVHrzc4fei`!0jo@jWDbNy(ENS*m9C z_JrZPy0-vYr~I&6uxYO zCYz_Gaenm=5s1ZTKD!6)5ez9dn?qAEJ8feP-r)L!$C(3N$aQH0?i`bzh2`Ciz z^{b-@hSDxZhrIaCb!f5Wa9u+3U+UfGr^0D&+_(`H6EiY88rlC{Ttg#+LZO7}oa5s| zX(J8aYfrf?PS{iN)FXS<&UNLzZVXU-VKe15TB@4FXq~77*}c-q5st1)>|YRSYI7Ks z3A4-3M_ZrTlS1w>eN@AqmvSM`QvB0%I9h`~|Lk?- zXH-&BlDBP0nV!CnXxcQgQRI93_U*TC--d^Wbzv|L*P$G!XdjTzfDCdHKZ6Qv-`LHy z@8Cy|n|XRF3=9lNN=uWrgP1&v-n|3m4iy1$xOT<>-8OL=8hKN>pn0pqubcX_qwAXv zGn9DiccwxXN?oX`y1F88%LOPDaZjG)H#KE{`C>C0w5ot;Jqpl1AWHy;=;q~B1Vq<= zb$t79G^{RBSgYHe&>Yi45|fjAnv%kk4U?wvYT1`6C@6rty1sMlV!eIm&f$@VySp3? zhs!)Iesy@3#Q{I>%fT@_TkcuwrkRK!8+Ga3qZRtCP?cR-FnWbOGA@pJz2y**pP%oo zi38$%=G?jK7z|{z@PrfuR0?2)iy%+e)3}uw5&CGIxmse z*8VLmeP;E}WnuSFMn*;eiKI<8*8G^ImUMKuOY*I^tn*%on?QmKfi0=cq9f^;IG*R` z4n;7qG2(*fMn?2}e0*Ae*q9b&rKG(7y}w0^-X)?o_c2&r#rpbsA!ty_%E}}E2D&w3 zBQ{me!p_ZpPHJ|4>h-k!zH7mqaO!e4o}4y8yYg)y?fV#*pPa~ecbzK zdjiDEYk2)Sn{|x`P>$LwD_*>KVOjl%mu9BMvk^|__?{EI?$DDc{8Aa|j5&Cyf`K}< z=>#lkPkP!jzzM3YI@1pV>du8SdqF3t`?+K7TdnDF_(lpXGyQyL?#wt|NW(V@Yag0H zCMVm&imIzqfhNNBcG>RQ&6}Ln)zuzf>XNe%4e@n#>aZM0Z#W&3VuOKCJ#M`%F;H@7 z!+m>Y>}8PKRre*(OluSUb^>L0F8bVyy!syO6DyY|PLSX&A4cCUQs)Xk=kw(FnWdWltM+{vk;N z2LsYUL70G&x2?VIFTzJX?~*_b0h+I$G4h6r-1hP9U`S5hjax}QpsLM?<}hFld6F~| z?9*kZ1&l<#5EBx6O2)`3)r6dkkrA){_UXU#43Y4for5m zCaOkVVqD%ew0o?(Q0?!d^H_!`Z}v7uhNqvbazT6JH_& z?kUgYMy}0>`4t4Nj*T#X*Afd+s*^C6=JIcFj2|5JVm88lAUZ9U!6TLMK}Q46&@=&*mGAUwxdFmQ@>W7si~JQfzc$Lzz|w(n>FT%r~8t zw|#vN&IG}7YEkvKxy*{>(hf&qTT+13Um*7~C5;b`zPc&SrKBZi&0)S*1Q$v_Rncjnl F{{b3qnT7xW literal 0 HcmV?d00001 diff --git a/doc/img/ModCWControls2.xcf b/doc/img/ModCWControls2.xcf new file mode 100644 index 0000000000000000000000000000000000000000..e4254eb761b80cb09e6fef056a52c08b526ca459 GIT binary patch literal 18843 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/doc/swagger/include/BFMDemod.yaml webapi/doc/swagger/include/BladeRF1.yaml webapi/doc/swagger/include/BladeRF2.yaml + webapi/doc/swagger/include/ChannelSettings.yaml webapi/doc/swagger/include/Command.yaml webapi/doc/swagger/include/CWKeyer.yaml webapi/doc/swagger/include/DSDDemod.yaml + webapi/doc/swagger/include/DeviceSettings.yaml webapi/doc/swagger/include/FCDPro.yaml webapi/doc/swagger/include/FCDProPlus.yaml webapi/doc/swagger/include/FileSource.yaml diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 28f056d63..de02f6952 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1770,7 +1770,7 @@ margin-bottom: 20px; "description" : "Channel type ID in short form from object name" }, "config" : { - "$ref" : "#/definitions/ChannelSettings_2" + "$ref" : "#/definitions/ChannelSettings" } }, "description" : "Represents a Preset::ChannelConfig object" @@ -1958,92 +1958,6 @@ margin-bottom: 20px; } }, "description" : "Base channel settings. Only the channel settings corresponding to the channel specified in the channelType field is or should be present." -}; - defs.ChannelSettings_2 = { - "required" : [ "channelType", "direction" ], - "discriminator" : "channelType", - "properties" : { - "channelType" : { - "type" : "string", - "description" : "Channel type code" - }, - "direction" : { - "type" : "integer", - "description" : "0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0)" - }, - "originatorDeviceSetIndex" : { - "type" : "integer", - "description" : "Optional for reverse API. This is the device set index from where the message comes from." - }, - "originatorChannelIndex" : { - "type" : "integer", - "description" : "Optional for reverse API. This is the channel index from where the message comes from." - }, - "AMDemodSettings" : { - "$ref" : "#/definitions/AMDemodSettings" - }, - "AMModSettings" : { - "$ref" : "#/definitions/AMModSettings" - }, - "ATVModSettings" : { - "$ref" : "#/definitions/ATVModSettings" - }, - "BFMDemodSettings" : { - "$ref" : "#/definitions/BFMDemodSettings" - }, - "DSDDemodSettings" : { - "$ref" : "#/definitions/DSDDemodSettings" - }, - "FileSourceSettings" : { - "$ref" : "#/definitions/FileSourceSettings" - }, - "FreeDVDemodSettings" : { - "$ref" : "#/definitions/FreeDVDemodSettings" - }, - "FreeDVModSettings" : { - "$ref" : "#/definitions/FreeDVModSettings" - }, - "FreqTrackerSettings" : { - "$ref" : "#/definitions/FreqTrackerSettings" - }, - "NFMDemodSettings" : { - "$ref" : "#/definitions/NFMDemodSettings" - }, - "NFMModSettings" : { - "$ref" : "#/definitions/NFMModSettings" - }, - "LocalSinkSettings" : { - "$ref" : "#/definitions/LocalSinkSettings" - }, - "LocalSourceSettings" : { - "$ref" : "#/definitions/LocalSourceSettings" - }, - "RemoteSinkSettings" : { - "$ref" : "#/definitions/RemoteSinkSettings" - }, - "RemoteSourceSettings" : { - "$ref" : "#/definitions/RemoteSourceSettings" - }, - "SSBModSettings" : { - "$ref" : "#/definitions/SSBModSettings" - }, - "SSBDemodSettings" : { - "$ref" : "#/definitions/SSBDemodSettings" - }, - "UDPSourceSettings" : { - "$ref" : "#/definitions/UDPSourceSettings" - }, - "UDPSinkSettings" : { - "$ref" : "#/definitions/UDPSinkSettings" - }, - "WFMDemodSettings" : { - "$ref" : "#/definitions/WFMDemodSettings" - }, - "WFMModSettings" : { - "$ref" : "#/definitions/WFMModSettings" - } - }, - "description" : "Base channel settings. Only the channel settings corresponding to the channel specified in the channelType field is or should be present." }; defs.ChannelsDetail = { "required" : [ "channelcount" ], @@ -2297,7 +2211,7 @@ margin-bottom: 20px; "type" : "integer" }, "config" : { - "$ref" : "#/definitions/DeviceSettings_2" + "$ref" : "#/definitions/DeviceSettings" } }, "description" : "Represents a Preset::DeviceConfig object" @@ -2566,112 +2480,6 @@ margin-bottom: 20px; } }, "description" : "Base device settings. Only the device settings corresponding to the device specified in the deviceHwType field is or should be present." -}; - defs.DeviceSettings_2 = { - "required" : [ "deviceHwType", "direction" ], - "discriminator" : "deviceHwType", - "properties" : { - "deviceHwType" : { - "type" : "string", - "description" : "Device hardware type code" - }, - "direction" : { - "type" : "integer", - "description" : "0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0)" - }, - "originatorIndex" : { - "type" : "integer", - "description" : "Optional for reverse API. This is the device set index from where the message comes from." - }, - "airspySettings" : { - "$ref" : "#/definitions/AirspySettings" - }, - "airspyHFSettings" : { - "$ref" : "#/definitions/AirspyHFSettings" - }, - "bladeRF1InputSettings" : { - "$ref" : "#/definitions/BladeRF1InputSettings" - }, - "bladeRF2InputSettings" : { - "$ref" : "#/definitions/BladeRF2InputSettings" - }, - "bladeRF1OutputSettings" : { - "$ref" : "#/definitions/BladeRF1OutputSettings" - }, - "bladeRF2OutputSettings" : { - "$ref" : "#/definitions/BladeRF2OutputSettings" - }, - "fcdProSettings" : { - "$ref" : "#/definitions/FCDProSettings" - }, - "fcdProPlusSettings" : { - "$ref" : "#/definitions/FCDProPlusSettings" - }, - "fileInputSettings" : { - "$ref" : "#/definitions/FileInputSettings" - }, - "hackRFInputSettings" : { - "$ref" : "#/definitions/HackRFInputSettings" - }, - "hackRFOutputSettings" : { - "$ref" : "#/definitions/HackRFOutputSettings" - }, - "kiwiSDRSettings" : { - "$ref" : "#/definitions/KiwiSDRSettings" - }, - "limeSdrInputSettings" : { - "$ref" : "#/definitions/LimeSdrInputSettings" - }, - "limeSdrOutputSettings" : { - "$ref" : "#/definitions/LimeSdrOutputSettings" - }, - "localInputSettings" : { - "$ref" : "#/definitions/LocalInputSettings" - }, - "localOutputSettings" : { - "$ref" : "#/definitions/LocalOutputSettings" - }, - "perseusSettings" : { - "$ref" : "#/definitions/PerseusSettings" - }, - "plutoSdrInputSettings" : { - "$ref" : "#/definitions/PlutoSdrInputSettings" - }, - "plutoSdrOutputSettings" : { - "$ref" : "#/definitions/PlutoSdrOutputSettings" - }, - "rtlSdrSettings" : { - "$ref" : "#/definitions/RtlSdrSettings" - }, - "remoteOutputSettings" : { - "$ref" : "#/definitions/RemoteOutputSettings" - }, - "remoteInputSettings" : { - "$ref" : "#/definitions/RemoteInputSettings" - }, - "sdrPlaySettings" : { - "$ref" : "#/definitions/SDRPlaySettings" - }, - "soapySDRInputSettings" : { - "$ref" : "#/definitions/SoapySDRInputSettings" - }, - "soapySDROutputSettings" : { - "$ref" : "#/definitions/SoapySDROutputSettings" - }, - "testSourceSettings" : { - "$ref" : "#/definitions/TestSourceSettings" - }, - "testMISettings" : { - "$ref" : "#/definitions/TestMISettings" - }, - "xtrxInputSettings" : { - "$ref" : "#/definitions/XtrxInputSettings" - }, - "xtrxOutputSettings" : { - "$ref" : "#/definitions/XtrxOutputSettings" - } - }, - "description" : "Base device settings. Only the device settings corresponding to the device specified in the deviceHwType field is or should be present." }; defs.DeviceState = { "required" : [ "state" ], @@ -27161,7 +26969,7 @@ except ApiException as e:
- Generated 2019-07-31T18:41:04.524+02:00 + Generated 2019-07-31T22:38:42.618+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml new file mode 100644 index 000000000..7be49b84a --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml @@ -0,0 +1,61 @@ +ChannelSettings: + description: Base channel settings. Only the channel settings corresponding to the channel specified in the channelType field is or should be present. + discriminator: channelType + required: + - channelType + - direction + properties: + channelType: + description: Channel type code + type: string + direction: + description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) + type: integer + originatorDeviceSetIndex: + description: Optional for reverse API. This is the device set index from where the message comes from. + type: integer + originatorChannelIndex: + description: Optional for reverse API. This is the channel index from where the message comes from. + type: integer + AMDemodSettings: + $ref: "/doc/swagger/include/AMDemod.yaml#/AMDemodSettings" + AMModSettings: + $ref: "/doc/swagger/include/AMMod.yaml#/AMModSettings" + ATVModSettings: + $ref: "/doc/swagger/include/ATVMod.yaml#/ATVModSettings" + BFMDemodSettings: + $ref: "/doc/swagger/include/BFMDemod.yaml#/BFMDemodSettings" + DSDDemodSettings: + $ref: "/doc/swagger/include/DSDDemod.yaml#/DSDDemodSettings" + FileSourceSettings: + $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceSettings" + FreeDVDemodSettings: + $ref: "/doc/swagger/include/FreeDVDemod.yaml#/FreeDVDemodSettings" + FreeDVModSettings: + $ref: "/doc/swagger/include/FreeDVMod.yaml#/FreeDVModSettings" + FreqTrackerSettings: + $ref: "/doc/swagger/include/FreqTracker.yaml#/FreqTrackerSettings" + NFMDemodSettings: + $ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings" + NFMModSettings: + $ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings" + LocalSinkSettings: + $ref: "/doc/swagger/include/LocalSink.yaml#/LocalSinkSettings" + LocalSourceSettings: + $ref: "/doc/swagger/include/LocalSource.yaml#/LocalSourceSettings" + RemoteSinkSettings: + $ref: "/doc/swagger/include/RemoteSink.yaml#/RemoteSinkSettings" + RemoteSourceSettings: + $ref: "/doc/swagger/include/RemoteSource.yaml#/RemoteSourceSettings" + SSBModSettings: + $ref: "/doc/swagger/include/SSBMod.yaml#/SSBModSettings" + SSBDemodSettings: + $ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodSettings" + UDPSourceSettings: + $ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceSettings" + UDPSinkSettings: + $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkSettings" + WFMDemodSettings: + $ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodSettings" + WFMModSettings: + $ref: "/doc/swagger/include/WFMMod.yaml#/WFMModSettings" diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml new file mode 100644 index 000000000..fc5c776b0 --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml @@ -0,0 +1,74 @@ +DeviceSettings: + description: Base device settings. Only the device settings corresponding to the device specified in the deviceHwType field is or should be present. + discriminator: deviceHwType + required: + - deviceHwType + - direction + properties: + deviceHwType: + description: Device hardware type code + type: string + direction: + description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) + type: integer + originatorIndex: + description: Optional for reverse API. This is the device set index from where the message comes from. + type: integer + airspySettings: + $ref: "/doc/swagger/include/Airspy.yaml#/AirspySettings" + airspyHFSettings: + $ref: "/doc/swagger/include/AirspyHF.yaml#/AirspyHFSettings" + bladeRF1InputSettings: + $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1InputSettings" + bladeRF2InputSettings: + $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputSettings" + bladeRF1OutputSettings: + $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings" + bladeRF2OutputSettings: + $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings" + fcdProSettings: + $ref: "/doc/swagger/include/FCDPro.yaml#/FCDProSettings" + fcdProPlusSettings: + $ref: "/doc/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings" + fileInputSettings: + $ref: "/doc/swagger/include/FileInput.yaml#/FileInputSettings" + hackRFInputSettings: + $ref: "/doc/swagger/include/HackRF.yaml#/HackRFInputSettings" + hackRFOutputSettings: + $ref: "/doc/swagger/include/HackRF.yaml#/HackRFOutputSettings" + kiwiSDRSettings: + $ref: "/doc/swagger/include/KiwiSDR.yaml#/KiwiSDRSettings" + limeSdrInputSettings: + $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings" + limeSdrOutputSettings: + $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings" + localInputSettings: + $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputSettings" + localOutputSettings: + $ref: "/doc/swagger/include/LocalOutput.yaml#/LocalOutputSettings" + perseusSettings: + $ref: "/doc/swagger/include/Perseus.yaml#/PerseusSettings" + plutoSdrInputSettings: + $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrInputSettings" + plutoSdrOutputSettings: + $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputSettings" + rtlSdrSettings: + $ref: "/doc/swagger/include/RtlSdr.yaml#/RtlSdrSettings" + remoteOutputSettings: + $ref: "/doc/swagger/include/RemoteOutput.yaml#/RemoteOutputSettings" + remoteInputSettings: + $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputSettings" + sdrPlaySettings: + $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlaySettings" + soapySDRInputSettings: + $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRInputSettings" + soapySDROutputSettings: + $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDROutputSettings" + testSourceSettings: + $ref: "/doc/swagger/include/TestSource.yaml#/TestSourceSettings" + testMISettings: + $ref: "/doc/swagger/include/TestMI.yaml#/TestMISettings" + xtrxInputSettings: + $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxInputSettings" + xtrxOutputSettings: + $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxOutputSettings" diff --git a/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml b/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml index 1d0435562..b2a9faa86 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml @@ -8,7 +8,7 @@ DeviceConfig: deviceSequence: type: integer config: - $ref: "http://localhost:8081/api/swagger/swagger.yaml#/definitions/DeviceSettings" + $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" ChannelConfig: description: Represents a Preset::ChannelConfig object @@ -20,7 +20,7 @@ ChannelConfig: description: Channel type ID in short form from object name type: string config: - $ref: "http://localhost:8081/api/swagger/swagger.yaml#/definitions/ChannelSettings" + $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" Preset: description: Represents a Preset object diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml index 12fd2b64e..15c645ee9 100644 --- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml +++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml @@ -868,7 +868,7 @@ paths: "200": description: On success returns current settings values schema: - $ref: "#/definitions/DeviceSettings" + $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" "404": description: Invalid device set index or device not found schema: @@ -893,12 +893,12 @@ paths: description: Device settings to apply required: true schema: - $ref: "#/definitions/DeviceSettings" + $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success returns new settings values schema: - $ref: "#/definitions/DeviceSettings" + $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" "404": description: Invalid device set index or device not found schema: @@ -923,12 +923,12 @@ paths: description: Device settings to apply required: true schema: - $ref: "#/definitions/DeviceSettings" + $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success returns new settings values schema: - $ref: "#/definitions/DeviceSettings" + $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" "404": description: Invalid device set index or device not found schema: @@ -984,7 +984,7 @@ paths: description: Originator information in the reverse API case required: false schema: - $ref: "#/definitions/DeviceSettings" + $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success return state before change @@ -1018,7 +1018,7 @@ paths: description: Originator information in the reverse API case required: false schema: - $ref: "#/definitions/DeviceSettings" + $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success return state before change @@ -1119,7 +1119,7 @@ paths: description: Channel identification (no settings data) required: true schema: - $ref: "#/definitions/ChannelSettings" + $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" responses: "202": description: Message to add a channel was sent successfully @@ -1159,7 +1159,7 @@ paths: "200": description: On success return deleted channel settings schema: - $ref: "#/definitions/ChannelSettings" + $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1195,7 +1195,7 @@ paths: "200": description: On success return channel settings schema: - $ref: "#/definitions/ChannelSettings" + $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1229,12 +1229,12 @@ paths: description: Channel settings to apply required: true schema: - $ref: "#/definitions/ChannelSettings" + $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" responses: "200": description: On success return channel new settings schema: - $ref: "#/definitions/ChannelSettings" + $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1268,12 +1268,12 @@ paths: description: Channel settings to apply required: true schema: - $ref: "#/definitions/ChannelSettings" + $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" responses: "200": description: On success return channel new settings schema: - $ref: "#/definitions/ChannelSettings" + $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1879,82 +1879,6 @@ definitions: preset: $ref: "#/definitions/PresetIdentifier" - DeviceSettings: - description: Base device settings. Only the device settings corresponding to the device specified in the deviceHwType field is or should be present. - discriminator: deviceHwType - required: - - deviceHwType - - direction - properties: - deviceHwType: - description: Device hardware type code - type: string - direction: - description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) - type: integer - originatorIndex: - description: Optional for reverse API. This is the device set index from where the message comes from. - type: integer - airspySettings: - $ref: "/doc/swagger/include/Airspy.yaml#/AirspySettings" - airspyHFSettings: - $ref: "/doc/swagger/include/AirspyHF.yaml#/AirspyHFSettings" - bladeRF1InputSettings: - $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1InputSettings" - bladeRF2InputSettings: - $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputSettings" - bladeRF1OutputSettings: - $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings" - bladeRF2OutputSettings: - $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings" - fcdProSettings: - $ref: "/doc/swagger/include/FCDPro.yaml#/FCDProSettings" - fcdProPlusSettings: - $ref: "/doc/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings" - fileInputSettings: - $ref: "/doc/swagger/include/FileInput.yaml#/FileInputSettings" - hackRFInputSettings: - $ref: "/doc/swagger/include/HackRF.yaml#/HackRFInputSettings" - hackRFOutputSettings: - $ref: "/doc/swagger/include/HackRF.yaml#/HackRFOutputSettings" - kiwiSDRSettings: - $ref: "/doc/swagger/include/KiwiSDR.yaml#/KiwiSDRSettings" - limeSdrInputSettings: - $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings" - limeSdrOutputSettings: - $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings" - localInputSettings: - $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputSettings" - localOutputSettings: - $ref: "/doc/swagger/include/LocalOutput.yaml#/LocalOutputSettings" - perseusSettings: - $ref: "/doc/swagger/include/Perseus.yaml#/PerseusSettings" - plutoSdrInputSettings: - $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrInputSettings" - plutoSdrOutputSettings: - $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputSettings" - rtlSdrSettings: - $ref: "/doc/swagger/include/RtlSdr.yaml#/RtlSdrSettings" - remoteOutputSettings: - $ref: "/doc/swagger/include/RemoteOutput.yaml#/RemoteOutputSettings" - remoteInputSettings: - $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputSettings" - sdrPlaySettings: - $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlaySettings" - soapySDRInputSettings: - $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRInputSettings" - soapySDROutputSettings: - $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDROutputSettings" - testSourceSettings: - $ref: "/doc/swagger/include/TestSource.yaml#/TestSourceSettings" - testMISettings: - $ref: "/doc/swagger/include/TestMI.yaml#/TestMISettings" - xtrxInputSettings: - $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxInputSettings" - xtrxOutputSettings: - $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxOutputSettings" - - DeviceReport: description: Base device report. Only the device report corresponding to the device specified in the deviceHwType is or should be present. discriminator: deviceHwType @@ -2011,68 +1935,6 @@ definitions: xtrxOutputReport: $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxOutputReport" - ChannelSettings: - description: Base channel settings. Only the channel settings corresponding to the channel specified in the channelType field is or should be present. - discriminator: channelType - required: - - channelType - - direction - properties: - channelType: - description: Channel type code - type: string - direction: - description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) - type: integer - originatorDeviceSetIndex: - description: Optional for reverse API. This is the device set index from where the message comes from. - type: integer - originatorChannelIndex: - description: Optional for reverse API. This is the channel index from where the message comes from. - type: integer - AMDemodSettings: - $ref: "/doc/swagger/include/AMDemod.yaml#/AMDemodSettings" - AMModSettings: - $ref: "/doc/swagger/include/AMMod.yaml#/AMModSettings" - ATVModSettings: - $ref: "/doc/swagger/include/ATVMod.yaml#/ATVModSettings" - BFMDemodSettings: - $ref: "/doc/swagger/include/BFMDemod.yaml#/BFMDemodSettings" - DSDDemodSettings: - $ref: "/doc/swagger/include/DSDDemod.yaml#/DSDDemodSettings" - FileSourceSettings: - $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceSettings" - FreeDVDemodSettings: - $ref: "/doc/swagger/include/FreeDVDemod.yaml#/FreeDVDemodSettings" - FreeDVModSettings: - $ref: "/doc/swagger/include/FreeDVMod.yaml#/FreeDVModSettings" - FreqTrackerSettings: - $ref: "/doc/swagger/include/FreqTracker.yaml#/FreqTrackerSettings" - NFMDemodSettings: - $ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings" - NFMModSettings: - $ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings" - LocalSinkSettings: - $ref: "/doc/swagger/include/LocalSink.yaml#/LocalSinkSettings" - LocalSourceSettings: - $ref: "/doc/swagger/include/LocalSource.yaml#/LocalSourceSettings" - RemoteSinkSettings: - $ref: "/doc/swagger/include/RemoteSink.yaml#/RemoteSinkSettings" - RemoteSourceSettings: - $ref: "/doc/swagger/include/RemoteSource.yaml#/RemoteSourceSettings" - SSBModSettings: - $ref: "/doc/swagger/include/SSBMod.yaml#/SSBModSettings" - SSBDemodSettings: - $ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodSettings" - UDPSourceSettings: - $ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceSettings" - UDPSinkSettings: - $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkSettings" - WFMDemodSettings: - $ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodSettings" - WFMModSettings: - $ref: "/doc/swagger/include/WFMMod.yaml#/WFMModSettings" - ChannelReport: description: Base channel report. Only the channel report corresponding to the channel specified in the channelType field is or should be present. discriminator: channelType diff --git a/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml b/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml new file mode 100644 index 000000000..f54bd0714 --- /dev/null +++ b/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml @@ -0,0 +1,61 @@ +ChannelSettings: + description: Base channel settings. Only the channel settings corresponding to the channel specified in the channelType field is or should be present. + discriminator: channelType + required: + - channelType + - direction + properties: + channelType: + description: Channel type code + type: string + direction: + description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) + type: integer + originatorDeviceSetIndex: + description: Optional for reverse API. This is the device set index from where the message comes from. + type: integer + originatorChannelIndex: + description: Optional for reverse API. This is the channel index from where the message comes from. + type: integer + AMDemodSettings: + $ref: "http://localhost:8081/api/swagger/include/AMDemod.yaml#/AMDemodSettings" + AMModSettings: + $ref: "http://localhost:8081/api/swagger/include/AMMod.yaml#/AMModSettings" + ATVModSettings: + $ref: "http://localhost:8081/api/swagger/include/ATVMod.yaml#/ATVModSettings" + BFMDemodSettings: + $ref: "http://localhost:8081/api/swagger/include/BFMDemod.yaml#/BFMDemodSettings" + DSDDemodSettings: + $ref: "http://localhost:8081/api/swagger/include/DSDDemod.yaml#/DSDDemodSettings" + FileSourceSettings: + $ref: "http://localhost:8081/api/swagger/include/FileSource.yaml#/FileSourceSettings" + FreeDVDemodSettings: + $ref: "http://localhost:8081/api/swagger/include/FreeDVDemod.yaml#/FreeDVDemodSettings" + FreeDVModSettings: + $ref: "http://localhost:8081/api/swagger/include/FreeDVMod.yaml#/FreeDVModSettings" + FreqTrackerSettings: + $ref: "http://localhost:8081/api/swagger/include/FreqTracker.yaml#/FreqTrackerSettings" + NFMDemodSettings: + $ref: "http://localhost:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodSettings" + NFMModSettings: + $ref: "http://localhost:8081/api/swagger/include/NFMMod.yaml#/NFMModSettings" + LocalSinkSettings: + $ref: "http://localhost:8081/api/swagger/include/LocalSink.yaml#/LocalSinkSettings" + LocalSourceSettings: + $ref: "http://localhost:8081/api/swagger/include/LocalSource.yaml#/LocalSourceSettings" + RemoteSinkSettings: + $ref: "http://localhost:8081/api/swagger/include/RemoteSink.yaml#/RemoteSinkSettings" + RemoteSourceSettings: + $ref: "http://localhost:8081/api/swagger/include/RemoteSource.yaml#/RemoteSourceSettings" + SSBModSettings: + $ref: "http://localhost:8081/api/swagger/include/SSBMod.yaml#/SSBModSettings" + SSBDemodSettings: + $ref: "http://localhost:8081/api/swagger/include/SSBDemod.yaml#/SSBDemodSettings" + UDPSourceSettings: + $ref: "http://localhost:8081/api/swagger/include/UDPSource.yaml#/UDPSourceSettings" + UDPSinkSettings: + $ref: "http://localhost:8081/api/swagger/include/UDPSink.yaml#/UDPSinkSettings" + WFMDemodSettings: + $ref: "http://localhost:8081/api/swagger/include/WFMDemod.yaml#/WFMDemodSettings" + WFMModSettings: + $ref: "http://localhost:8081/api/swagger/include/WFMMod.yaml#/WFMModSettings" diff --git a/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml b/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml new file mode 100644 index 000000000..83056d97c --- /dev/null +++ b/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml @@ -0,0 +1,74 @@ +DeviceSettings: + description: Base device settings. Only the device settings corresponding to the device specified in the deviceHwType field is or should be present. + discriminator: deviceHwType + required: + - deviceHwType + - direction + properties: + deviceHwType: + description: Device hardware type code + type: string + direction: + description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) + type: integer + originatorIndex: + description: Optional for reverse API. This is the device set index from where the message comes from. + type: integer + airspySettings: + $ref: "http://localhost:8081/api/swagger/include/Airspy.yaml#/AirspySettings" + airspyHFSettings: + $ref: "http://localhost:8081/api/swagger/include/AirspyHF.yaml#/AirspyHFSettings" + bladeRF1InputSettings: + $ref: "http://localhost:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1InputSettings" + bladeRF2InputSettings: + $ref: "http://localhost:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputSettings" + bladeRF1OutputSettings: + $ref: "http://localhost:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings" + bladeRF2OutputSettings: + $ref: "http://localhost:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings" + fcdProSettings: + $ref: "http://localhost:8081/api/swagger/include/FCDPro.yaml#/FCDProSettings" + fcdProPlusSettings: + $ref: "http://localhost:8081/api/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings" + fileInputSettings: + $ref: "http://localhost:8081/api/swagger/include/FileInput.yaml#/FileInputSettings" + hackRFInputSettings: + $ref: "http://localhost:8081/api/swagger/include/HackRF.yaml#/HackRFInputSettings" + hackRFOutputSettings: + $ref: "http://localhost:8081/api/swagger/include/HackRF.yaml#/HackRFOutputSettings" + kiwiSDRSettings: + $ref: "http://localhost:8081/api/swagger/include/KiwiSDR.yaml#/KiwiSDRSettings" + limeSdrInputSettings: + $ref: "http://localhost:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings" + limeSdrOutputSettings: + $ref: "http://localhost:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings" + localInputSettings: + $ref: "http://localhost:8081/api/swagger/include/LocalInput.yaml#/LocalInputSettings" + localOutputSettings: + $ref: "http://localhost:8081/api/swagger/include/LocalOutput.yaml#/LocalOutputSettings" + perseusSettings: + $ref: "http://localhost:8081/api/swagger/include/Perseus.yaml#/PerseusSettings" + plutoSdrInputSettings: + $ref: "http://localhost:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrInputSettings" + plutoSdrOutputSettings: + $ref: "http://localhost:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputSettings" + rtlSdrSettings: + $ref: "http://localhost:8081/api/swagger/include/RtlSdr.yaml#/RtlSdrSettings" + remoteOutputSettings: + $ref: "http://localhost:8081/api/swagger/include/RemoteOutput.yaml#/RemoteOutputSettings" + remoteInputSettings: + $ref: "http://localhost:8081/api/swagger/include/RemoteInput.yaml#/RemoteInputSettings" + sdrPlaySettings: + $ref: "http://localhost:8081/api/swagger/include/SDRPlay.yaml#/SDRPlaySettings" + soapySDRInputSettings: + $ref: "http://localhost:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRInputSettings" + soapySDROutputSettings: + $ref: "http://localhost:8081/api/swagger/include/SoapySDR.yaml#/SoapySDROutputSettings" + testSourceSettings: + $ref: "http://localhost:8081/api/swagger/include/TestSource.yaml#/TestSourceSettings" + testMISettings: + $ref: "http://localhost:8081/api/swagger/include/TestMI.yaml#/TestMISettings" + xtrxInputSettings: + $ref: "http://localhost:8081/api/swagger/include/Xtrx.yaml#/XtrxInputSettings" + xtrxOutputSettings: + $ref: "http://localhost:8081/api/swagger/include/Xtrx.yaml#/XtrxOutputSettings" diff --git a/swagger/sdrangel/api/swagger/include/Preset.yaml b/swagger/sdrangel/api/swagger/include/Preset.yaml index ddbfd0be8..7d5f287e3 100644 --- a/swagger/sdrangel/api/swagger/include/Preset.yaml +++ b/swagger/sdrangel/api/swagger/include/Preset.yaml @@ -8,7 +8,7 @@ DeviceConfig: deviceSequence: type: integer config: - $ref: "http://localhost:8081/api/swagger/swagger.yaml#/definitions/DeviceSettings" + $ref: "http://localhost:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" ChannelConfig: description: Represents a Preset::ChannelConfig object @@ -20,7 +20,7 @@ ChannelConfig: description: Channel type ID in short form from object name type: string config: - $ref: "http://localhost:8081/api/swagger/swagger.yaml#/definitions/ChannelSettings" + $ref: "http://localhost:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" Preset: description: Represents a Preset object diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml index 13a6f0158..af5bd5b8a 100644 --- a/swagger/sdrangel/api/swagger/swagger.yaml +++ b/swagger/sdrangel/api/swagger/swagger.yaml @@ -868,7 +868,7 @@ paths: "200": description: On success returns current settings values schema: - $ref: "#/definitions/DeviceSettings" + $ref: "http://localhost:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" "404": description: Invalid device set index or device not found schema: @@ -893,12 +893,12 @@ paths: description: Device settings to apply required: true schema: - $ref: "#/definitions/DeviceSettings" + $ref: "http://localhost:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success returns new settings values schema: - $ref: "#/definitions/DeviceSettings" + $ref: "http://localhost:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" "404": description: Invalid device set index or device not found schema: @@ -923,12 +923,12 @@ paths: description: Device settings to apply required: true schema: - $ref: "#/definitions/DeviceSettings" + $ref: "http://localhost:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success returns new settings values schema: - $ref: "#/definitions/DeviceSettings" + $ref: "http://localhost:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" "404": description: Invalid device set index or device not found schema: @@ -984,7 +984,7 @@ paths: description: Originator information in the reverse API case required: false schema: - $ref: "#/definitions/DeviceSettings" + $ref: "http://localhost:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success return state before change @@ -1018,7 +1018,7 @@ paths: description: Originator information in the reverse API case required: false schema: - $ref: "#/definitions/DeviceSettings" + $ref: "http://localhost:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success return state before change @@ -1119,7 +1119,7 @@ paths: description: Channel identification (no settings data) required: true schema: - $ref: "#/definitions/ChannelSettings" + $ref: "http://localhost:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" responses: "202": description: Message to add a channel was sent successfully @@ -1159,7 +1159,7 @@ paths: "200": description: On success return deleted channel settings schema: - $ref: "#/definitions/ChannelSettings" + $ref: "http://localhost:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1195,7 +1195,7 @@ paths: "200": description: On success return channel settings schema: - $ref: "#/definitions/ChannelSettings" + $ref: "http://localhost:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1229,12 +1229,12 @@ paths: description: Channel settings to apply required: true schema: - $ref: "#/definitions/ChannelSettings" + $ref: "http://localhost:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" responses: "200": description: On success return channel new settings schema: - $ref: "#/definitions/ChannelSettings" + $ref: "http://localhost:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1268,12 +1268,12 @@ paths: description: Channel settings to apply required: true schema: - $ref: "#/definitions/ChannelSettings" + $ref: "http://localhost:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" responses: "200": description: On success return channel new settings schema: - $ref: "#/definitions/ChannelSettings" + $ref: "http://localhost:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1879,82 +1879,6 @@ definitions: preset: $ref: "#/definitions/PresetIdentifier" - DeviceSettings: - description: Base device settings. Only the device settings corresponding to the device specified in the deviceHwType field is or should be present. - discriminator: deviceHwType - required: - - deviceHwType - - direction - properties: - deviceHwType: - description: Device hardware type code - type: string - direction: - description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) - type: integer - originatorIndex: - description: Optional for reverse API. This is the device set index from where the message comes from. - type: integer - airspySettings: - $ref: "http://localhost:8081/api/swagger/include/Airspy.yaml#/AirspySettings" - airspyHFSettings: - $ref: "http://localhost:8081/api/swagger/include/AirspyHF.yaml#/AirspyHFSettings" - bladeRF1InputSettings: - $ref: "http://localhost:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1InputSettings" - bladeRF2InputSettings: - $ref: "http://localhost:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputSettings" - bladeRF1OutputSettings: - $ref: "http://localhost:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings" - bladeRF2OutputSettings: - $ref: "http://localhost:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings" - fcdProSettings: - $ref: "http://localhost:8081/api/swagger/include/FCDPro.yaml#/FCDProSettings" - fcdProPlusSettings: - $ref: "http://localhost:8081/api/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings" - fileInputSettings: - $ref: "http://localhost:8081/api/swagger/include/FileInput.yaml#/FileInputSettings" - hackRFInputSettings: - $ref: "http://localhost:8081/api/swagger/include/HackRF.yaml#/HackRFInputSettings" - hackRFOutputSettings: - $ref: "http://localhost:8081/api/swagger/include/HackRF.yaml#/HackRFOutputSettings" - kiwiSDRSettings: - $ref: "http://localhost:8081/api/swagger/include/KiwiSDR.yaml#/KiwiSDRSettings" - limeSdrInputSettings: - $ref: "http://localhost:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings" - limeSdrOutputSettings: - $ref: "http://localhost:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings" - localInputSettings: - $ref: "http://localhost:8081/api/swagger/include/LocalInput.yaml#/LocalInputSettings" - localOutputSettings: - $ref: "http://localhost:8081/api/swagger/include/LocalOutput.yaml#/LocalOutputSettings" - perseusSettings: - $ref: "http://localhost:8081/api/swagger/include/Perseus.yaml#/PerseusSettings" - plutoSdrInputSettings: - $ref: "http://localhost:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrInputSettings" - plutoSdrOutputSettings: - $ref: "http://localhost:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputSettings" - rtlSdrSettings: - $ref: "http://localhost:8081/api/swagger/include/RtlSdr.yaml#/RtlSdrSettings" - remoteOutputSettings: - $ref: "http://localhost:8081/api/swagger/include/RemoteOutput.yaml#/RemoteOutputSettings" - remoteInputSettings: - $ref: "http://localhost:8081/api/swagger/include/RemoteInput.yaml#/RemoteInputSettings" - sdrPlaySettings: - $ref: "http://localhost:8081/api/swagger/include/SDRPlay.yaml#/SDRPlaySettings" - soapySDRInputSettings: - $ref: "http://localhost:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRInputSettings" - soapySDROutputSettings: - $ref: "http://localhost:8081/api/swagger/include/SoapySDR.yaml#/SoapySDROutputSettings" - testSourceSettings: - $ref: "http://localhost:8081/api/swagger/include/TestSource.yaml#/TestSourceSettings" - testMISettings: - $ref: "http://localhost:8081/api/swagger/include/TestMI.yaml#/TestMISettings" - xtrxInputSettings: - $ref: "http://localhost:8081/api/swagger/include/Xtrx.yaml#/XtrxInputSettings" - xtrxOutputSettings: - $ref: "http://localhost:8081/api/swagger/include/Xtrx.yaml#/XtrxOutputSettings" - - DeviceReport: description: Base device report. Only the device report corresponding to the device specified in the deviceHwType is or should be present. discriminator: deviceHwType @@ -2011,68 +1935,6 @@ definitions: xtrxOutputReport: $ref: "http://localhost:8081/api/swagger/include/Xtrx.yaml#/XtrxOutputReport" - ChannelSettings: - description: Base channel settings. Only the channel settings corresponding to the channel specified in the channelType field is or should be present. - discriminator: channelType - required: - - channelType - - direction - properties: - channelType: - description: Channel type code - type: string - direction: - description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) - type: integer - originatorDeviceSetIndex: - description: Optional for reverse API. This is the device set index from where the message comes from. - type: integer - originatorChannelIndex: - description: Optional for reverse API. This is the channel index from where the message comes from. - type: integer - AMDemodSettings: - $ref: "http://localhost:8081/api/swagger/include/AMDemod.yaml#/AMDemodSettings" - AMModSettings: - $ref: "http://localhost:8081/api/swagger/include/AMMod.yaml#/AMModSettings" - ATVModSettings: - $ref: "http://localhost:8081/api/swagger/include/ATVMod.yaml#/ATVModSettings" - BFMDemodSettings: - $ref: "http://localhost:8081/api/swagger/include/BFMDemod.yaml#/BFMDemodSettings" - DSDDemodSettings: - $ref: "http://localhost:8081/api/swagger/include/DSDDemod.yaml#/DSDDemodSettings" - FileSourceSettings: - $ref: "http://localhost:8081/api/swagger/include/FileSource.yaml#/FileSourceSettings" - FreeDVDemodSettings: - $ref: "http://localhost:8081/api/swagger/include/FreeDVDemod.yaml#/FreeDVDemodSettings" - FreeDVModSettings: - $ref: "http://localhost:8081/api/swagger/include/FreeDVMod.yaml#/FreeDVModSettings" - FreqTrackerSettings: - $ref: "http://localhost:8081/api/swagger/include/FreqTracker.yaml#/FreqTrackerSettings" - NFMDemodSettings: - $ref: "http://localhost:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodSettings" - NFMModSettings: - $ref: "http://localhost:8081/api/swagger/include/NFMMod.yaml#/NFMModSettings" - LocalSinkSettings: - $ref: "http://localhost:8081/api/swagger/include/LocalSink.yaml#/LocalSinkSettings" - LocalSourceSettings: - $ref: "http://localhost:8081/api/swagger/include/LocalSource.yaml#/LocalSourceSettings" - RemoteSinkSettings: - $ref: "http://localhost:8081/api/swagger/include/RemoteSink.yaml#/RemoteSinkSettings" - RemoteSourceSettings: - $ref: "http://localhost:8081/api/swagger/include/RemoteSource.yaml#/RemoteSourceSettings" - SSBModSettings: - $ref: "http://localhost:8081/api/swagger/include/SSBMod.yaml#/SSBModSettings" - SSBDemodSettings: - $ref: "http://localhost:8081/api/swagger/include/SSBDemod.yaml#/SSBDemodSettings" - UDPSourceSettings: - $ref: "http://localhost:8081/api/swagger/include/UDPSource.yaml#/UDPSourceSettings" - UDPSinkSettings: - $ref: "http://localhost:8081/api/swagger/include/UDPSink.yaml#/UDPSinkSettings" - WFMDemodSettings: - $ref: "http://localhost:8081/api/swagger/include/WFMDemod.yaml#/WFMDemodSettings" - WFMModSettings: - $ref: "http://localhost:8081/api/swagger/include/WFMMod.yaml#/WFMModSettings" - ChannelReport: description: Base channel report. Only the channel report corresponding to the channel specified in the channelType field is or should be present. discriminator: channelType diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 28f056d63..de02f6952 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -1770,7 +1770,7 @@ margin-bottom: 20px; "description" : "Channel type ID in short form from object name" }, "config" : { - "$ref" : "#/definitions/ChannelSettings_2" + "$ref" : "#/definitions/ChannelSettings" } }, "description" : "Represents a Preset::ChannelConfig object" @@ -1958,92 +1958,6 @@ margin-bottom: 20px; } }, "description" : "Base channel settings. Only the channel settings corresponding to the channel specified in the channelType field is or should be present." -}; - defs.ChannelSettings_2 = { - "required" : [ "channelType", "direction" ], - "discriminator" : "channelType", - "properties" : { - "channelType" : { - "type" : "string", - "description" : "Channel type code" - }, - "direction" : { - "type" : "integer", - "description" : "0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0)" - }, - "originatorDeviceSetIndex" : { - "type" : "integer", - "description" : "Optional for reverse API. This is the device set index from where the message comes from." - }, - "originatorChannelIndex" : { - "type" : "integer", - "description" : "Optional for reverse API. This is the channel index from where the message comes from." - }, - "AMDemodSettings" : { - "$ref" : "#/definitions/AMDemodSettings" - }, - "AMModSettings" : { - "$ref" : "#/definitions/AMModSettings" - }, - "ATVModSettings" : { - "$ref" : "#/definitions/ATVModSettings" - }, - "BFMDemodSettings" : { - "$ref" : "#/definitions/BFMDemodSettings" - }, - "DSDDemodSettings" : { - "$ref" : "#/definitions/DSDDemodSettings" - }, - "FileSourceSettings" : { - "$ref" : "#/definitions/FileSourceSettings" - }, - "FreeDVDemodSettings" : { - "$ref" : "#/definitions/FreeDVDemodSettings" - }, - "FreeDVModSettings" : { - "$ref" : "#/definitions/FreeDVModSettings" - }, - "FreqTrackerSettings" : { - "$ref" : "#/definitions/FreqTrackerSettings" - }, - "NFMDemodSettings" : { - "$ref" : "#/definitions/NFMDemodSettings" - }, - "NFMModSettings" : { - "$ref" : "#/definitions/NFMModSettings" - }, - "LocalSinkSettings" : { - "$ref" : "#/definitions/LocalSinkSettings" - }, - "LocalSourceSettings" : { - "$ref" : "#/definitions/LocalSourceSettings" - }, - "RemoteSinkSettings" : { - "$ref" : "#/definitions/RemoteSinkSettings" - }, - "RemoteSourceSettings" : { - "$ref" : "#/definitions/RemoteSourceSettings" - }, - "SSBModSettings" : { - "$ref" : "#/definitions/SSBModSettings" - }, - "SSBDemodSettings" : { - "$ref" : "#/definitions/SSBDemodSettings" - }, - "UDPSourceSettings" : { - "$ref" : "#/definitions/UDPSourceSettings" - }, - "UDPSinkSettings" : { - "$ref" : "#/definitions/UDPSinkSettings" - }, - "WFMDemodSettings" : { - "$ref" : "#/definitions/WFMDemodSettings" - }, - "WFMModSettings" : { - "$ref" : "#/definitions/WFMModSettings" - } - }, - "description" : "Base channel settings. Only the channel settings corresponding to the channel specified in the channelType field is or should be present." }; defs.ChannelsDetail = { "required" : [ "channelcount" ], @@ -2297,7 +2211,7 @@ margin-bottom: 20px; "type" : "integer" }, "config" : { - "$ref" : "#/definitions/DeviceSettings_2" + "$ref" : "#/definitions/DeviceSettings" } }, "description" : "Represents a Preset::DeviceConfig object" @@ -2566,112 +2480,6 @@ margin-bottom: 20px; } }, "description" : "Base device settings. Only the device settings corresponding to the device specified in the deviceHwType field is or should be present." -}; - defs.DeviceSettings_2 = { - "required" : [ "deviceHwType", "direction" ], - "discriminator" : "deviceHwType", - "properties" : { - "deviceHwType" : { - "type" : "string", - "description" : "Device hardware type code" - }, - "direction" : { - "type" : "integer", - "description" : "0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0)" - }, - "originatorIndex" : { - "type" : "integer", - "description" : "Optional for reverse API. This is the device set index from where the message comes from." - }, - "airspySettings" : { - "$ref" : "#/definitions/AirspySettings" - }, - "airspyHFSettings" : { - "$ref" : "#/definitions/AirspyHFSettings" - }, - "bladeRF1InputSettings" : { - "$ref" : "#/definitions/BladeRF1InputSettings" - }, - "bladeRF2InputSettings" : { - "$ref" : "#/definitions/BladeRF2InputSettings" - }, - "bladeRF1OutputSettings" : { - "$ref" : "#/definitions/BladeRF1OutputSettings" - }, - "bladeRF2OutputSettings" : { - "$ref" : "#/definitions/BladeRF2OutputSettings" - }, - "fcdProSettings" : { - "$ref" : "#/definitions/FCDProSettings" - }, - "fcdProPlusSettings" : { - "$ref" : "#/definitions/FCDProPlusSettings" - }, - "fileInputSettings" : { - "$ref" : "#/definitions/FileInputSettings" - }, - "hackRFInputSettings" : { - "$ref" : "#/definitions/HackRFInputSettings" - }, - "hackRFOutputSettings" : { - "$ref" : "#/definitions/HackRFOutputSettings" - }, - "kiwiSDRSettings" : { - "$ref" : "#/definitions/KiwiSDRSettings" - }, - "limeSdrInputSettings" : { - "$ref" : "#/definitions/LimeSdrInputSettings" - }, - "limeSdrOutputSettings" : { - "$ref" : "#/definitions/LimeSdrOutputSettings" - }, - "localInputSettings" : { - "$ref" : "#/definitions/LocalInputSettings" - }, - "localOutputSettings" : { - "$ref" : "#/definitions/LocalOutputSettings" - }, - "perseusSettings" : { - "$ref" : "#/definitions/PerseusSettings" - }, - "plutoSdrInputSettings" : { - "$ref" : "#/definitions/PlutoSdrInputSettings" - }, - "plutoSdrOutputSettings" : { - "$ref" : "#/definitions/PlutoSdrOutputSettings" - }, - "rtlSdrSettings" : { - "$ref" : "#/definitions/RtlSdrSettings" - }, - "remoteOutputSettings" : { - "$ref" : "#/definitions/RemoteOutputSettings" - }, - "remoteInputSettings" : { - "$ref" : "#/definitions/RemoteInputSettings" - }, - "sdrPlaySettings" : { - "$ref" : "#/definitions/SDRPlaySettings" - }, - "soapySDRInputSettings" : { - "$ref" : "#/definitions/SoapySDRInputSettings" - }, - "soapySDROutputSettings" : { - "$ref" : "#/definitions/SoapySDROutputSettings" - }, - "testSourceSettings" : { - "$ref" : "#/definitions/TestSourceSettings" - }, - "testMISettings" : { - "$ref" : "#/definitions/TestMISettings" - }, - "xtrxInputSettings" : { - "$ref" : "#/definitions/XtrxInputSettings" - }, - "xtrxOutputSettings" : { - "$ref" : "#/definitions/XtrxOutputSettings" - } - }, - "description" : "Base device settings. Only the device settings corresponding to the device specified in the deviceHwType field is or should be present." }; defs.DeviceState = { "required" : [ "state" ], @@ -27161,7 +26969,7 @@ except ApiException as e:
- Generated 2019-07-31T18:41:04.524+02:00 + Generated 2019-07-31T22:38:42.618+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelConfig.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelConfig.cpp index eab913ee3..9f34d4b98 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelConfig.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChannelConfig.cpp @@ -46,7 +46,7 @@ SWGChannelConfig::init() { m_channel_id_uri_isSet = false; channel_id = new QString(""); m_channel_id_isSet = false; - config = new SWGChannelSettings_2(); + config = new SWGChannelSettings(); m_config_isSet = false; } @@ -78,7 +78,7 @@ SWGChannelConfig::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&channel_id, pJson["channelId"], "QString", "QString"); - ::SWGSDRangel::setValue(&config, pJson["config"], "SWGChannelSettings_2", "SWGChannelSettings_2"); + ::SWGSDRangel::setValue(&config, pJson["config"], "SWGChannelSettings", "SWGChannelSettings"); } @@ -103,7 +103,7 @@ SWGChannelConfig::asJsonObject() { toJsonValue(QString("channelId"), channel_id, obj, QString("QString")); } if((config != nullptr) && (config->isSet())){ - toJsonValue(QString("config"), config, obj, QString("SWGChannelSettings_2")); + toJsonValue(QString("config"), config, obj, QString("SWGChannelSettings")); } return obj; @@ -129,12 +129,12 @@ SWGChannelConfig::setChannelId(QString* channel_id) { this->m_channel_id_isSet = true; } -SWGChannelSettings_2* +SWGChannelSettings* SWGChannelConfig::getConfig() { return config; } void -SWGChannelConfig::setConfig(SWGChannelSettings_2* config) { +SWGChannelConfig::setConfig(SWGChannelSettings* config) { this->config = config; this->m_config_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelConfig.h b/swagger/sdrangel/code/qt5/client/SWGChannelConfig.h index 983f371c4..0fe9e1635 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelConfig.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelConfig.h @@ -22,7 +22,7 @@ #include -#include "SWGChannelSettings_2.h" +#include "SWGChannelSettings.h" #include #include "SWGObject.h" @@ -49,8 +49,8 @@ public: QString* getChannelId(); void setChannelId(QString* channel_id); - SWGChannelSettings_2* getConfig(); - void setConfig(SWGChannelSettings_2* config); + SWGChannelSettings* getConfig(); + void setConfig(SWGChannelSettings* config); virtual bool isSet() override; @@ -62,7 +62,7 @@ private: QString* channel_id; bool m_channel_id_isSet; - SWGChannelSettings_2* config; + SWGChannelSettings* config; bool m_config_isSet; }; diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.cpp index 44e6f07c0..1aff8eed8 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.cpp @@ -50,7 +50,7 @@ SWGDeviceConfig::init() { m_device_serial_isSet = false; device_sequence = 0; m_device_sequence_isSet = false; - config = new SWGDeviceSettings_2(); + config = new SWGDeviceSettings(); m_config_isSet = false; } @@ -85,7 +85,7 @@ SWGDeviceConfig::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&device_sequence, pJson["deviceSequence"], "qint32", ""); - ::SWGSDRangel::setValue(&config, pJson["config"], "SWGDeviceSettings_2", "SWGDeviceSettings_2"); + ::SWGSDRangel::setValue(&config, pJson["config"], "SWGDeviceSettings", "SWGDeviceSettings"); } @@ -113,7 +113,7 @@ SWGDeviceConfig::asJsonObject() { obj->insert("deviceSequence", QJsonValue(device_sequence)); } if((config != nullptr) && (config->isSet())){ - toJsonValue(QString("config"), config, obj, QString("SWGDeviceSettings_2")); + toJsonValue(QString("config"), config, obj, QString("SWGDeviceSettings")); } return obj; @@ -149,12 +149,12 @@ SWGDeviceConfig::setDeviceSequence(qint32 device_sequence) { this->m_device_sequence_isSet = true; } -SWGDeviceSettings_2* +SWGDeviceSettings* SWGDeviceConfig::getConfig() { return config; } void -SWGDeviceConfig::setConfig(SWGDeviceSettings_2* config) { +SWGDeviceConfig::setConfig(SWGDeviceSettings* config) { this->config = config; this->m_config_isSet = true; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.h b/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.h index 885024976..24b7a0b89 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.h +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceConfig.h @@ -22,7 +22,7 @@ #include -#include "SWGDeviceSettings_2.h" +#include "SWGDeviceSettings.h" #include #include "SWGObject.h" @@ -52,8 +52,8 @@ public: qint32 getDeviceSequence(); void setDeviceSequence(qint32 device_sequence); - SWGDeviceSettings_2* getConfig(); - void setConfig(SWGDeviceSettings_2* config); + SWGDeviceSettings* getConfig(); + void setConfig(SWGDeviceSettings* config); virtual bool isSet() override; @@ -68,7 +68,7 @@ private: qint32 device_sequence; bool m_device_sequence_isSet; - SWGDeviceSettings_2* config; + SWGDeviceSettings* config; bool m_config_isSet; }; diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index be347ceaa..01b3f1305 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -46,7 +46,6 @@ #include "SWGChannelListItem.h" #include "SWGChannelReport.h" #include "SWGChannelSettings.h" -#include "SWGChannelSettings_2.h" #include "SWGChannelsDetail.h" #include "SWGCommand.h" #include "SWGComplex.h" @@ -60,7 +59,6 @@ #include "SWGDeviceSet.h" #include "SWGDeviceSetList.h" #include "SWGDeviceSettings.h" -#include "SWGDeviceSettings_2.h" #include "SWGDeviceState.h" #include "SWGErrorResponse.h" #include "SWGFCDProPlusSettings.h" @@ -262,9 +260,6 @@ namespace SWGSDRangel { if(QString("SWGChannelSettings").compare(type) == 0) { return new SWGChannelSettings(); } - if(QString("SWGChannelSettings_2").compare(type) == 0) { - return new SWGChannelSettings_2(); - } if(QString("SWGChannelsDetail").compare(type) == 0) { return new SWGChannelsDetail(); } @@ -304,9 +299,6 @@ namespace SWGSDRangel { if(QString("SWGDeviceSettings").compare(type) == 0) { return new SWGDeviceSettings(); } - if(QString("SWGDeviceSettings_2").compare(type) == 0) { - return new SWGDeviceSettings_2(); - } if(QString("SWGDeviceState").compare(type) == 0) { return new SWGDeviceState(); }