diff --git a/DSP_API/ThumbDV/thumbDV.c b/DSP_API/ThumbDV/thumbDV.c index 7302889..4602544 100644 --- a/DSP_API/ThumbDV/thumbDV.c +++ b/DSP_API/ThumbDV/thumbDV.c @@ -758,9 +758,14 @@ static void * _thumbDV_readThread( void * param ) // Setup RX or Status change event notification status = FT_SetEventNotification(handle, FT_EVENT_RXCHAR , (PVOID)&event_handle); + struct timespec timeout; + clock_gettime(CLOCK_REALTIME, &timeout); + + timeout.tv_sec += 2; // 2 second timeout + // Will block until pthread_mutex_lock(&event_handle.eMutex); - pthread_cond_wait(&event_handle.eCondVar, &event_handle.eMutex); + pthread_cond_timedwait(&event_handle.eCondVar, &event_handle.eMutex, &timeout); pthread_mutex_unlock(&event_handle.eMutex); rx_bytes = 0; @@ -768,7 +773,7 @@ static void * _thumbDV_readThread( void * param ) if ( status != FT_OK ) { - fprintf( stderr, "ThumbDV: error from select, status=%d\n", status ); + fprintf( stderr, "ThumbDV: error from status, status=%d\n", status ); /* Set invalid FD in sched_waveform so we don't call write functions */ handle = NULL; diff --git a/DSP_API/Waveform/ThumbDV.ssdr_waveform b/DSP_API/Waveform/ThumbDV.ssdr_waveform index 67d228a..bc98bbc 100644 Binary files a/DSP_API/Waveform/ThumbDV.ssdr_waveform and b/DSP_API/Waveform/ThumbDV.ssdr_waveform differ diff --git a/DSP_API/Waveform/ThumbDV/ThumbDV.cfg b/DSP_API/Waveform/ThumbDV/ThumbDV.cfg index 68e953c..ebd4963 100644 --- a/DSP_API/Waveform/ThumbDV/ThumbDV.cfg +++ b/DSP_API/Waveform/ThumbDV/ThumbDV.cfg @@ -1,7 +1,7 @@ [header] Name: ThumbDV -Version: "1.0.8" -Minimum-SmartSDR-Version: 1.4.2.0 +Version: "1.1.0" +Minimum-SmartSDR-Version: 1.10.3.0 Author: FlexRadio Systems Support-email: support@flexradio.com Support-phone: 512-535-4713 @@ -9,7 +9,7 @@ License: GPL7.3 Executable: "thumbdv" [setup] -waveform create name=ThumbDV mode=DSTR underlying_mode=DFM version=1.0.7 +waveform create name=ThumbDV mode=DSTR underlying_mode=DFM version=1.1.0 waveform set ThumbDV tx=1 waveform set ThumbDV rx_filter low_cut=-3500 waveform set ThumbDV rx_filter high_cut=3500 diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs b/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs index fb9b68e..ce00d9a 100644 --- a/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs +++ b/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.8.0")] -[assembly: AssemblyFileVersion("1.0.8.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss b/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss index d3bc609..81ff165 100644 --- a/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss +++ b/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss @@ -6,11 +6,11 @@ ; The App Versions can be passed in and will match the AssemblyInfo for the application #ifndef MyAppVersion - #define MyAppVersion "1.0.8.0" + #define MyAppVersion "1.1.0.0" #endif #ifndef MyAppVersionWithV - #define MyAppVersionWithV "v1.0.8.0" + #define MyAppVersionWithV "v1.1.0.0" #endif #define MyAppName "SmartSDR D-STAR Waveform"