Skip to content

Commit 59660b1

Browse files
committed
Merge branch 'release/v1.8.3'
2 parents 838f129 + a2d7ba2 commit 59660b1

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

espressif/esp32-espidf-hello-world/src/main.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ void hello_task(void *pvParameter)
2121
}
2222
printf("Restarting now.\n");
2323
fflush(stdout);
24-
system_restart();
24+
esp_restart();
2525
}
2626

2727
void app_main()
2828
{
2929
nvs_flash_init();
30-
system_init();
3130
xTaskCreate(&hello_task, "hello_task", 2048, NULL, 5, NULL);
32-
}
31+
}

espressif/esp8266-arduino-ota/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
## About
55

6-
OTA (Over the Air) update is the process of loading the firmware to ESP module using Wi-Fi connection rather that a serial port.
6+
OTA (Over the Air) update is the process of loading the firmware to ESP module using Wi-Fi connection rather that a serial port.
77

8-
This example is adapted from https://github.com/esp8266/Arduino/blob/master/doc/ota_updates/readme.md
8+
This example is adapted from https://arduino-esp8266.readthedocs.io/en/latest/ota_updates/readme.html
99

1010
## Execute the example
1111

1212
Change directory to the example and edit src/main.cpp to set the SSID and password of your WiFi network.
1313

14-
const char* ssid = "WIFI_SSID";
15-
const char* password = "WIFI_PASS";
14+
const char* ssid = "WIFI_SSID";
15+
const char* password = "WIFI_PASS";
1616

1717
Compile and upload to your esp8266:
1818

stm32/stm32cube-ll-blink/platformio.ini

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@
1111
platform = ststm32
1212
framework = stm32cube
1313
board = nucleo_f401re
14+
build_flags = -DSYS_CLOCK=84000000L
15+
16+
[env:cloud_jam]
17+
platform = ststm32
18+
framework = stm32cube
19+
board = cloud_jam
20+
build_flags = -DSYS_CLOCK=84000000L

stm32/stm32cube-ll-blink/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void SystemClock_Config(void)
4545
LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1);
4646

4747
/* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */
48-
SystemCoreClock = F_CPU;
48+
SystemCoreClock = SYS_CLOCK;
4949

5050
LL_Init1msTick(SystemCoreClock);
5151
}

0 commit comments

Comments
 (0)