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

Merge pull request #8302 from JanneKiiskila/wait_ms 

Use wait_ms(int) instead of wait(float)
pull/8375/merge
Cruz Monrreal 2018-10-17 08:34:47 -05:00 committed by GitHub
parent d30ae07b6e de77695b08
commit 2daab38194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/ota_api.c
View File

@ -167,7 +167,7 @@ uint32_t OTA_ReadImage(uint32_t base, uint32_t offset, uint32_t len, uint8_t *da
void OTA_ResetTarget(void) void OTA_ResetTarget(void)
{ {
__RTK_CTRL_WRITE32(0x14, 0x00000021); __RTK_CTRL_WRITE32(0x14, 0x00000021);
wait(1); wait_ms(1000);
NVIC_SystemReset(); NVIC_SystemReset();

4
targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/ublox-odin-w2-drivers/OdinWiFiInterface.cpp
View File

@ -1,5 +1,5 @@
/* ODIN-W2 implementation of WiFiInterface /* ODIN-W2 implementation of WiFiInterface
* Copyright (c) 2016 u-blox Malmö AB * Copyright (c) 2016 u-blox Malmö AB
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -937,7 +937,7 @@ void OdinWiFiInterface::handle_user_scan(user_scan_s *user_scan)
cbRTSL_Status status = cbSTATUS_ERROR; cbRTSL_Status status = cbSTATUS_ERROR;
for(int i = 0; (i < 10) && (status != cbSTATUS_OK); i++) { for(int i = 0; (i < 10) && (status != cbSTATUS_OK); i++) {
if(i > 0) { if(i > 0) {
wait(0.5); wait_ms(500);
} }
cbMAIN_driverLock(); cbMAIN_driverLock();