Skip to content

Commit c05d72c

Browse files
authored
Merge pull request #6697 from ARMmbed/release-candidate
Release candidate for mbed-os-5.8.3
2 parents f9ee4e8 + ed4df0b commit c05d72c

File tree

278 files changed

+43770
-5539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+43770
-5539
lines changed

.github/pull_request_template.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
<!--
1313
Required
14-
Please tick only one of the following types. Do not tick more or change the layout.
14+
Please add only one X to one of the following types. Do not fill multiple types (split the pull request otherwise) or
15+
change the layout.
1516
1617
[X] Fix
1718
[ ] Refactor

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ matrix:
121121
# update status if we succeeded, compare with master if possible
122122
- |
123123
CURR=$(grep -o '[0-9]\+ cycles' prof | awk '{sum += $1} END {print sum}')
124-
PREV=$(curl https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
124+
PREV=$(curl -u "$MBED_BOT" https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
125125
| jq -re "select(.sha != \"$TRAVIS_COMMIT\")
126126
| .statuses[] | select(.context == \"travis-ci/$NAME\").description
127127
| capture(\"runtime is (?<runtime>[0-9]+)\").runtime" \
@@ -193,7 +193,7 @@ matrix:
193193
# update status if we succeeded, compare with master if possible
194194
- |
195195
CURR=$(tail -n1 sizes | awk '{print $1}')
196-
PREV=$(curl https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
196+
PREV=$(curl -u "$MBED_BOT" https://api.github.com/repos/$TRAVIS_REPO_SLUG/status/master \
197197
| jq -re "select(.sha != \"$TRAVIS_COMMIT\")
198198
| .statuses[] | select(.context == \"travis-ci/$NAME\").description
199199
| capture(\"code size is (?<size>[0-9]+)\").size" \

features/FEATURE_COMMON_PAL/mbed-coap/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Change Log
22

3+
## [v4.4.2](https://github.com/ARMmbed/mbed-coap/releases/tag/v4.4.2)
4+
**Closed issues:**
5+
- IOTCLT-2469 CoAP UDP retransmission does not work for blocks after first one for requests (Eg. registration POST)
6+
7+
-[Full Changelog](https://github.com/ARMmbed/mbed-coap/compare/v4.4.1...v4.4.2)
8+
39
## [v4.4.1](https://github.com/ARMmbed/mbed-coap/releases/tag/v4.4.1)
410
**Closed issues:**
511
- IOTCLT-2539 Block wise messaging call-backs not working logically

features/FEATURE_COMMON_PAL/mbed-coap/module.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mbed-coap",
3-
"version": "4.4.1",
3+
"version": "4.4.2",
44
"description": "COAP library",
55
"keywords": [
66
"coap",

features/FEATURE_COMMON_PAL/mbed-coap/source/sn_coap_protocol.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,8 +1732,17 @@ static sn_coap_hdr_s *sn_coap_handle_blockwise_message(struct coap_s *handle, sn
17321732
}
17331733

17341734
sn_coap_builder_2(dst_ack_packet_data_ptr, src_coap_blockwise_ack_msg_ptr, handle->sn_coap_block_data_size);
1735+
17351736
handle->sn_coap_tx_callback(dst_ack_packet_data_ptr, dst_packed_data_needed_mem, src_addr_ptr, param);
17361737

1738+
#if ENABLE_RESENDINGS
1739+
uint32_t resend_time = sn_coap_calculate_new_resend_time(handle->system_time, handle->sn_coap_resending_intervall, 0);
1740+
sn_coap_protocol_linked_list_send_msg_store(handle, src_addr_ptr,
1741+
dst_packed_data_needed_mem,
1742+
dst_ack_packet_data_ptr,
1743+
resend_time, param);
1744+
#endif
1745+
17371746
handle->sn_coap_protocol_free(dst_ack_packet_data_ptr);
17381747
dst_ack_packet_data_ptr = 0;
17391748

@@ -2053,13 +2062,13 @@ static sn_coap_hdr_s *sn_coap_handle_blockwise_message(struct coap_s *handle, sn
20532062
handle->sn_coap_tx_callback(dst_ack_packet_data_ptr,
20542063
dst_packed_data_needed_mem, src_addr_ptr, param);
20552064

2056-
#if ENABLE_RESENDINGS
2065+
#if ENABLE_RESENDINGS
20572066
uint32_t resend_time = sn_coap_calculate_new_resend_time(handle->system_time, handle->sn_coap_resending_intervall, 0);
20582067
sn_coap_protocol_linked_list_send_msg_store(handle, src_addr_ptr,
20592068
dst_packed_data_needed_mem,
20602069
dst_ack_packet_data_ptr,
20612070
resend_time, param);
2062-
#endif
2071+
#endif
20632072
handle->sn_coap_protocol_free(dst_ack_packet_data_ptr);
20642073
dst_ack_packet_data_ptr = 0;
20652074
}

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_STM/TARGET_STM32F2/TARGET_NUCLEO_F207ZG/stm32f2_eth_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ void HAL_ETH_MspDeInit(ETH_HandleTypeDef* heth)
8484
/* Disable the Ethernet global Interrupt */
8585
NVIC_DisableIRQ(ETH_IRQn);
8686
}
87-
}
87+
}

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_STM/TARGET_STM32F4/TARGET_ARCH_MAX/stm32f4_eth_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ void HAL_ETH_MspDeInit(ETH_HandleTypeDef* heth)
7878
/* Disable the Ethernet global Interrupt */
7979
NVIC_DisableIRQ(ETH_IRQn);
8080
}
81-
}
81+
}

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_STM/TARGET_STM32F4/TARGET_MTB_UBLOX_ODIN_W2/stm32f4_eth_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,4 @@ uint8_t mbed_otp_mac_address(char *mac)
156156
memcpy(mac, _macAddr, 6);
157157

158158
return 1;
159-
}
159+
}

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F429ZI/stm32f4_eth_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ void HAL_ETH_MspDeInit(ETH_HandleTypeDef* heth)
8484
/* Disable the Ethernet global Interrupt */
8585
NVIC_DisableIRQ(ETH_IRQn);
8686
}
87-
}
87+
}

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/stm32f4_eth_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ void HAL_ETH_MspDeInit(ETH_HandleTypeDef* heth)
8484
/* Disable the Ethernet global Interrupt */
8585
NVIC_DisableIRQ(ETH_IRQn);
8686
}
87-
}
87+
}

0 commit comments

Comments
 (0)