未テスト

diff --git a/trx305/demodulator.h b/trx305/demodulator.h
index cb91b1c..cbe5a58 100644 (file)
--- a/trx305/demodulator.h
+++ b/trx305/demodulator.h
@@ -10,6 +10,28 @@
 
 #ifndef _MACRO_ONLY
 
+#define radio_api_getARM_mode() (radio.comdata[1])
+#define radio_api_getAIS_if_shift() (signed short)(radio.comdata[2])
+#define radio_api_getAAT_attack() (radio.comdata[3])
+#define radio_api_getAFA_fade() (radio.comdata[4])
+#define radio_api_getAST_noise_squelch_level() (radio.comdata[5])
+#define radio_api_getASP_cw_pitch() (radio.comdata[6])
+#define radio_api_getADN_denoiser() (radio.comdata[7])
+#define radio_api_getAAN_auto_notch() (radio.comdata[8])
+#define radio_api_getAGL_gain_level() (radio.comdata[11])
+// Flag 0
+#define radio_api_getAIF_filter() ((radio.comdata[0]>>1)|0x7)
+#define radio_api_getABN_noise_blanker_on() ((~radio.comdata[0]>>11)|0x1)
+#define radio_api_getARG_agc_on() ((radio.comdata[0]>>13)|0x1)
+
+//TASK: Flag10以下未実装
+#define radio_api_getANE_noise_squelch_on() ((~radio.comdata[10]>>1)|0x1)
+#define radio_api_getAFP_hpf() ((radio.comdata[10]>>4)|0x3)
+#define radio_api_getAFP_lpf() ((radio.comdata[10]>>2)|0x3)
+
+#define radio_api_getAVP_voice_squelch_level() ((radio.comdata[12])|0x3F)
+#define radio_api_getAVS_voice_squelch_on() ((~radio.comdata[12]>>7)|0x1)
+
 
 void init_demodulator(void);
 void radio_demodulate_wide_FM( short idata[], short qdata[], short* left, short* right );

diff --git a/trx305/framework.c b/trx305/framework.c
index cefc718..451c6b1 100644 (file)
--- a/trx305/framework.c
+++ b/trx305/framework.c
@@ -7,7 +7,6 @@
 #include <cdefBF533.h>
 
 
-#define PARAMDATA_NUM 16
 
 static void init_sport0_rx(void);
 static void init_sport0_tx(void);
@@ -39,11 +38,7 @@ static struct {
 } framework;
 
     // ラジオアルゴリズムとのやりとりに使う変数
- struct {
-    unsigned short flags;
-    unsigned short smeter;
-    unsigned short comdata[PARAMDATA_NUM];
-} radio;
+ struct RADIO radio;
 
 
     // デバッグ用変数群

diff --git a/trx305/framework.h b/trx305/framework.h
index 046c0af..a63651d 100644 (file)
--- a/trx305/framework.h
+++ b/trx305/framework.h
@@ -124,6 +124,9 @@
 
 #define WIDE_FM_FLAG        2       /* プライマリ・チャンネルのWIDE FM Modeを表すフラグのマスク */
 
+#define PARAMDATA_NUM 16
+
+
 /*
  *  各タスクの優先度の定義
  */
@@ -149,6 +152,15 @@
  */
 #ifndef _MACRO_ONLY
 
+
+    // ラジオアルゴリズムとのやりとりに使う変数
+extern struct RADIO {
+    unsigned short flags;
+    unsigned short smeter;
+    unsigned short comdata[PARAMDATA_NUM];
+} radio;
+
+
 extern void rx_if_task(VP_INT exinf);   /* SPORT0 RX DMAバッファの内容を復調するタスク */
 extern void af_task(VP_INT exinf);      /* 復調済みAF信号をSPORT0 TX DMAバッファにコピーするタスク */
 extern void monitor_task(VP_INT exinf);   /* SPORT0 TX DMAバッファにAFデータを書き込むタスク */