Diff: source/libs/Contiki_STM32_Library/spirit1.h

Revision:

85:38de5ee78824

Parent:

84:45b9ff78a066

--- a/source/libs/Contiki_STM32_Library/spirit1.h	Fri Jun 22 03:42:24 2018 +0000
+++ b/source/libs/Contiki_STM32_Library/spirit1.h	Thu Sep 20 06:34:33 2018 +0000
@@ -103,6 +103,10 @@
 
 #ifdef USE_SPIRIT1_433MHz
 #define BASE_FREQUENCY              433.4e6
+//#define BASE_FREQUENCY              433.3e6
+//#define BASE_FREQUENCY              433.2e6
+//#define BASE_FREQUENCY              433.1e6
+//#define BASE_FREQUENCY              433.0e6
 #endif
 
 #ifdef USE_SPIRIT1_868MHz
@@ -179,25 +183,123 @@
 
 //------------433Mhz------------
 //작동 되는 셋팅
+//#ifdef	USE_SPIRIT1_433MHz
+//#define CHANNEL_SPACE				20e3	//해봄
+//#define FREQ_DEVIATION              127e3	//recv
+////#define FREQ_DEVIATION              50e3	//send
+////#define BANDWIDTH                   50.0e3	
+////#define BANDWIDTH                   70.0e3	//printf 다 끄니까 1000바이트정도 보내다가 뻗음
+////#define BANDWIDTH                   100.0e3	//printf 다 끄니까 900바이트정도 보내다가 뻗음
+//#define BANDWIDTH                   100.5e3	//printf 다 끄니까 900바이트정도 보내다가 뻗음
+//
+////#define BANDWIDTH                   540.0e3
+//#define MODULATION_SELECT           GFSK_BT1
+//#define DATARATE                    250000	//180326 HJM : 잘 됨
+////#define DATARATE                    500000	//180326 HJM : 잘 안됨
+////#define DATARATE                    300000	//180326 HJM : 잘 안됨
+////#define DATARATE                    38400	
+//#endif	//USE_SPIRIT1_433MHz
+//------------433Mhz------------
+
+
+
+
+
+
+
+
+
+
+
+
+//------------433Mhz------------
+//HJM : 안테나 변경(방수 안테나)로 인한 셋팅 변경
 #ifdef	USE_SPIRIT1_433MHz
+
+// 기존 값
+//#define CHANNEL_SPACE               100e3
+//#define FREQ_DEVIATION              127e3
+//#define BANDWIDTH                   540.0e3
+////#define MODULATION_SELECT           GFSK_BT1
+//#define MODULATION_SELECT           FSK
+//#define DATARATE                    250000
+
+//인터넷 검색 후 설정 값_1
+//#define FREQ_DEVIATION              4800
+//#define BANDWIDTH                   16000
+
+//인터넷 검색 후 설정 값_2
+//#define CHANNEL_SPACE               20e3
+//#define MODULATION_SELECT           FSK
+////#define DATARATE                    38400
+////#define DATARATE                    19200
+//#define DATARATE                    9600
+//#define FREQ_DEVIATION              20e3
+////#define FREQ_DEVIATION              127e3
+//#define BANDWIDTH                   100E3
+
+
 #define CHANNEL_SPACE				20e3	//해봄
+//#define CHANNEL_SPACE               30e3
 #define FREQ_DEVIATION              127e3	//recv
 //#define FREQ_DEVIATION              50e3	//send
-//#define BANDWIDTH                   50.0e3	
+//#define FREQ_DEVIATION              20e3	//send
+//#define FREQ_DEVIATION              70e3	//send
+#define BANDWIDTH                   50.0e3	
+//#define BANDWIDTH                   60.0e3	//printf 다 끄니까 1000바이트정도 보내다가 뻗음
 //#define BANDWIDTH                   70.0e3	//printf 다 끄니까 1000바이트정도 보내다가 뻗음
+//#define BANDWIDTH                   80.0e3	//printf 다 끄니까 1000바이트정도 보내다가 뻗음
+//#define BANDWIDTH                   90.0e3	
+//#define BANDWIDTH                   115.0e3	
+//#define BANDWIDTH                   200.0e3	
 //#define BANDWIDTH                   100.0e3	//printf 다 끄니까 900바이트정도 보내다가 뻗음
-#define BANDWIDTH                   100.5e3	//printf 다 끄니까 900바이트정도 보내다가 뻗음
+//#define BANDWIDTH                   100.0e3	//printf 다 끄니까 900바이트정도 보내다가 뻗음
+//#define BANDWIDTH                   100.5e3	//printf 다 끄니까 900바이트정도 보내다가 뻗음
+//#define BANDWIDTH                   540.0e3
 
 //#define BANDWIDTH                   540.0e3
-#define MODULATION_SELECT           GFSK_BT1
-#define DATARATE                    250000	//180326 HJM : 잘 됨
+//#define MODULATION_SELECT           GFSK_BT1
+#define MODULATION_SELECT			FSK
+//#define DATARATE                    250000	//180326 HJM : 잘 됨
+//#define DATARATE                    125000	//
+//#define DATARATE                    62500	//
+//#define DATARATE                    230400	//
 //#define DATARATE                    500000	//180326 HJM : 잘 안됨
 //#define DATARATE                    300000	//180326 HJM : 잘 안됨
+//#define DATARATE                    115200	//180326 HJM : 잘 안됨
+#define DATARATE                    57600	//180326 HJM : 잘 안됨
+//#define DATARATE                    38400	//180326 HJM : 잘 안됨
 //#define DATARATE                    38400	
+
+
 #endif	//USE_SPIRIT1_433MHz
 //------------433Mhz------------
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 //#define CHANNEL_SPACE               100e3
 //#define FREQ_DEVIATION              127e3
 //#define BANDWIDTH                   540.0e3