williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename 'compander' to 'compandor'

Browse Source
This commit is contained in:
Andreas Eversberg
2016-06-20 19:37:56 +02:00
parent 86daa5a64a
commit 2ee51022f4
14 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amps/amps.h
View File

@@ -1,5 +1,5 @@
#include "../common/sender.h"
#include "../common/compander.h"
#include "../common/compandor.h"
#include "sysinfo.h"
#include "transaction.h"
@@ -35,7 +35,7 @@ enum fsk_rx_sync {
typedef struct amps {
sender_t sender;
compander_t cstate;
compandor_t cstate;
int pre_emphasis; /* use pre_emphasis by this instance */
int de_emphasis; /* use de_emphasis by this instance */
emphasis_t estate;

4
src/amps/dsp.c
View File

@@ -75,7 +75,7 @@
#define FSK_DEVIATION 32767.0 /* +-8 KHz */
#define SAT_DEVIATION 8192.0 /* +-2 KHz */
#define TX_AUDIO_0dBm0 45000 /* works quite well */
#define COMPANDOR_0DB 45000 /* works quite well */
#define BITRATE 10000
#define SIG_TONE_CROSSINGS 2000 /* 2000 crossings are 100ms @ 10 KHz */
#define SIG_TONE_MINBITS 950 /* minimum bit durations to detect signalling tone (1000 is perfect for 100 ms) */
@@ -145,7 +145,7 @@ int dsp_init_sender(amps_t *amps, int high_pass)
double RC, dt;
/* attack (3ms) and recovery time (13.5ms) according to amps specs */
init_compander(&amps->cstate, 8000, 3.0, 13.5, TX_AUDIO_0dBm0);
init_compandor(&amps->cstate, 8000, 3.0, 13.5, COMPANDOR_0DB);
PDEBUG(DDSP, DEBUG_DEBUG, "Init DSP for transceiver.\n");