6565 * Define the Frequencies for teh SUB REGION within AS923 for AS1,AS2, AS3,AS4.
6666 */
6767#if ( LORA_AS923_SUB_REGION == LORA_AS923_SUB_REGION_AS1 )
68- // Singapore, Japan, Malaysia, Myanmar ....
69- // Historical AS923 =>RP002-1.0.0 LoRaWAN - 923..928Mhz
70- /* !
71- * Default transmit channel frequency's definition.
72- */
73- #define AS923_LC1_FREQ 923200000
74- #define AS923_LC2_FREQ 923400000
75- /* !
76- * channel frequnetie range.
77- */
78- #define AS923_LOWER_FREQ 923000000
79- #define AS923_UPPER_FREQ 928000000
80- /* !
81- * Second reception window channel frequency definition.
82- */
83- #define AS923_RX_WND_2_FREQ 923200000
68+ // Singapore, Japan, Malaysia, Myanmar ....
69+ // Historical AS923 =>RP002-1.0.0 LoRaWAN - 923..928Mhz
70+ /* !
71+ * Default transmit channel frequency's definition.
72+ */
73+ #define AS923_LC1_FREQ 923200000
74+ #define AS923_LC2_FREQ 923400000
75+ /* !
76+ * channel frequnetie range.
77+ */
78+ #define AS923_LOWER_FREQ 923000000
79+ #define AS923_UPPER_FREQ 928000000
80+ /* !
81+ * Second reception window channel frequency definition.
82+ */
83+ #define AS923_RX_WND_2_FREQ 923200000
8484#elif ( LORA_AS923_SUB_REGION == LORA_AS923_SUB_REGION_AS2 )
85- // Brunei, Hong Kong, Indonesia, Laos, Cambodia, Thaland, Taiwan, Vietnam
86- // OFFSET -1.8 MHz AS923-1 =>RP002-1.0.1 LoRaWAN - 920..923Mhz
87- #define AS923_LC1_FREQ 921400000
88- #define AS923_LC2_FREQ 921600000
89- #define AS923_LOWER_FREQ 920000000
90- #define AS923_UPPER_FREQ 923000000
91- #define AS923_RX_WND_2_FREQ 921400000
85+ // Brunei, Hong Kong, Indonesia, Laos, Cambodia, Thaland, Taiwan, Vietnam
86+ // OFFSET -1.8 MHz AS923-1 =>RP002-1.0.1 LoRaWAN - 920..923Mhz
87+ #define AS923_LC1_FREQ 921400000
88+ #define AS923_LC2_FREQ 921600000
89+ #define AS923_LOWER_FREQ 920000000
90+ #define AS923_UPPER_FREQ 923000000
91+ #define AS923_RX_WND_2_FREQ 921400000
9292#elif ( LORA_AS923_SUB_REGION == LORA_AS923_SUB_REGION_AS3 )
93- // Philipines, Quatar, Switzerland, Hungary, Cuba, Denmark .... 18 countries
94- // OFFSET -6.6Mhz AS923-1 =>RP002-1.0.1 LoRaWAN - 915..921Mhz
95- #define AS923_LC1_FREQ 916600000
96- #define AS923_LC2_FREQ 916800000
97- #define AS923_LOWER_FREQ 915000000
98- #define AS923_UPPER_FREQ 921000000
99- #define AS923_RX_WND_2_FREQ 916600000
93+ // Philipines, Quatar, Switzerland, Hungary, Cuba, Denmark .... 18 countries
94+ // OFFSET -6.6Mhz AS923-1 =>RP002-1.0.1 LoRaWAN - 915..921Mhz
95+ #define AS923_LC1_FREQ 916600000
96+ #define AS923_LC2_FREQ 916800000
97+ #define AS923_LOWER_FREQ 915000000
98+ #define AS923_UPPER_FREQ 921000000
99+ #define AS923_RX_WND_2_FREQ 916600000
100100#elif ( LORA_AS923_SUB_REGION == LORA_AS923_SUB_REGION_AS4 )
101- // Israel
102- // OFFSET -5.9MHz AS923-1 =>RP002-1.0.3 LoRaWAN - 917..920Mhz
103- #define AS923_LC1_FREQ 917300000
104- #define AS923_LC2_FREQ 917500000
105- #define AS923_LOWER_FREQ 917000000
106- #define AS923_UPPER_FREQ 920000000
107- #define AS923_RX_WND_2_FREQ 917300000
101+ // Israel
102+ // OFFSET -5.9MHz AS923-1 =>RP002-1.0.3 LoRaWAN - 917..920Mhz
103+ #define AS923_LC1_FREQ 917300000
104+ #define AS923_LC2_FREQ 917500000
105+ #define AS923_LOWER_FREQ 917000000
106+ #define AS923_UPPER_FREQ 920000000
107+ #define AS923_RX_WND_2_FREQ 917300000
108108#else
109- #error "Invalid SUB region configuration, update mbed_app.json with correct MBED_CONF_LORA_PHY_AS923_SUB_REGION value"
109+ #error "Invalid SUB region configuration, update mbed_app.json with correct MBED_CONF_LORA_PHY_AS923_SUB_REGION value"
110110#endif
111111
112112
@@ -411,8 +411,8 @@ int8_t LoRaPHYAS923::get_alternate_DR(uint8_t nb_trials)
411411}
412412
413413lorawan_status_t LoRaPHYAS923::set_next_channel (channel_selection_params_t *next_channel_prams,
414- uint8_t *channel, lorawan_time_t *time,
415- lorawan_time_t *aggregate_timeoff)
414+ uint8_t *channel, lorawan_time_t *time,
415+ lorawan_time_t *aggregate_timeoff)
416416{
417417 uint8_t next_channel_idx = 0 ;
418418 uint8_t nb_enabled_channels = 0 ;
@@ -436,8 +436,8 @@ lorawan_status_t LoRaPHYAS923::set_next_channel(channel_selection_params_t *next
436436
437437 // Search how many channels are enabled
438438 nb_enabled_channels = enabled_channel_count (next_channel_prams->current_datarate ,
439- channel_mask,
440- enabled_channels, &delay_tx);
439+ channel_mask,
440+ enabled_channels, &delay_tx);
441441 } else {
442442 delay_tx++;
443443 next_tx_delay = next_channel_prams->aggregate_timeoff - _lora_time->get_elapsed_time (next_channel_prams->last_aggregate_tx_time );
0 commit comments