mirror of
				https://github.com/f4exb/sdrangel.git
				synced 2025-10-31 13:00:26 -04:00 
			
		
		
		
	DSD decoder: updated to get symbol PLL lock status. Bumped to version 3.4.2
This commit is contained in:
		
							parent
							
								
									cf267b1254
								
							
						
					
					
						commit
						15443fb72d
					
				
							
								
								
									
										8
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								debian/changelog
									
									
									
									
										vendored
									
									
								
							| @ -1,3 +1,11 @@ | |||||||
|  | sdrangel (3.4.2-1) unstable; urgency=medium | ||||||
|  | 
 | ||||||
|  |   * DSD demod: use version 1.7.0 of dsdcc with PLL for symbol synchronization | ||||||
|  |   * DSD demod: kernel >= 4.4.52 workaround for SerialDV | ||||||
|  |   * Code cleanup: cppchack and Eclipse warnings | ||||||
|  |    | ||||||
|  |  -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Wed, 26 Apr 2017 23:14:18 +0100 | ||||||
|  | 
 | ||||||
| sdrangel (3.4.1-1) unstable; urgency=medium | sdrangel (3.4.1-1) unstable; urgency=medium | ||||||
| 
 | 
 | ||||||
|   * Optimization of halfband interpolation FIR fitler processing |   * Optimization of halfband interpolation FIR fitler processing | ||||||
|  | |||||||
| @ -48,6 +48,7 @@ public: | |||||||
|     bool getVoice1On() const { return m_decoder.getVoice1On(); } |     bool getVoice1On() const { return m_decoder.getVoice1On(); } | ||||||
|     bool getVoice2On() const { return m_decoder.getVoice2On(); } |     bool getVoice2On() const { return m_decoder.getVoice2On(); } | ||||||
|     void setTDMAStereo(bool tdmaStereo) { m_decoder.setTDMAStereo(tdmaStereo); } |     void setTDMAStereo(bool tdmaStereo) { m_decoder.setTDMAStereo(tdmaStereo); } | ||||||
|  |     bool getSymbolPLLLocked() const { return m_decoder.getSymbolPLLLocked(); } | ||||||
| 
 | 
 | ||||||
|     int getMbeRateIndex() const { return (int) m_decoder.getMbeRate(); } |     int getMbeRateIndex() const { return (int) m_decoder.getMbeRate(); } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -663,7 +663,13 @@ void DSDDemodGUI::tick() | |||||||
|             ui->formatStatusText->setStyleSheet("QLabel { background:rgb(37,53,39); }"); // turn on background
 |             ui->formatStatusText->setStyleSheet("QLabel { background:rgb(37,53,39); }"); // turn on background
 | ||||||
| 	    } | 	    } | ||||||
| 
 | 
 | ||||||
| 	    m_tickCount = 0; |         if (m_squelchOpen && m_dsdDemod->getDecoder().getSymbolPLLLocked()) { | ||||||
|  |             ui->symbolPLLLock->setStyleSheet("QToolButton { background-color : green; }"); | ||||||
|  |         } else { | ||||||
|  |             ui->symbolPLLLock->setStyleSheet("QToolButton { background:rgb(53,53,53); }"); | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|  |         m_tickCount = 0; | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -59,7 +59,16 @@ | |||||||
|     <property name="spacing"> |     <property name="spacing"> | ||||||
|      <number>3</number> |      <number>3</number> | ||||||
|     </property> |     </property> | ||||||
|     <property name="margin"> |     <property name="leftMargin"> | ||||||
|  |      <number>2</number> | ||||||
|  |     </property> | ||||||
|  |     <property name="topMargin"> | ||||||
|  |      <number>2</number> | ||||||
|  |     </property> | ||||||
|  |     <property name="rightMargin"> | ||||||
|  |      <number>2</number> | ||||||
|  |     </property> | ||||||
|  |     <property name="bottomMargin"> | ||||||
|      <number>2</number> |      <number>2</number> | ||||||
|     </property> |     </property> | ||||||
|     <item> |     <item> | ||||||
| @ -213,6 +222,23 @@ | |||||||
|         </property> |         </property> | ||||||
|        </widget> |        </widget> | ||||||
|       </item> |       </item> | ||||||
|  |       <item> | ||||||
|  |        <widget class="QToolButton" name="symbolPLLLock"> | ||||||
|  |         <property name="enabled"> | ||||||
|  |          <bool>false</bool> | ||||||
|  |         </property> | ||||||
|  |         <property name="toolTip"> | ||||||
|  |          <string>Symbol PLL lock indicator (green: locked)</string> | ||||||
|  |         </property> | ||||||
|  |         <property name="text"> | ||||||
|  |          <string>...</string> | ||||||
|  |         </property> | ||||||
|  |         <property name="icon"> | ||||||
|  |          <iconset resource="../../../sdrbase/resources/res.qrc"> | ||||||
|  |           <normaloff>:/locked.png</normaloff>:/locked.png</iconset> | ||||||
|  |         </property> | ||||||
|  |        </widget> | ||||||
|  |       </item> | ||||||
|       <item> |       <item> | ||||||
|        <widget class="QLabel" name="symbolSyncQualityText"> |        <widget class="QLabel" name="symbolSyncQualityText"> | ||||||
|         <property name="minimumSize"> |         <property name="minimumSize"> | ||||||
| @ -895,7 +921,16 @@ | |||||||
|     <string>Discriminator Scope</string> |     <string>Discriminator Scope</string> | ||||||
|    </property> |    </property> | ||||||
|    <layout class="QVBoxLayout" name="scopeContainer"> |    <layout class="QVBoxLayout" name="scopeContainer"> | ||||||
|     <property name="margin"> |     <property name="leftMargin"> | ||||||
|  |      <number>2</number> | ||||||
|  |     </property> | ||||||
|  |     <property name="topMargin"> | ||||||
|  |      <number>2</number> | ||||||
|  |     </property> | ||||||
|  |     <property name="rightMargin"> | ||||||
|  |      <number>2</number> | ||||||
|  |     </property> | ||||||
|  |     <property name="bottomMargin"> | ||||||
|      <number>2</number> |      <number>2</number> | ||||||
|     </property> |     </property> | ||||||
|     <item> |     <item> | ||||||
|  | |||||||
| @ -24,7 +24,7 @@ | |||||||
| 
 | 
 | ||||||
| const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = { | const PluginDescriptor DSDDemodPlugin::m_pluginDescriptor = { | ||||||
| 	QString("DSD Demodulator"), | 	QString("DSD Demodulator"), | ||||||
| 	QString("3.2.0"), | 	QString("3.4.2"), | ||||||
| 	QString("(c) Edouard Griffiths, F4EXB"), | 	QString("(c) Edouard Griffiths, F4EXB"), | ||||||
| 	QString("https://github.com/f4exb/sdrangel"), | 	QString("https://github.com/f4exb/sdrangel"), | ||||||
| 	true, | 	true, | ||||||
|  | |||||||
| @ -84,7 +84,7 @@ | |||||||
|    <item> |    <item> | ||||||
|     <widget class="QLabel" name="label_2"> |     <widget class="QLabel" name="label_2"> | ||||||
|      <property name="text"> |      <property name="text"> | ||||||
|       <string><html><head/><body><p>Version 3.4.1 - Copyright (C) 2015-2017 Edouard Griffiths, F4EXB. </p><p>Code at <a href="https://github.com/f4exb/sdrangel"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/f4exb/sdrangel</span></a></p><p>Many thanks to the original developers:</p><p>The osmocom developer team - especially horizon, Hoernchen &amp; tnt.</p><p>Christian Daniel from maintech GmbH.</p><p>John Greb (hexameron) for the contributions in <a href="https://github.com/hexameron/rtl-sdrangelove"><span style=" text-decoration: underline; color:#0000ff;">RTL-SDRangelove</span></a></p><p>The following rules apply to the SDRangel main application and libsdrbase:<br/>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. You should have received a copy of the GNU General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/"><span style=" text-decoration: underline; color:#0000ff;">http://www.gnu.org/licenses/</span></a>.</p><p>For the license of installed plugins, look into the plugin list.</p></body></html></string> |       <string><html><head/><body><p>Version 3.4.2 - Copyright (C) 2015-2017 Edouard Griffiths, F4EXB. </p><p>Code at <a href="https://github.com/f4exb/sdrangel"><span style=" text-decoration: underline; color:#0000ff;">https://github.com/f4exb/sdrangel</span></a></p><p>Many thanks to the original developers:</p><p>The osmocom developer team - especially horizon, Hoernchen &amp; tnt.</p><p>Christian Daniel from maintech GmbH.</p><p>John Greb (hexameron) for the contributions in <a href="https://github.com/hexameron/rtl-sdrangelove"><span style=" text-decoration: underline; color:#0000ff;">RTL-SDRangelove</span></a></p><p>The following rules apply to the SDRangel main application and libsdrbase:<br/>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. You should have received a copy of the GNU General Public License along with this program. If not, see <a href="http://www.gnu.org/licenses/"><span style=" text-decoration: underline; color:#0000ff;">http://www.gnu.org/licenses/</span></a>.</p><p>For the license of installed plugins, look into the plugin list.</p></body></html></string> | ||||||
|      </property> |      </property> | ||||||
|      <property name="wordWrap"> |      <property name="wordWrap"> | ||||||
|       <bool>true</bool> |       <bool>true</bool> | ||||||
|  | |||||||
| @ -453,9 +453,9 @@ void MainWindow::createStatusBar() | |||||||
| { | { | ||||||
|     QString qtVersionStr = QString("Qt %1 ").arg(QT_VERSION_STR); |     QString qtVersionStr = QString("Qt %1 ").arg(QT_VERSION_STR); | ||||||
| #if QT_VERSION >= 0x050400 | #if QT_VERSION >= 0x050400 | ||||||
|     m_showSystemWidget = new QLabel("SDRangel v3.4.1 " + qtVersionStr + QSysInfo::prettyProductName(), this); |     m_showSystemWidget = new QLabel("SDRangel v3.4.2 " + qtVersionStr + QSysInfo::prettyProductName(), this); | ||||||
| #else | #else | ||||||
|     m_showSystemWidget = new QLabel("SDRangel v3.4.1 " + qtVersionStr, this); |     m_showSystemWidget = new QLabel("SDRangel v3.4.2 " + qtVersionStr, this); | ||||||
| #endif | #endif | ||||||
|     statusBar()->addPermanentWidget(m_showSystemWidget); |     statusBar()->addPermanentWidget(m_showSystemWidget); | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user