Commit Graph

217 Commits

Author SHA1 Message Date
Charles J. Cliffe
0c66d19f92 Merge branch 'master' into osx-app-build 2015-02-21 23:33:05 -05:00
Charles J. Cliffe
04fb8f6a3a Icons and CPack bundle patch 2015-02-21 23:08:08 -05:00
Charles J. Cliffe
8a859c661b MSVC + Win32/x86 patch 2015-02-20 00:34:32 -05:00
Charles J. Cliffe
9d9bb8f103 OSX .app compiles but with runtime dylib errors
Regular binary compilation works, manual wxWidgets compile required for
app (port version doesn’t work for me).
Fixed-up app has runtime errors with dylib files but otherwise verifies…
2015-02-17 21:26:14 -05:00
Charles J. Cliffe
cbde77e0f1 Add -ldl to CMakeLists for linux 2015-02-11 20:41:13 -05:00
Charles J. Cliffe
a803a2d136 MSVC patches 2015-02-09 22:01:33 -05:00
Charles J. Cliffe
a3fac1e932 Frame rate limiter for Windows, Untested OSX / Linux 2015-02-09 20:49:21 -05:00
Charles J. Cliffe
a8070ca953 Destroy / recreate audio thread on demodulator activate / deactivate -- fixes DirectSound issues 2015-02-04 18:10:42 -05:00
Charles J. Cliffe
cef0e2a0e7 Default to WASAPI until I can fix some DirectSound related issues. 2015-01-27 22:22:48 -05:00
Charles J. Cliffe
977f91f74e Updated CMake and libs for TDM+MSVC
Only tested on 64-bit so far..
2015-01-26 22:18:15 -05:00
Charles J. Cliffe
ddcaf8d97f cmake osx/unix liquid lib 2015-01-25 21:54:25 -05:00
Chris Motch
b708bece59 Updated cmake for Visual C++ 12
Updated cmake file to properly generate project files for Visual C++ 12,
I also have added and tweaked the way the external libraries are
referenced, and in theory 32bit builds are included.
2015-01-25 16:57:23 -05:00
Charles J. Cliffe
4dad30e9bd GL context init fixes and warning cleanup 2015-01-20 19:13:49 -05:00
Charles J. Cliffe
4496add756 OSX cmake patch 2015-01-19 19:24:15 -05:00
Charles J. Cliffe
963e26bc07 Linux somewhat functional 2015-01-18 01:36:28 -05:00
Charles J. Cliffe
4213b47c99 Move waterfall color themes to general theme classes, convert hard-coded colors 2015-01-14 22:14:57 -05:00
Charles J. Cliffe
93e88a9208 Import TinyXML and DataTree, OSX related UI tweaks 2015-01-07 20:23:15 -05:00
Charles J. Cliffe
e0d5474c68 OSX fix for fftwf 2015-01-06 20:00:23 -05:00
Charles J. Cliffe
7d5d638666 FFTW->FFTWF better CPU usage 2015-01-06 19:15:27 -05:00
Charles J. Cliffe
137116da9c Mode selector class framework 2015-01-04 19:50:05 -05:00
Charles J. Cliffe
9f945026b8 Fix frequency related data types for >2Ghz 2015-01-04 17:11:20 -05:00
Charles J. Cliffe
8f8dd01341 Unify common canvas manipulation functions 2015-01-02 21:32:24 -05:00
Charles J. Cliffe
b7793ef905 Squelch slider/signal indicator 2014-12-31 19:45:01 -05:00
Charles J. Cliffe
c7a167a1d0 Experimental demodulator preprocessor thread
Demodulator becoming a CPU hotspot, trying to break up the workload
between threads..
2014-12-16 18:27:02 -05:00
Charles J. Cliffe
24cd93d1ae Split DemodulatorMgr and DemodulatorInstance 2014-12-11 23:35:06 -05:00
Charles J. Cliffe
f04ec72394 Demodulator garbage collection 2014-12-11 19:07:21 -05:00
Charles J. Cliffe
5fc9a064b5 CMake updates 2014-12-07 21:06:05 -05:00
Charles J. Cliffe
894c718730 Mostly working on OSX /w rtaudio now
Looks like just some priority tweaks remain
2014-12-04 22:25:18 -05:00
Charles J. Cliffe
03edda18e5 RtAudio integrated and working great /w win64
Next up, OSX test..
2014-12-04 19:44:49 -05:00
Charles J. Cliffe
7ae1ffc2c9 RtAudio source integrated, preparing to implement 2014-12-04 19:03:02 -05:00
Charles J. Cliffe
5fc5e4269c Demodulator worker thread test 2014-11-30 23:33:55 -05:00
Charles J. Cliffe
499e411048 Remove DC spike from IQ stream and visuals
IQ post-process / distribution in separate thread, use of
iirfilt_crcf_create_dc_blocker to reduce DC offset in IQ stream.
2014-11-29 13:58:20 -05:00
Charles J. Cliffe
f6966b1824 Simple class for tracking wx mouse in unit 0..1 2014-11-25 21:07:13 -05:00
Charles J. Cliffe
58708a720e SDR->Demod->Audio chain all using std::thread
2% CPU usage drop on 3.2G i7 desktop
2014-11-22 22:17:33 -05:00
Charles J. Cliffe
26168a2713 SDR and Audio thread now using std::thread
Next up, demod thread..
2014-11-22 20:57:06 -05:00
Charles J. Cliffe
35830afed0 new thread queue testing 2014-11-21 21:50:14 -05:00
Charles J. Cliffe
99aa87df63 Now working on gcc4.8, x86-64 on windows
Had to make my own portaudio and rtl-sdr binaries. The available
packages weren't compatible somehow.  Also wxWidgets wxPack doesn't
include OpenGL support but it's easy enough to compile.
2014-11-21 00:49:41 -05:00
Charles J. Cliffe
f6f4c3c057 Revert "switch from portaudio -> libao"
This reverts commit 8972e87765.
2014-11-20 20:28:40 -05:00
Charles J. Cliffe
28afe9d3be Merge branch 'dynamic_demod' of https://github.com/cjcliffe/CubicSDR into dynamic_demod
Conflicts:
	CMakeLists.txt
2014-11-20 20:12:38 -05:00
Charles J. Cliffe
9706ed8f7e Update to 64-bit, add test threadqueue 2014-11-20 20:10:28 -05:00
Charles J. Cliffe
8972e87765 switch from portaudio -> libao 2014-11-19 23:41:57 -05:00
Charles J. Cliffe
92b390fefe Enable c++11 2014-11-19 00:34:41 -05:00
Charles J. Cliffe
dd42d112c9 Demodulator can now be initialized with parameters 2014-11-17 22:58:56 -05:00
Charles J. Cliffe
532968a818 Source folder cleanup 2014-11-17 21:29:27 -05:00
Charles J. Cliffe
7e174ab1dd All threads now using transaction objects and queue
Additional cleanup, remove outdated IQBufferThread experiment
2014-11-17 19:37:53 -05:00
Charles J. Cliffe
a7d7ec0d93 Frame rate limiter 2014-11-16 23:20:48 -05:00
Charles J. Cliffe
739854cd7f Demodulator and Audio threads working
Data now flows from SDR IQ Thread -> Demodulator Thread -> Audio Thread.
Seems to have added a significant audio delay though..
2014-11-16 17:33:54 -05:00
Charles J. Cliffe
16a9add9ef New threads partly implemented
Mid transition from 1 to 3 threads: SDR IQ, Demod and Audio separated,
AppFrame routes.
2014-11-16 16:50:37 -05:00
Charles J. Cliffe
2e5bdc2646 Separate visual components Scope/Spectrum/Waterfall
Each now on it's own canvas with shared GL Context
2014-11-15 23:41:41 -05:00
Charles J. Cliffe
541ab5614c Separate Primary GL Context and visuals canvas
Can now create multiple GL canvases with shared context
2014-11-12 21:55:11 -05:00
Charles J. Cliffe
fe2e56231d gradient util, started waterfall implementation 2014-11-11 08:11:12 -05:00
Charles J. Cliffe
a78a862cba Moved demodulation code into it's own class
Preparing to make it more dynamic, able to tune multiple frequencies at
once and support remaining demodulation modes (AM, USB, LSB)
2014-11-09 18:12:02 -05:00
Charles J. Cliffe
14d7e431bd PortAudio adjustments for OSX
Seems to be some sort of audio init race condition, intermittent crash
on startup
2014-11-09 05:18:33 -05:00
Charles J. Cliffe
b70b659a5f Removed OpenAL and now using PortAudio 2014-11-09 04:38:33 -05:00
Charles J. Cliffe
428525e807 experimental liquid-dsp testing 2014-11-06 21:30:47 -05:00
Charles J. Cliffe
2092505e20 Adding buffer and testing demod functionality 2014-11-06 01:33:59 -05:00
Charles J. Cliffe
f071b2b025 Added OpenAL /w audio init test 2014-11-05 19:10:18 -05:00
Charles J. Cliffe
f22a929828 Started demodulator class based on rtl_fm.c 2014-11-04 21:55:20 -05:00
Charles J. Cliffe
a8f1a87505 Can now control SDRThread freq. via thread task
Basic left/right keys bound for shifting frequency test.
2014-11-04 19:52:11 -05:00
Charles J. Cliffe
9896808b22 Clean-up / re-factor
thread queue and task handler compiling and program functional
2014-11-04 18:39:08 -05:00
Charles J. Cliffe
62a8c13be7 Windows build fix 2014-10-31 02:31:43 -04:00
Charles J. Cliffe
eb4e10140a Now showing 2.5MHz bandwidth over FM ranges
Moves frequency back/forth over the FM range
2014-10-31 01:37:01 -04:00
Charles J. Cliffe
7fe286cf0c Now plotting IQ spectrum
seems to only be showing half the bandwidth..
2014-10-30 22:51:33 -04:00
Charles J. Cliffe
23f8c6a197 Now passing IQ data from SDR Thread to AppFrame 2014-10-28 21:39:59 -04:00
Charles J. Cliffe
0e25cbcc1a OSX now compiling and working 2014-10-27 23:52:25 -04:00
Charles J. Cliffe
d27d91c1ef Code re-factor / cleanup
GL Window now ready to draw signal lines
2014-10-27 21:22:29 -04:00
Charles J. Cliffe
c2a37e7622 Initial experiment /w wxWidgets opengl view and sdr sampling.
Includes working rtl-sdr sampling thread test.
2014-10-27 20:05:40 -04:00