Reverted Ed's 'reliable_sync' changes, modified scaling multipliers.

This commit is contained in:
Graham Haddock 2015-01-30 19:18:49 -06:00
parent 6ea7395b35
commit 36d0dedbd8
7 changed files with 9 additions and 9 deletions

View file

@ -68,7 +68,7 @@
<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1517306120" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/> <option id="gnu.cpp.compiler.exe.release.option.optimization.level.1517306120" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1723325095" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/> <option id="gnu.cpp.compiler.exe.release.option.debugging.level.1723325095" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
</tool> </tool>
<tool command="arm-linux-gnueabihf-gcc" id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.266717095" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release"> <tool command="arm-linux-gnueabihf-gcc -static" id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.266717095" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.653650005" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/> <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.653650005" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
<option id="gnu.c.compiler.exe.release.option.debugging.level.1324464501" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/> <option id="gnu.c.compiler.exe.release.option.debugging.level.1324464501" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
<option id="gnu.c.compiler.option.include.paths.1269310734" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> <option id="gnu.c.compiler.option.include.paths.1269310734" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
@ -78,7 +78,7 @@
</option> </option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.297736145" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.297736145" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool> </tool>
<tool command="arm-linux-gnueabihf-gcc" id="cdt.managedbuild.tool.gnu.c.linker.exe.release.405388815" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"> <tool command="arm-linux-gnueabihf-gcc -static" id="cdt.managedbuild.tool.gnu.c.linker.exe.release.405388815" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release">
<option id="gnu.c.link.option.libs.365322339" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs"> <option id="gnu.c.link.option.libs.365322339" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">
<listOptionValue builtIn="false" value="m"/> <listOptionValue builtIn="false" value="m"/>
<listOptionValue builtIn="false" value="pthread"/> <listOptionValue builtIn="false" value="pthread"/>

View file

@ -1,6 +1,6 @@
[header] [header]
Name: FreeDV Name: FreeDV
Version: 1.0.0 Version: 1.0.2
Minimum-SmartSDR-Version: 1.3.1.0 Minimum-SmartSDR-Version: 1.3.1.0
Author: FlexRadio Systems Author: FlexRadio Systems
Support-email: support@flexradio.com Support-email: support@flexradio.com

View file

@ -89,7 +89,7 @@ C_DEPS += \
CODEC2_FREEDV/%.o: ../CODEC2_FREEDV/%.c CODEC2_FREEDV/%.o: ../CODEC2_FREEDV/%.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: GCC C Compiler' @echo 'Invoking: GCC C Compiler'
arm-linux-gnueabihf-gcc -I"/home/graham/workspace/smartsdr-dsp/DSP_API" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/SmartSDR_Interface" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/CODEC2_FREEDV" -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-linux-gnueabihf-gcc -static -I"/home/graham/workspace/smartsdr-dsp/DSP_API" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/SmartSDR_Interface" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/CODEC2_FREEDV" -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

View file

@ -53,7 +53,7 @@ C_DEPS += \
SmartSDR_Interface/%.o: ../SmartSDR_Interface/%.c SmartSDR_Interface/%.o: ../SmartSDR_Interface/%.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: GCC C Compiler' @echo 'Invoking: GCC C Compiler'
arm-linux-gnueabihf-gcc -I"/home/graham/workspace/smartsdr-dsp/DSP_API" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/SmartSDR_Interface" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/CODEC2_FREEDV" -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-linux-gnueabihf-gcc -static -I"/home/graham/workspace/smartsdr-dsp/DSP_API" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/SmartSDR_Interface" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/CODEC2_FREEDV" -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

View file

@ -30,7 +30,7 @@ all: freedv
freedv: $(OBJS) $(USER_OBJS) freedv: $(OBJS) $(USER_OBJS)
@echo 'Building target: $@' @echo 'Building target: $@'
@echo 'Invoking: GCC C Linker' @echo 'Invoking: GCC C Linker'
arm-linux-gnueabihf-gcc -o "freedv" $(OBJS) $(USER_OBJS) $(LIBS) arm-linux-gnueabihf-gcc -static -o "freedv" $(OBJS) $(USER_OBJS) $(LIBS)
@echo 'Finished building target: $@' @echo 'Finished building target: $@'
@echo ' ' @echo ' '
$(MAKE) --no-print-directory post-build $(MAKE) --no-print-directory post-build

View file

@ -23,7 +23,7 @@ C_DEPS += \
%.o: ../%.c %.o: ../%.c
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: GCC C Compiler' @echo 'Invoking: GCC C Compiler'
arm-linux-gnueabihf-gcc -I"/home/graham/workspace/smartsdr-dsp/DSP_API" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/SmartSDR_Interface" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/CODEC2_FREEDV" -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" arm-linux-gnueabihf-gcc -static -I"/home/graham/workspace/smartsdr-dsp/DSP_API" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/SmartSDR_Interface" -I"/home/graham/workspace/smartsdr-dsp/DSP_API/CODEC2_FREEDV" -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

View file

@ -140,9 +140,9 @@ void sched_waveform_signal()
#define PACKET_SAMPLES 128 #define PACKET_SAMPLES 128
#define SCALE_RX_IN 16000.0 // Multiplier #define SCALE_RX_IN 8000.0 // Multiplier // Was 16000 GGH Jan 30, 2015
#define SCALE_RX_OUT 8000.0 // Divisor #define SCALE_RX_OUT 8000.0 // Divisor
#define SCALE_TX_IN 16000.0 // Multiplier #define SCALE_TX_IN 32000.0 // Multiplier // Was 16000 GGH Jan 30, 2015
#define SCALE_TX_OUT 32768.0 // Divisor #define SCALE_TX_OUT 32768.0 // Divisor
#define FILTER_TAPS 48 #define FILTER_TAPS 48