## Auto Generated makefile by CodeLite IDE\r
## any manual changes will be erased \r
##\r
-## Debug\r
+## Release\r
ProjectName :=fdmdv2\r
-ConfigurationName :=Debug\r
+ConfigurationName :=Release\r
WorkspacePath := "C:\bin\Projects\Radio\fdmdv2\build"\r
ProjectPath := "C:\bin\Projects\Radio\fdmdv2\build"\r
-IntermediateDirectory :=./Debug\r
+IntermediateDirectory :=./Release\r
OutDir := $(IntermediateDirectory)\r
CurrentFileName :=\r
CurrentFilePath :=\r
CurrentFileFullPath :=\r
User :=OFA-Staff\r
-Date :=10/12/2012\r
+Date :=10/15/2012\r
CodeLitePath :="C:\bin\CodeLite"\r
LinkerName :=g++\r
SharedObjectLinkerName :=g++ -shared -fPIC\r
ObjectsFileList :="C:\bin\Projects\Radio\fdmdv2\build\fdmdv2.txt"\r
PCHCompileFlags :=\r
MakeDirCommand :=makedir\r
-LinkOptions := -mwindows $(shell wx-config --debug=yes --libs --unicode=yes)\r
-IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src $(IncludeSwitch)../3rdparty/portaudio/include $(IncludeSwitch)../3rdparty/portaudio/bindings/cpp/include $(IncludeSwitch)../3rdparty/libsndfile/include $(IncludeSwitch)../3rdparty/libsamplerate-0.1.8/src \r
+LinkOptions := -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes)\r
+IncludePath := $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.6.1/msys/1.0/local/include $(IncludeSwitch)../../codec2-dev/src \r
IncludePCH := \r
RcIncludePath := \r
Libs := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp \r
-ArLibs := "libsndfile-1.dll" "libcodec2.a" "libportaudio.a" "libportaudiocpp.a" \r
-LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW/msys/1.0/local/lib $(LibraryPathSwitch)../extern/lib \r
+ArLibs := "libsndfile-1.dll" "codec2" "libportaudio.a" "libportaudiocpp.a" \r
+LibPath := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/Projects/Radio/codec2-dev/src/.libs $(LibraryPathSwitch)/bin/MinGW-4.6.1/msys/1.0/local/lib \r
\r
##\r
## Common variables\r
AR := ar rcus\r
CXX := g++\r
CC := gcc\r
-CXXFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"744\" $(Preprocessors)\r
-CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) -DSVN_REVISION=\"744\" $(Preprocessors)\r
+CXXFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"760\" $(Preprocessors)\r
+CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) -DSVN_REVISION=\"760\" $(Preprocessors)\r
\r
\r
##\r
$(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)\r
\r
$(IntermediateDirectory)/.d:\r
- @$(MakeDirCommand) "./Debug"\r
+ @$(MakeDirCommand) "./Release"\r
\r
PreBuild:\r
\r
$(RM) $(IntermediateDirectory)/src_fdmdv2_hdw_ports$(PreprocessSuffix)\r
$(RM) $(OutputFile)\r
$(RM) $(OutputFile).exe\r
- $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-debug\fdmdv2"\r
+ $(RM) "C:\bin\Projects\Radio\fdmdv2\build\.build-release\fdmdv2"\r
\r
\r
<VirtualDirectory Name="resources">
<File Name="../src/FDMDV2.fbp"/>
</VirtualDirectory>
+ <Dependencies Name="Debug"/>
+ <Dependencies Name="Release"/>
<Settings Type="Executable">
<GlobalSettings>
<Compiler Options="" C_Options="">
<IncludePath Value="../3rdparty/portaudio/include"/>
<IncludePath Value="../3rdparty/portaudio/bindings/cpp/include"/>
<IncludePath Value="../3rdparty/libsndfile/include"/>
- <IncludePath Value="../3rdparty/libsamplerate-0.1.8/src"/>
<Preprocessor Value="__WX__"/>
</Compiler>
<Linker Options="-mwindows;$(shell wx-config --debug=yes --libs --unicode=yes)" Required="yes">
<LibraryPath Value="/bin/MinGW/msys/1.0/local/lib"/>
- <LibraryPath Value="../extern/lib"/>
- <Library Value="libsndfile-1.dll"/>
<Library Value="libcodec2.a"/>
<Library Value="libportaudio.a"/>
<Library Value="libportaudiocpp.a"/>
</Configuration>
<Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-O2;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=no)" C_Options="-O2;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=no)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
- <IncludePath Value="/bin/MinGW/msys/1.0/local/include"/>
+ <IncludePath Value="/bin/MinGW-4.6.1/msys/1.0/local/include"/>
<IncludePath Value="../../codec2-dev/src"/>
- <IncludePath Value="../3rdparty/portaudio/include"/>
- <IncludePath Value="../3rdparty/portaudio/bindings/cpp/include"/>
- <IncludePath Value="../3rdparty/libsndfile/include"/>
- <IncludePath Value="../3rdparty/libsamplerate-0.1.8/src"/>
<Preprocessor Value="__WX__"/>
</Compiler>
<Linker Options="-mwindows;-s;$(shell wx-config --debug=no --libs --unicode=yes)" Required="yes">
- <LibraryPath Value="/bin/MinGW/msys/1.0/local/lib"/>
- <LibraryPath Value="../extern/lib"/>
+ <LibraryPath Value="/bin/Projects/Radio/codec2-dev/src/.libs"/>
+ <LibraryPath Value="/bin/MinGW-4.6.1/msys/1.0/local/lib"/>
<Library Value="libsndfile-1.dll"/>
- <Library Value="libcodec2.a"/>
+ <Library Value="codec2"/>
<Library Value="libportaudio.a"/>
<Library Value="libportaudiocpp.a"/>
</Linker>
</Completion>
</Configuration>
</Settings>
- <Dependencies Name="Debug"/>
- <Dependencies Name="Release"/>
</CodeLite_Project>
-./Debug/src_dlg_about.o ./Debug/src_dlg_audio.o ./Debug/src_dlg_comports.o ./Debug/src_dlg_options.o ./Debug/src_fdmdv2_main.o ./Debug/src_fdmdv2_plot.o ./Debug/src_topFrame.o ./Debug/src_fdmdv2_plot_scatter.o ./Debug/src_fdmdv2_plot_waterfall.o ./Debug/src_fdmdv2_plot_spectrum.o ./Debug/src_fdmdv2_pa_wrapper.o ./Debug/src_fdmdv2_plot_scalar.o ./Debug/src_fdmdv2_hdw_ports.o \r
+./Release/src_dlg_about.o ./Release/src_dlg_audio.o ./Release/src_dlg_comports.o ./Release/src_dlg_options.o ./Release/src_fdmdv2_main.o ./Release/src_fdmdv2_plot.o ./Release/src_topFrame.o ./Release/src_fdmdv2_plot_scatter.o ./Release/src_fdmdv2_plot_waterfall.o ./Release/src_fdmdv2_plot_spectrum.o ./Release/src_fdmdv2_pa_wrapper.o ./Release/src_fdmdv2_plot_scalar.o ./Release/src_fdmdv2_hdw_ports.o \r
<?xml version="1.0" encoding="UTF-8"?>
<CodeLite_Workspace Name="fdmdv2" Database="./fdmdv2.tags">
<Project Name="fdmdv2" Path="fdmdv2.project" Active="Yes"/>
+ <Environment>
+ <![CDATA[]]>
+ </Environment>
<BuildMatrix>
- <WorkspaceConfiguration Name="Debug" Selected="yes">
+ <WorkspaceConfiguration Name="Debug" Selected="no">
<Project Name="fdmdv2" ConfigName="Debug"/>
</WorkspaceConfiguration>
<WorkspaceConfiguration Name="Release" Selected="yes">
<Project Name="fdmdv2" ConfigName="Release"/>
</WorkspaceConfiguration>
</BuildMatrix>
- <Environment>
- <![CDATA[]]>
- </Environment>
</CodeLite_Workspace>
.PHONY: clean All
All:
- @echo ----------Building project:[ fdmdv2 - Debug ]----------
+ @echo ----------Building project:[ fdmdv2 - Release ]----------
@"$(MAKE)" -f "fdmdv2.mk"
clean:
- @echo ----------Cleaning project:[ fdmdv2 - Debug ]----------
+ @echo ----------Cleaning project:[ fdmdv2 - Release ]----------
@"$(MAKE)" -f "fdmdv2.mk" clean
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/david/fdmdv2/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/david/fdmdv2/missing --run tar
-AUTOCONF = ${SHELL} /home/david/fdmdv2/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/david/fdmdv2/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/david/fdmdv2/missing --run automake-1.11
+ACLOCAL = ${SHELL} /p/Radio/fdmdv2/missing --run aclocal-1.11
+AMTAR = ${SHELL} /p/Radio/fdmdv2/missing --run tar
+AUTOCONF = ${SHELL} /p/Radio/fdmdv2/missing --run autoconf
+AUTOHEADER = ${SHELL} /p/Radio/fdmdv2/missing --run autoheader
+AUTOMAKE = ${SHELL} /p/Radio/fdmdv2/missing --run automake-1.11
AWK = gawk
CC = gcc
CCDEPMODE = depmode=none
ECHO_N = -n
ECHO_T =
EGREP = /bin/grep -E
-EXEEXT =
+EXEEXT = .exe
GREP = /bin/grep
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
-lwsock32
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/david/fdmdv2/missing --run makeinfo
+MAKEINFO = ${SHELL} /p/Radio/fdmdv2/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
OBJEXT = o
PACKAGE = fdmdv2
PACKAGE_VERSION = 0.2
PATH_SEPARATOR = :
SET_MAKE =
-SHELL = /bin/bash
+SHELL = /bin/sh
STRIP =
VERSION = 0.2
-abs_builddir = /home/david/fdmdv2/src
-abs_srcdir = /home/david/fdmdv2/src
-abs_top_builddir = /home/david/fdmdv2
-abs_top_srcdir = /home/david/fdmdv2
+abs_builddir = /p/Radio/fdmdv2/src
+abs_srcdir = /p/Radio/fdmdv2/src
+abs_top_builddir = /p/Radio/fdmdv2
+abs_top_srcdir = /p/Radio/fdmdv2
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/david/fdmdv2/install-sh
+install_sh = ${SHELL} /p/Radio/fdmdv2/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
}
}
+//----------------------------------------------------------
+// OnTogBtnLoopRx()
+//----------------------------------------------------------
+void MainFrame::OnTogBtnLoopRx( wxCommandEvent& event )
+{
+ wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnLoopRx()"), wxOK);
+}
+
+//----------------------------------------------------------
+// OnTogBtnLoopTx()
+//----------------------------------------------------------
+void MainFrame::OnTogBtnLoopTx( wxCommandEvent& event )
+{
+ wxMessageBox(wxT("Got Click!"), wxT("OnTogBtnLoopRx()"), wxOK);
+}
+
//----------------------------------------------------------
// Audio stream processing loop states (globals).
//----------------------------------------------------------
{
wxMessageBox(wxT("Rx Error: No default output device."), wxT("Error"), wxOK);
delete m_rxPa;
- m_RxRunning = false;
+ m_RxRunning = false;
return;
}
m_rxErr = m_rxPa->setOutputDevice(m_rxDevOut);
delete m_rxPa;
fifo_destroy(m_rxUserdata->infifo);
fifo_destroy(m_rxUserdata->outfifo);
- m_RxRunning = false;
return;
}
m_rxErr = m_rxPa->streamStart();
delete m_rxPa;
fifo_destroy(m_rxUserdata->infifo);
fifo_destroy(m_rxUserdata->outfifo);
- m_RxRunning = false;
return;
}
}
assert(inputBuffer != NULL);
assert(outputBuffer != NULL);
-
- /*
+ /*
framesPerBuffer is portaudio-speak for number of samples we
actually get from the record side and need to provide to the
play side. On Linux (at least) it was found that
}
g_nInputBuf += FDMDV_NOM_SAMPLES_PER_FRAME;
per_frame_rx_processing(g_pRxOutBuf, &g_nOutputBuf, g_CodecBits, g_RxInBuf, &g_nInputBuf, &g_nRxIn, &g_State, g_pCodec2);
-
//cbData->pWFPanel->m_newdata = true;
//cbData->pSPPanel->m_newdata = true;
-
+
// if demod out of sync copy input audio from A/D to aid in tuning
if (g_nOutputBuf >= N8)
{
{
g_pRxOutBuf[i] = g_pRxOutBuf[i + N8];
}
-
+
/* test: echo input to output, make this loopback option */
for(i=0; i<N8; i++)
in8k[MEM8+i] = out8k[i];
/* write signal to both channels */
for(i=0; i<framesPerBuffer; i++,wptr+=2) {
- wptr[0] = outdata[i];
- wptr[1] = outdata[i];
+ wptr[0] = outdata[i];
+ wptr[1] = outdata[i];
}
}
else {
//printf("no data\n");
/* zero output if no data available */
for(i=0; i<framesPerBuffer; i++,wptr+=2) {
- wptr[0] = 0;
- wptr[1] = 0;
+ wptr[0] = 0;
+ wptr[1] = 0;
}
}
void OnTogBtnTxID( wxCommandEvent& event );
void OnTogBtnTXClick( wxCommandEvent& event );
void OnTogBtnOnOff( wxCommandEvent& event );
+ void OnTogBtnLoopRx( wxCommandEvent& event );
+ void OnTogBtnLoopTx( wxCommandEvent& event );
void OnTogBtnSplitClickUI(wxUpdateUIEvent& event);
void OnTogBtnAnalogClickUI(wxUpdateUIEvent& event);
m_newdata = false;
int t = m_rPlot.GetTop();
int l = m_rPlot.GetLeft();
- int r = m_rPlot.GetRight();
+// int r = m_rPlot.GetRight();
int h = m_rPlot.GetHeight();
int w = m_rPlot.GetWidth();
pDC.Blit(l, t, w, h, &m_mDC, l, t);
projects / freetel-svn-tracking.git / commitdiff