From 1e24b143f98be626242b1698bb2cfed9e2bbedc6 Mon Sep 17 00:00:00 2001 From: suikan Date: Tue, 28 Jul 2015 07:40:40 +0900 Subject: [PATCH] =?utf8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=97=E3=83=AD?= =?utf8?q?=E3=82=B0=E3=83=A9=E3=83=A0=E3=81=AE=E5=95=8F=E9=A1=8C=E3=82=92?= =?utf8?q?=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8=E3=81=A7?= =?utf8?q?=E3=80=81am=E3=81=AE=E5=8C=85=E7=B5=A1=E7=B7=9A=E6=A4=9C?= =?utf8?q?=E6=B3=A2=E3=81=8C=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?= =?utf8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ラジオとして動作した最初のバージョン --- trx305/demodulator.c | 4 ++-- trx305/framework.c | 19 ------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/trx305/demodulator.c b/trx305/demodulator.c index f562a37..b9b611f 100644 --- a/trx305/demodulator.c +++ b/trx305/demodulator.c @@ -60,13 +60,13 @@ void radio_demodulate_non_wide_FM( int idata, int qdata, short* left, short* rig case radio_mode_AM : // AM復調 { - // テスト用の擬似ダイオード検波 + // テスト用の複素包絡線検波 float i, q; q = qdata; i = idata; - *left = *right = sqrtf( q*q + i*i ); + *left = *right = sqrtf( q*q + i*i )/65536; } break; diff --git a/trx305/framework.c b/trx305/framework.c index 93877f6..3a244d4 100644 --- a/trx305/framework.c +++ b/trx305/framework.c @@ -409,10 +409,6 @@ static void unpack_wide_fm ( unsigned int pri_ch, unsigned int sec_ch, int* idat static void unpack_non_wide_fm( unsigned int pri_ch, unsigned int sec_ch, int* idata, int* qdata, int* valid_iq ) { - static unsigned int debug_count = 0; - static unsigned int debug_izero = 0; - static unsigned int debug_qzero = 0; - // インデックス分け if ( sec_ch & 0x02 ) // bit1が1ならindex = 1 { @@ -421,21 +417,6 @@ static void unpack_non_wide_fm( unsigned int pri_ch, unsigned int sec_ch, int* *qdata = (sec_ch << 2) & 0xFFFFFFF0; // IQデータが有効であると通知する *valid_iq = TRUE; - if ( debug_count < 1000 ) - { - debug_count++; - if ( *idata & 1 << 31 ) - debug_izero++; - if ( *qdata & 1 << 31 ) - debug_qzero++; - } - else - { - syslog(LOG_NOTICE, "number of sign bit = %d, %d", debug_izero, debug_qzero); - debug_count = 0; - debug_izero = 0; - debug_qzero = 0; - } } else // index = 0 { -- 2.11.0