VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-27 02:09:14 -05:00
Code Issues Projects Releases Wiki Activity
2,784 Commits 3 Branches 369 Tags 186 MiB
82509e5785
Commit Graph

985 Commits

Author SHA1 Message Date
f4exb
6df387081f MainWindow: dos2unix 2017-04-26 18:44:03 +02:00
f4exb
4818e629de Bumped version to 3.4.1 2017-04-26 18:43:13 +02:00
f4exb
137647e2ca IntHalfbandFilters: set workInterpolateLowerHalf and UpperHalf optimized methods as defaults 2017-04-26 02:20:07 +02:00
f4exb
172de27047 IntHalfbandFilters: set workInterpolateCenter optimized methods as defaults 2017-04-26 01:57:11 +02:00
f4exb
cd7e4e4385 IntHalfbandFilters: set myInterpolate optimized methods as defaults 2017-04-26 01:39:45 +02:00
f4exb
a60e2b7597 IntHalfbandFilterEO1: Optimized versions of workInterpolateCenter and myInterpolate 2017-04-26 01:34:27 +02:00
f4exb
822fff3aac IntHalfbandFilterDB: Optimized versions of workInterpolateCenter and myInterpolate 2017-04-26 00:22:27 +02:00
f4exb
6b3bdef3a7 IntHalfbandFilters: Optimized versions of workInterpolateCenter and myInterpolate 2017-04-26 00:07:57 +02:00
f4exb
02981b4f08 CW Keyer: specifiy char signedness to fix error with some compilers 2017-04-25 00:16:44 +02:00
f4exb
e0b7027756 LimeSDR input: added antenna selection 2017-04-23 16:23:01 +02:00
f4exb
196172a1df PluginManager: dos2unix 2017-04-23 10:33:18 +02:00
f4exb
851461b8f3 PluginManager::selectSampleSourceByIndex set device details (incl serial) before trying to open the device so it can work... 2017-04-23 10:32:15 +02:00
f4exb
db67e07ab9 LimeSDR input: implemented basic stream reporting 2017-04-19 18:41:55 +02:00
f4exb
e374dd234e Value dial: do not print leading decimal point 2017-04-18 01:50:58 +02:00
f4exb
414a7ccd87 Refactoring: removed device parameter from all start() methods in sample sink plugins 2017-04-14 03:44:49 +02:00
f4exb
b8623c90ce Refactoring: removed device parameter from all start() methods in sample source plugins 2017-04-14 03:40:45 +02:00
f4exb
3ab855c927 Sample sink plugins: removed useless init pure virtual method 2017-04-12 23:26:40 +02:00
f4exb
2136dc7672 Sample source plugins: removed useless init pure virtual method 2017-04-12 23:10:22 +02:00
f4exb
729ba1b1f9 Sink handling refactoring: re-organize new source selection steps between main window and plugin manager 2017-04-12 22:46:16 +02:00
f4exb
39ca753dff Source handling refactoring: re-organize new source selection steps between main window and plugin manager 2017-04-12 22:12:34 +02:00
f4exb
8203b7ded9 Source handling refactoring (1) 2017-04-12 18:59:26 +02:00
f4exb
982b3c3072 Bumped version to 3.3.4 2017-04-10 22:31:15 +02:00
f4exb
813d79a115 HackRF input: continuous sample rate setting 2017-04-01 13:08:41 +02:00
f4exb
016f7c1e37 ATV Demod: FM mode using phaseDiscriminatorDelta with deviation scaling 2017-03-22 23:55:47 +01:00
f4exb
af512f16f8 ScopeNG: add possibility to drive the GUI from a parent class 2017-03-21 11:24:03 +01:00
f4exb
63510968b5 ATV Modulator: implemented 405 lines standard and added display of channel sample rate 2017-03-20 03:35:27 +01:00
f4exb
b677138b45 ATV plugins: Windows build updates 2017-03-19 20:18:44 +01:00
f4exb
303fd3ccc7 ATV Demod: implemented BFU with PLL for single sideband modes 2017-03-19 10:28:54 +01:00
f4exb
c3c6b79de4 ATV Demod: implement NCO and interpolator change 2017-03-18 00:11:48 +01:00
f4exb
2018607944 Corrected spectrum channels display: removed frequency scale central line when the channel is not selected 2017-03-17 14:13:09 +01:00
f4exb
701c853cff ATV Demod: GUI: new RF settings layout 2017-03-16 18:00:18 +01:00
f4exb
cfec4d1be9 Simplify channel marker underline on frequency scale 2017-03-16 15:19:45 +01:00
f4exb
836c3a56da ATV Modulator: use consistent opposite sideband bandwidth 2017-03-16 12:01:46 +01:00
f4exb
b76c246bcd ATV Modulator: vestigial sidebands chammel marker update (color overlay) 2017-03-16 11:49:14 +01:00
f4exb
b079fae843 ATV Modulator: use assymetrical filter for vestigial sideband modulation 2017-03-16 10:11:03 +01:00
f4exb
df88215798 ATV Modulator: implemented vestigial sideband 2017-03-16 02:45:51 +01:00
f4exb
76a0dc3e2d Fixed a long lasting bug where channels are movable from the spectrum display based on the color (blue) so that WFM could not move. Set a dedicared boolean instead 2017-03-16 00:39:49 +01:00
f4exb
f40d030e2e FFT filter: SSB filter leave DC component by default in both USB and LSB. Option to remove DC in both 2017-03-15 15:37:51 +01:00
f4exb
abd463d374 ATV Modulator: SSB support in GUI 2017-03-15 05:05:42 +01:00
f4exb
41fac50526 ATV Modulator: added camera details to the GUI 2017-03-11 06:57:22 +01:00
f4exb
806b955110 ATV Modulator: added image file dialog 2017-03-08 01:35:18 +01:00
f4exb
2318419716 NFM demod: new discriminator and optional FM deviatoin based squelch 2017-03-05 06:22:05 +01:00
f4exb
54afdb2b26 New channel analyzer and scope: (dummy) dial button for source port select and screenshots for future readme 2017-03-02 00:15:00 +01:00
f4exb
5dfe2a7a2a Channel Analyzer NG: handle rational downsampler in the GUI 2017-03-01 05:37:37 +01:00
f4exb
d2727708e9 Channel Analyzer NG: revamped UI with rational downsampler UI 2017-02-28 00:58:26 +01:00
f4exb
4ee7675dd9 Added missing resources 2017-02-27 01:17:24 +01:00
f4exb
bc2d0f3743 New scope: removed Z trace stuff 2017-02-27 01:11:12 +01:00
f4exb
68b28fc648 New scope: implemented view trace toggle 2017-02-26 22:27:03 +01:00
f4exb
3bf3e4e737 New scope: implement multiple Y traces 2017-02-26 20:14:54 +01:00
f4exb
d9a5bcfc7a Load preset sequence: load source or sink before channels 2017-02-26 19:40:19 +01:00
f4exb
3078b6cfa1 New scope: implemented trigger moves 2017-02-26 19:14:27 +01:00
f4exb
ed2fc4bbe8 New scope: corrected channel overlay vertical placement 2017-02-26 11:50:06 +01:00
f4exb
5bee287360 New scope: implemented trace moves 2017-02-26 11:26:23 +01:00
f4exb
14d5b5e913 New scope: trace overlay implemented on all displays 2017-02-26 09:25:55 +01:00
f4exb
82d55764a9 New scope: changed channel overlay font and set it to trace color 2017-02-26 06:06:59 +01:00
f4exb
ede5990191 New scope: mag (dB) power overlay considering time base and time offset 2017-02-26 05:26:42 +01:00
f4exb
9a48e8b090 New scope: set a reference to trace count for better code clarity 2017-02-26 05:13:21 +01:00
f4exb
b3cb4d3f70 New scope: pass time base to ScopeVis 2017-02-26 04:55:15 +01:00
f4exb
6c60189fdc New scope: mag (dB) power overlay on XY polar trace - basic 2017-02-26 04:46:02 +01:00
f4exb
46ebdefff0 NCO: standardized debug message 2017-02-25 11:32:18 +01:00
f4exb
864df4d232 Mew scope: moved Z trace checkbox side 2017-02-25 04:47:39 +01:00
f4exb
301e491cd4 Mew scope: fixed polar time offset 2017-02-25 04:45:30 +01:00
f4exb
aa47e0fb94 Mew scope: trace memory: process scope updates 2017-02-25 04:35:06 +01:00
f4exb
86279bb1ee Mew scope: trace memory 2017-02-24 23:24:47 +01:00
f4exb
f86d11e2d1 Mew scope: trace memory interim state (2) 2017-02-24 08:31:25 +01:00
f4exb
763d486514 Mew scope: trace memory interim state (1) 2017-02-23 08:18:03 +01:00
f4exb
a0c3ffe5da New scope: UI cosmetic changes 2017-02-22 02:52:38 +01:00
f4exb
6bf430bc56 New scope: pre trigger delay slider mouse roll does x1 2017-02-22 01:48:11 +01:00
f4exb
d310d59142 New scope: one shot trigger support 2017-02-22 01:18:50 +01:00
f4exb
07078fa913 New scope: set trace length display to two decimals precision 2017-02-21 06:11:58 +01:00
f4exb
946d1cf68a New scope: deserialize triggers 2017-02-20 23:58:03 +01:00
f4exb
f9ba5696c5 New scope: deserialize traces 2017-02-20 22:19:50 +01:00
f4exb
f5aff6b34f New scope: serializer and deserializer for first line of UI 2017-02-20 01:21:52 +01:00
f4exb
daa2619bb3 New scope: activate trace cache 2017-02-19 04:46:15 +01:00
f4exb
06dc97c91c New scope: implemented trace delay 2017-02-17 01:54:55 +01:00
f4exb
eaffa127b8 New scope: cache mechanism for projectors 2017-02-16 19:09:16 +01:00
f4exb
5584fec183 New scope: simplified display trace allocation and fixed segfault 2017-02-16 01:06:15 +01:00
f4exb
01ee19a46b New scope: polar display: optimize space 2017-02-15 02:57:32 +01:00
f4exb
93871e8fb2 New scope: polar display: optimization 2017-02-15 02:52:52 +01:00
f4exb
534b2ed0cf New scope: polar display 2017-02-15 02:45:18 +01:00
f4exb
8c0f4681f5 New scope: polar display right side contour grid and scales 2017-02-15 02:20:28 +01:00
f4exb
6b9e92c84e New scope: polar display left side (X and Y overlay) 2017-02-15 02:02:28 +01:00
f4exb
78d943bf61 New scope: refactor display arrangement methods: horizontally stacked displays 2017-02-15 01:07:19 +01:00
f4exb
3c1abfc152 New scope: refactor display arrangement methods: vertically stacked displays 2017-02-15 00:46:45 +01:00
f4exb
912259a0ad New scope: refactor display arrangement methods: unique displays 2017-02-15 00:20:53 +01:00
f4exb
f719ced17f Device source engine: initialize sample rate and center frequency in the sink when adding a threaded sample sink 2017-02-14 21:46:35 +01:00
f4exb
4961594f50 New scope: fixed currently displayed trace not updated after trace delete 2017-02-13 23:57:12 +01:00
f4exb
39ed424081 New scope: replaced virtual projectors by a single concrete projector with switch/case 2017-02-13 22:52:42 +01:00
f4exb
10dc1c886c New scope: de-activate displays that are not implemented yet 2017-02-13 18:55:24 +01:00
f4exb
5a05bdcb1a New scope: use configuration mutex also for trigger operations 2017-02-13 11:30:40 +01:00
f4exb
5b61e526d9 New scope: fixed Y display only scale display 2017-02-13 08:41:53 +01:00
f4exb
29673fe26c New scope: restrict to two traces (X and Y) via the GUI 2017-02-13 03:34:17 +01:00
f4exb
acba573ce7 New scope: add/delete traces interim state (2) improved stability 2017-02-13 03:23:29 +01:00
f4exb
77072ec967 New scope: add/delete traces interim state (1) 2017-02-13 01:32:02 +01:00
f4exb
710e2b931d New scope: compute trace in ScopeVis only when required by GLScope. Fixed trace and trigger color dialogs 2017-02-13 00:17:59 +01:00
f4exb
e32659b86a New scope: added change trigger color feature 2017-02-12 02:12:06 +01:00
f4exb
2820efe26b New scope: added change trace color feature 2017-02-11 20:44:00 +01:00
f4exb
804497c282 New scope: use finer delay division (base trace length / 100) 2017-02-11 12:07:07 +01:00
f4exb
c8aa0dc4b8 New scope: focused trigger change 2017-02-11 10:36:10 +01:00
f4exb
76cdb94d34 New scope: corrected trigger display levels 2017-02-11 08:35:33 +01:00
f4exb
0672121044 New scope: remove previous commit 2017-02-10 22:23:04 +01:00
f4exb
fa47e7064f New scope: Trigger line display interim state (1) 2017-02-10 18:28:19 +01:00
f4exb
ec604c21c9 New scope: fixed trigger UI add, remove and change current 2017-02-10 04:35:08 +01:00
f4exb
f1b5b08fa0 New scope: fixed trigger projector initialization and delete 2017-02-10 02:45:49 +01:00
f4exb
b8e3d60110 New scope: fixed and enhance trigger delay 2017-02-09 22:22:56 +01:00
f4exb
1f37bcf3de New scope: added trigger delay, mutiple occurences and chained triggers features 2017-02-09 18:45:06 +01:00
f4exb
c56f852a85 New scope: added trace and trigger number display methods 2017-02-09 18:44:20 +01:00
f4exb
d74e7d87d7 New scope: simplify triggerPoint calculation 2017-02-09 02:16:43 +01:00
f4exb
758bc9a5dd New scope: use global number of samples to decide the end of a trace. Fixed triggerPoint calculation 2017-02-09 01:58:54 +01:00
f4exb
a64fb01119 New scope: separate trace delay and pre-trigger trace processes 2017-02-09 00:18:28 +01:00
f4exb
aed77d60a8 New scope: refactored processTraces prototype 2017-02-09 00:11:10 +01:00
f4exb
93143b0cbd New scope: review trace outer process 2017-02-09 00:04:19 +01:00
f4exb
e3b933350c New scope: review freerun / trigger processing 2017-02-09 00:00:21 +01:00
f4exb
f2b04539cf New scope: ensure only a trace length of samples is processed at a time 2017-02-08 22:22:27 +01:00
f4exb
66b584d264 New scope: change float to double for values displays in the UI 2017-02-08 22:09:24 +01:00
f4exb
897a181028 New scope: fixed trace display and triggers 2017-02-08 02:13:53 +01:00
f4exb
199e915c62 New scope: fix trigger (2) 2017-02-07 18:50:08 +01:00
f4exb
ba67483b48 New scope: fix trigger (1) 2017-02-07 07:45:42 +01:00
f4exb
e17ecf0328 New scope: fixed trace offset 2017-02-07 00:25:40 +01:00
f4exb
27116d5b3f New Scope: trigger implementation interim state (1) 2017-02-06 18:40:15 +01:00
f4exb
4d36eeb4c7 New scope: basic single X display 2017-02-06 02:40:31 +01:00
f4exb
0f5c055eca New scope: interim state (8) 2017-02-05 13:26:07 +01:00
f4exb
44e764f492 New scope: interim state (7) 2017-02-05 04:41:32 +01:00
f4exb
fcfa6e7b3f New scope: interim state (6) 2017-02-03 08:27:03 +01:00
f4exb
1db62fd347 New scope: interim state (5) 2017-02-02 18:18:37 +01:00
f4exb
a7bb81c70a New scope: interim state (4) 2017-02-02 08:27:49 +01:00
f4exb
e6f80c8474 New scope: interim state (3) 2017-02-01 18:31:16 +01:00
f4exb
ce41ded86e New scope: interim state (2) 2017-01-31 08:26:13 +01:00
f4exb
0861f71ff3 NFM demod: new discriminator 2017-01-30 23:28:06 +01:00
f4exb
2f515d9379 New scope: Windows build adjustments 2017-01-30 02:22:18 +01:00
f4exb
a36870f958 New scope: methods to create/change/delete traces and triggers 2017-01-30 00:36:27 +01:00
f4exb
cce5b29aa6 New scope: make some trace and trigger data public 2017-01-30 00:07:20 +01:00
f4exb
d69c6cc417 New scope: pass sample rate 2017-01-29 22:52:38 +01:00
f4exb
f0f7838765 New scope: interim state (1) 2017-01-29 19:51:45 +01:00
f4exb
6d4c000107 DSD demod: improve YSF stability. Bumped to version 3.2.0 2017-01-29 14:55:54 +01:00
f4exb
38337f1333 Moving average fixes 2017-01-15 11:26:11 +01:00
f4exb
618f302aad DSD demod: adapt to dsdcc version 1.6 2017-01-13 02:16:28 +01:00
f4exb
e696975301 Fixed segfault in reload devices option 2017-01-12 02:01:32 +01:00
f4exb
fb562f197c Added reload devices option 2017-01-12 01:24:08 +01:00
f4exb
09856b5941 Sample source FIFO: write ahead the exact same amount of samples that were read. This smoothes out the process and avoids hickups 2017-01-09 02:13:27 +01:00
f4exb
88ef7eac14 Corrected version number in About panel 2017-01-09 01:35:40 +01:00
f4exb
85ed39c767 HackRF output plugin: compiles 2017-01-08 04:13:20 +01:00
f4exb
ed990094e2 Bumped version to 3.0.1 2017-01-07 10:01:27 +01:00
f4exb
afec57a6be Audio preferences: changed dialog title and add documentation in main window readme 2017-01-07 09:50:12 +01:00
f4exb
83fcf912e9 New audio devices dialog and handling: put the AudioDeviceInfo object on the main window stack instead of dynamically allocating 2017-01-06 19:00:45 +01:00
f4exb
fb3e6dc90d New audio devices dialog and handling: make settings persistent using main settings 2017-01-06 18:56:46 +01:00
f4exb
58b90c7914 New audio devices dialog and handling: use selected audio devices 2017-01-06 16:04:32 +01:00
f4exb
49fba5b103 New audio devices dialog and handling: use variable global input volume 2017-01-06 15:28:01 +01:00
f4exb
d8bcfb1360 New audio devices dialog and handling (1) 2017-01-06 12:43:18 +01:00
f4exb
c3b69007af Audio preferences dialog: animate input volume control text 2017-01-06 03:13:53 +01:00
f4exb
751bf6973e Audio preferences dialog: added input devices tab and input volume control 2017-01-06 03:02:57 +01:00
f4exb
979da93acd Tx support: temporary fix for global audio input volume cotnrol 2017-01-06 02:29:08 +01:00
f4exb
4b89ac3360 WFM modulator: do not go below 96 kHz for the channelizer sample rate. Attempt to fix CW problem 2017-01-05 11:37:57 +01:00
f4exb
3479559859 Tx support: optimize final interpolator stages 2017-01-03 23:25:20 +01:00
f4exb
171ba7674e Tx support: fixed buddy handling 2017-01-02 23:30:50 +01:00
f4exb
f48fd4c3a4 BladeRF output plugin: working basically 2017-01-02 20:24:25 +01:00
f4exb
fa0afb6c92 Tx support: implemented final interpolation stage in FileSink plugin 2017-01-02 03:14:46 +01:00
f4exb
d0f49291c5 added 'my' interpolation methods 2016-12-31 04:23:59 +01:00
f4exb
2047463dcf Tx support: common device routines library and handle BladeRF Tx/Rx coordination on Rx side 2016-12-30 16:13:28 +01:00
f4exb
5a83dc09a5 Tx support: reviewed and corrected buddy mechanism 2016-12-29 19:26:45 +01:00
f4exb
f68f949c19 Tx support: interim state (1) 2016-12-29 12:41:10 +01:00
f4exb
607e89cea6 Main window status tag: call QSysInfo::prettyProductName() only if Qt version is >= 5.4 2016-12-27 00:16:43 +01:00
f4exb
35b6409753 Multiple transmission channels warning when adding more than one channel 2016-12-26 15:26:25 +01:00
f4exb
03ff449ec8 Multiple modulators support: optimization: comment out code that is useless when processing sample by sample 2016-12-26 14:52:59 +01:00
f4exb
9213c85d6a Multiple modulators support: returned to one by one sample handling but pull a chunk of audio samples. Works with at least 3 modulators. Special handling of division factor 2016-12-26 12:45:19 +01:00
f4exb
5598265e66 Multiple modulators support: works with two modulators 2016-12-26 12:11:51 +01:00
f4exb
2a8a3bf457 Fixed core dump when ending application and Tx is still running 2016-12-26 11:23:11 +01:00
f4exb
e02ac85e50 All modulators: use buffer for input audio that is always in use while generation is running. This fixes lockup problem reported in issue #11 2016-12-26 01:39:34 +01:00
f4exb
f5572eebc0 More debug messsages 2016-12-25 21:26:37 +01:00
f4exb
53f6413bd9 Audio input: removed mutex lock on write data. Audio output: removed mutex lock on read data 2016-12-25 20:04:19 +01:00
f4exb
e05822ba02 Implement own FIFO in BasebandSampleSource. SampleSourceFIFO: remove useless chunk size completely and set initial fill to only half the FIFO size 2016-12-23 14:29:42 +01:00
f4exb
ce77f95a2c Bumped to version 2.5.2 2016-12-23 00:34:07 +01:00
f4exb
f74e3b83a7 Modulators: changed single Tx channel samples feed handling. Pure virtual function is useless 2016-12-22 23:45:56 +01:00
f4exb
1afd8df5f9 Modulators: changed single Tx channel samples feed handling 2016-12-22 23:39:06 +01:00
f4exb
441c2c1817 Send number of samples to write in the writeData signal. Ask for half the buffer size when more than half of it is consumed 2016-12-21 02:24:49 +01:00
f4exb
fc58e1be46 AM, NFM and WFM modulators: changed mute/umute channel button icon 2016-12-20 17:56:49 +01:00
f4exb
1e881703e8 Added a NCO with floating point phase calculation before conversion to int for table indexing. This increases frequency precision and is mandatory for CTCSS tone generator 2016-12-19 02:41:31 +01:00
f4exb
d09f0d2ede Bumped to version 2.5.1 2016-12-17 08:06:36 +01:00
f4exb
ff10cbf7d9 Updated sdrbase readme with details on how to use the recorded I/Q files 2016-12-16 01:41:41 +01:00
f4exb
014ada12ba CW smoother: set default ramp time to 4ms and set the modulators ramp time at the same value 2016-12-16 00:02:37 +01:00
f4exb
5571e01a65 dB calculator: add floor value (default -100.0dB) when argument is 0 2016-12-15 21:27:13 +01:00
f4exb
330db19163 CW Keyer GUI: appearance fixes 2016-12-15 00:27:08 +01:00
f4exb
0a7e9261e2 CW transition smoother: use smootherstep function. See: https://en.wikipedia.org/wiki/Smoothstep 2016-12-14 23:23:58 +01:00
f4exb
98b9e20392 Make a dedicated CW transition smoothing class 2016-12-14 22:48:39 +01:00
f4exb
5000e01063 CW Keyer GUI: fixed play loop collision with file play loop 2016-12-14 02:54:05 +01:00
f4exb
a2089724cf SSB Modulator: Interim state (4) 2016-12-13 19:57:07 +01:00
f4exb
d10209c223 CW Keyer GUI: corrected dashes and dots buttons disabled color 2016-12-12 01:53:57 +01:00
f4exb
b620462639 Windows build: added SSB Modulator and CW Keyer 2016-12-12 01:16:36 +01:00
f4exb
01e7217303 Bumped to version 2.5.0 2016-12-11 22:55:50 +01:00
f4exb
e4e2eea9d5 CW Keyer: retain only text, dashes and dots 2016-12-11 21:52:53 +01:00
f4exb
d3d6ebec89 CW Keyer with GUI. Sort of works 2016-12-11 11:35:25 +01:00
f4exb
2defcc7cec CW Keyer: test with AM modulator and fixes 2016-12-10 08:12:16 +01:00
f4exb
d6c9b2f707 CW Keyer: compiles 2016-12-10 06:16:13 +01:00
f4exb
808a8c85fd CW Keyer: interim state (2) 2016-12-09 19:34:38 +01:00
f4exb
35baa46f3d CW Keyer: interim state (1) 2016-12-09 01:35:49 +01:00
f4exb
3ed1f68253 CW Keyer GUI: interim state (1) 2016-12-08 21:41:48 +01:00
f4exb
25e171bf90 Signal meter: adjust font 2016-12-07 02:53:10 +01:00
f4exb
93a08c325a Level Meter: paint peak tip last so it appears on top 2016-12-07 01:21:00 +01:00
f4exb
bc75ca7735 Level meter embellishment 2016-12-06 00:25:59 +01:00
f4exb
e6667c88eb NFM Demod: use different color scheme for the signal meter bar 2016-12-05 18:42:24 +01:00