Skip to content

Master 1.3.1 - Data Rate Fix #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master-1.3.1
Choose a base branch
from
Open

Master 1.3.1 - Data Rate Fix #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0cb62c
Add HYBRID for regions US915 and AU915
giulcioffi May 15, 2020
0fe66e5
AU915 global region
giulcioffi May 22, 2020
567e122
Modified lora.c: void lora_config_tx_datarate_set(int8_t TxDataRate)
tohlh Apr 10, 2021
7b90af0
Modified lora.c: static void MlmeConfirm(MlmeConfirm_t *mlmeConfirm)
tohlh Apr 10, 2021
b593ae7
Merge branch 'master-1.3.1' into master-1.3.1
tohlh Aug 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Projects/B-L072Z-LRWAN1/Applications/LoRa/AT_Slave/LoRaWAN/App/src/lora.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ static void MlmeConfirm(MlmeConfirm_t *mlmeConfirm)
{
// Status is OK, node has joined the network
LoRaMainCallbacks->LORA_HasJoined();
lora_config_tx_datarate_set(lora_config.TxDatarate);
#ifdef LORAMAC_CLASSB_ENABLED
#if defined( USE_DEVICE_TIMING )
LORA_DeviceTimeReq();
Expand Down Expand Up @@ -903,7 +904,11 @@ int16_t lora_config_rssi_get(void)

void lora_config_tx_datarate_set(int8_t TxDataRate)
{
lora_config.TxDatarate = TxDataRate;
mibReq.Type = MIB_CHANNELS_DATARATE;
mibReq.Param.ChannelsDatarate = TxDataRate;
if (LoRaMacMibSetRequestConfirm(&mibReq) != LORAMAC_STATUS_PARAMETER_INVALID) {
lora_config.TxDatarate = TxDataRate;
}
}

int8_t lora_config_tx_datarate_get(void)
Expand Down
2 changes: 1 addition & 1 deletion Projects/B-L072Z-LRWAN1/Applications/LoRa/AT_Slave/LoRaWAN/App/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static LoRaParam_t LoRaParamInit = {LORAWAN_ADR_ON,
LORAWAN_PUBLIC_NETWORK
};

LoRaMacRegion_t globalRegion = LORAMAC_REGION_EU868;
LoRaMacRegion_t globalRegion = LORAMAC_REGION_AU915;

/* Private functions ---------------------------------------------------------*/

Expand Down
2 changes: 1 addition & 1 deletion Projects/B-L072Z-LRWAN1/Applications/LoRa/AT_Slave/SW4STM32/mlm32l07x01/.cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<listOptionValue builtIn="false" value="NO_MAC_PRINTF"/>
<listOptionValue builtIn="false" value="REGION_EU868"/>
<listOptionValue builtIn="false" value="REGION_AS923"/>
<listOptionValue builtIn="false" value="REGION_AU915"/>
<listOptionValue builtIn="true" value="REGION_AU915"/>
<listOptionValue builtIn="false" value="REGION_CN470"/>
<listOptionValue builtIn="false" value="REGION_CN779"/>
<listOptionValue builtIn="false" value="REGION_EU433"/>
Expand Down
Loading