ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

astyle fixes

feature-lorawan-1-1
Antti Kauppila 2019-05-08 17:29:51 +03:00
parent 623436d726
commit e76a55681f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features/lorawan/LoRaWANInterface.h
View File

@ -52,13 +52,14 @@ public:
LoRaWANInterface(LoRaRadio &radio);
/** Constructs a LoRaWANInterface using the user provided PHY object.
* @param radio A reference to radio object
* @param phy A reference to PHY object
*/
LoRaWANInterface(LoRaRadio &radio, LoRaPHY &phy);
<<<<<<< 4715651667564ee5357d54a4d245a8fd4c587010
/**
* Destructor
*/
~LoRaWANInterface();
/** Initialize the LoRa stack.

2
features/lorawan/lorastack/mac/LoRaMac.cpp
View File

@ -313,7 +313,7 @@ loramac_event_info_status_t LoRaMac::handle_join_accept_frame(const uint8_t *pay
reset_frame_counters();
reset_phy_params();
} else if (_params.server_type == LW1_1 &&
_params.join_request_type == REJOIN_REQUEST_TYPE2) {
_params.join_request_type == REJOIN_REQUEST_TYPE2) {
reset_frame_counters();
}

2
features/lorawan/lorastack/mac/LoRaMacCommand.cpp
View File

@ -208,7 +208,7 @@ lorawan_status_t LoRaMacCommand::process_mac_commands(const uint8_t *payload, ui
mac_sys_params.max_duty_cycle = payload[mac_index++];
mac_sys_params.aggregated_duty_cycle = 1 << mac_sys_params.max_duty_cycle;
ret_value = add_duty_cycle_ans();
break;
break;
case SRV_MAC_RX_PARAM_SETUP_REQ: {
rx_param_setup_req_t rxParamSetupReq;