Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Commit: c0cc7ef192
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-21 (Sun, 21 May 2017)
This commit is contained in:
2017-05-21 18:09:22 +02:00
9 changed files with 35 additions and 32 deletions

View File

@@ -534,7 +534,7 @@
<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="618000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>