@@ -30,7 +30,6 @@ Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jae
30
30
#include "Region.h"
31
31
32
32
33
-
34
33
// Setup regions
35
34
#ifdef REGION_AS923
36
35
#include "RegionAS923.h"
@@ -182,8 +181,11 @@ Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jae
182
181
#define CN470_NEXT_CHANNEL ( ) CN470_CASE { return RegionCN470NextChannel( nextChanParams, channel, time, aggregatedTimeOff ); }
183
182
#define CN470_CHANNEL_ADD ( ) CN470_CASE { return RegionCN470ChannelAdd( channelAdd ); }
184
183
#define CN470_CHANNEL_REMOVE ( ) CN470_CASE { return RegionCN470ChannelsRemove( channelRemove ); }
184
+ #define CN470_CHANNEL_MANUAL_ADD ( ) CN470_CASE { return RegionCN470ChannelManualAdd( channelAdd ); }
185
+ #define CN470_CHANNEL_MANUAL_REMOVE ( ) CN470_CASE { return RegionCN470ChannelsRemove( channelRemove ); }
185
186
#define CN470_SET_CONTINUOUS_WAVE ( ) CN470_CASE { RegionCN470SetContinuousWave( continuousWave ); break; }
186
187
#define CN470_APPLY_DR_OFFSET ( ) CN470_CASE { return RegionCN470ApplyDrOffset( downlinkDwellTime, dr, drOffset ); }
188
+ #define CN470_FORCE_JOIN_DATARATE ( ) CN470_CASE { return RegionCN470ForceJoinDataRate( joinDr, alternateDr ); }
187
189
#else
188
190
#define CN470_IS_ACTIVE ( )
189
191
#define CN470_GET_PHY_PARAM ( )
@@ -206,8 +208,11 @@ Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jae
206
208
#define CN470_NEXT_CHANNEL ( )
207
209
#define CN470_CHANNEL_ADD ( )
208
210
#define CN470_CHANNEL_REMOVE ( )
211
+ #define CN470_CHANNEL_MANUAL_ADD ( )
212
+ #define CN470_CHANNEL_MANUAL_REMOVE ( )
209
213
#define CN470_SET_CONTINUOUS_WAVE ( )
210
214
#define CN470_APPLY_DR_OFFSET ( )
215
+ #define CN470_FORCE_JOIN_DATARATE ( )
211
216
#endif
212
217
213
218
#ifdef REGION_CN779
@@ -452,8 +457,13 @@ Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jae
452
457
#define IN865_NEXT_CHANNEL ( ) IN865_CASE { return RegionIN865NextChannel( nextChanParams, channel, time, aggregatedTimeOff ); }
453
458
#define IN865_CHANNEL_ADD ( ) IN865_CASE { return RegionIN865ChannelAdd( channelAdd ); }
454
459
#define IN865_CHANNEL_REMOVE ( ) IN865_CASE { return RegionIN865ChannelsRemove( channelRemove ); }
460
+ #define IN865_CHANNEL_MANUAL_ADD ( ) IN865_CASE { return RegionIN865ChannelManualAdd( channelAdd ); }
461
+ #define IN865_CHANNEL_MANUAL_REMOVE ( ) IN865_CASE { return RegionIN865ChannelsRemove( channelRemove ); }
455
462
#define IN865_SET_CONTINUOUS_WAVE ( ) IN865_CASE { RegionIN865SetContinuousWave( continuousWave ); break; }
456
463
#define IN865_APPLY_DR_OFFSET ( ) IN865_CASE { return RegionIN865ApplyDrOffset( downlinkDwellTime, dr, drOffset ); }
464
+ #define IN865_GET_CHANNELS ( ) IN865_CASE { return RegionIN865GetChannels( channels, size ); }
465
+ #define IN865_GET_CHANNEL_MASK ( ) IN865_CASE { return RegionIN865GetChannelMask( channelmask, size ); }
466
+ #define IN865_FORCE_JOIN_DATARATE ( ) IN865_CASE { return RegionIN865ForceJoinDataRate( joinDr, alternateDr ); }
457
467
#else
458
468
#define IN865_IS_ACTIVE ( )
459
469
#define IN865_GET_PHY_PARAM ( )
@@ -476,8 +486,13 @@ Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jae
476
486
#define IN865_NEXT_CHANNEL ( )
477
487
#define IN865_CHANNEL_ADD ( )
478
488
#define IN865_CHANNEL_REMOVE ( )
489
+ #define IN865_CHANNEL_MANUAL_ADD ( )
490
+ #define IN865_CHANNEL_MANUAL_REMOVE ( )
479
491
#define IN865_SET_CONTINUOUS_WAVE ( )
480
492
#define IN865_APPLY_DR_OFFSET ( )
493
+ #define IN865_GET_CHANNELS ( )
494
+ #define IN865_GET_CHANNEL_MASK ( )
495
+ #define IN865_FORCE_JOIN_DATARATE ( )
481
496
#endif
482
497
483
498
#ifdef REGION_US915
@@ -1037,6 +1052,8 @@ LoRaMacStatus_t RegionChannelManualAdd( LoRaMacRegion_t region, ChannelAddParams
1037
1052
AU915_CHANNEL_MANUAL_ADD ( );
1038
1053
EU868_CHANNEL_MANUAL_ADD ( );
1039
1054
US915_CHANNEL_MANUAL_ADD ( );
1055
+ CN470_CHANNEL_MANUAL_ADD ( );
1056
+ IN865_CHANNEL_MANUAL_ADD ( );
1040
1057
US915_HYBRID_CHANNEL_MANUAL_ADD ( );
1041
1058
default :
1042
1059
{
@@ -1074,6 +1091,8 @@ bool RegionChannelsManualRemove( LoRaMacRegion_t region, ChannelRemoveParams_t*
1074
1091
AU915_CHANNEL_MANUAL_REMOVE ( );
1075
1092
EU868_CHANNEL_MANUAL_REMOVE ( );
1076
1093
US915_CHANNEL_MANUAL_REMOVE ( );
1094
+ CN470_CHANNEL_MANUAL_REMOVE ( );
1095
+ IN865_CHANNEL_MANUAL_REMOVE ( );
1077
1096
US915_HYBRID_CHANNEL_MANUAL_REMOVE ( );
1078
1097
default :
1079
1098
{
@@ -1131,6 +1150,7 @@ bool RegionGetChannels( LoRaMacRegion_t region, ChannelParams_t** channels, uint
1131
1150
AS923_GET_CHANNELS ( );
1132
1151
AU915_GET_CHANNELS ( );
1133
1152
EU868_GET_CHANNELS ( );
1153
+ IN865_GET_CHANNELS ( );
1134
1154
US915_GET_CHANNELS ( );
1135
1155
US915_HYBRID_GET_CHANNELS ( );
1136
1156
default :
@@ -1146,6 +1166,7 @@ bool RegionGetChannelMask(LoRaMacRegion_t region, uint16_t **channelmask, uint32
1146
1166
AS923_GET_CHANNEL_MASK ( );
1147
1167
AU915_GET_CHANNEL_MASK ( );
1148
1168
EU868_GET_CHANNEL_MASK ( );
1169
+ IN865_GET_CHANNEL_MASK ( );
1149
1170
US915_GET_CHANNEL_MASK ( );
1150
1171
US915_HYBRID_GET_CHANNEL_MASK ( );
1151
1172
default :
@@ -1176,6 +1197,8 @@ bool RegionForceJoinDataRate( LoRaMacRegion_t region, int8_t joinDr, AlternateDr
1176
1197
AU915_FORCE_JOIN_DATARATE ( );
1177
1198
EU868_FORCE_JOIN_DATARATE ( );
1178
1199
US915_FORCE_JOIN_DATARATE ( );
1200
+ CN470_FORCE_JOIN_DATARATE ( );
1201
+ IN865_FORCE_JOIN_DATARATE ( );
1179
1202
US915_HYBRID_FORCE_JOIN_DATARATE ( );
1180
1203
default :
1181
1204
{
0 commit comments