Skip to content

Commit f0425be

Browse files
committed
Merge branch 'main' into jacobhylen/P&M-launch
2 parents 033eebb + c6b3fd6 commit f0425be

File tree

7 files changed

+14
-151
lines changed

7 files changed

+14
-151
lines changed
Loading

content/hardware/02.hero/boards/uno-r4-wifi/datasheet/assets/mechanicalDrawingwWiFi.svg

-142
This file was deleted.
Loading

content/hardware/02.hero/boards/uno-r4-wifi/datasheet/assets/topViewWiFi.svg

-1
This file was deleted.

content/hardware/02.hero/boards/uno-r4-wifi/datasheet/datasheet.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ In addition, it features an ESP32-S3 module for Wi-Fi® & Bluetooth® connectivi
110110

111111
### Front View
112112

113-
![Top View of Arduino UNO R4 WiFi](assets/topViewWiFi.svg)
113+
![Top View of Arduino UNO R4 WiFi](assets/topViewWiFi.png)
114114

115115
| **Ref.** | **Description** |
116116
| ----------- | ------------------------------------------------ |
@@ -349,7 +349,7 @@ For powering e.g. servo motors, always use an external power supply.
349349

350350
## Mounting Holes And Board Outline
351351

352-
![Top side Mechanical View of Arduino UNO R4 WiFi](assets/mechanicalDrawingwWiFi.svg)
352+
![Top side Mechanical View of Arduino UNO R4 WiFi](assets/mechanicalDrawingWiFi.png)
353353

354354
## Board Operation
355355

@@ -491,6 +491,7 @@ This equipment contains a radio transmitter module with model approval code: CMI
491491

492492
| Date | **Revision** | **Changes** |
493493
| ---------- | ------------ | ------------------ |
494+
| 03/07/2024 | 5 | Update Assets |
494495
| 19/09/2023 | 4 | Update FCC section |
495496
| 25/07/2023 | 3 | Update Pin Table |
496497
| 30/06/2023 | 2 | Update Pinout File |
@@ -603,7 +604,7 @@ UNO R4 WiFi是第一代32位开发板的一部分, 之前基于8位AVR微控制
603604

604605
### 正视图
605606

606-
![Arduino UNO R4 WiFi 的正视图](assets/topViewWiFi.svg)
607+
![Arduino UNO R4 WiFi 的正视图](assets/topViewWiFi.png)
607608

608609
| **参考** | **描述** |
609610
| ------------ | ----------------------------------------- |
@@ -843,7 +844,7 @@ R7FA4M1AB3CFM#AA0微控制器上的GPIO可安全处理高达8mA的电流。切
843844

844845
## 安装孔和开发板轮廓
845846

846-
![Arduino UNO R4 WiFi 的顶部机械视图](assets/mechanicalDrawingwWiFi.svg)
847+
![Arduino UNO R4 WiFi 的顶部机械视图](assets/mechanicalDrawingWiFi.png)
847848

848849
## 开发板操作
849850

@@ -976,6 +977,7 @@ Arduino S.r.l.特此声明,本产品符合欧盟指令 2014/53/EU 的基本要
976977

977978
| 日期 | ** **修订版** ** | **变更内容** |
978979
| ---------- | ---------------- | ------------- |
980+
| 03/07/2024 | 5 | 一般更新 |
979981
| 19/09/2023 | 4 | 更新 FCC 部分 |
980982
| 25/07/2023 | 3 | 更新引脚表 |
981983
| 30/06/2023 | 2 | 更新引脚文件 |

content/micropython/02.micropython-course/course/03.python-cc/python-cc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Now take a look at what happens after each statement. Notice the empty space jus
107107
Anything inside of this indentation will execute if the statement is met, and this is a fundamental principle that is used in every Python program that you write!
108108

109109
Now since we already defined `x` to be `5+5`, the terminal will of course print:
110-
- `"x is larger than 10"`
110+
- `"x is exactly 10"`
111111

112112
## While Loop
113113

content/micropython/02.micropython-course/course/07.internet-of-things/01.internet-of-things.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ To do this, we can edit our `boot.py` file. Remember, the code on this file is t
9595

9696
![Select the Boot.py file.](assets/bootfile.png)
9797

98-
Then, in the `boot.py` file, we can past the Wi-Fi connection code that we just previously.
98+
Then, in the `boot.py` file, we can use the Wi-Fi connection code that we used previously.
9999

100100
```python
101101
"""
@@ -104,6 +104,10 @@ It will automatically run when
104104
you start your board, and connects
105105
to the Wi-Fi network specified.
106106
"""
107+
import network
108+
109+
WIFI_NETWORK='YOUR_NETWORK_NAME'
110+
WIFI_PASSWORD='YOUR_NETWORK_PASSWORD'
107111

108112
wlan = network.WLAN(network.STA_IF)
109113
wlan.active(True)
@@ -177,7 +181,7 @@ Once we run the script, after a while, we should be receiving the response. This
177181

178182
We now have a device that is capable of accessing the weather from anywhere in the world!
179183

180-
## Exercise 2: Internet Clock
184+
## Exercise 3: Internet Clock
181185

182186
In this exercise, we will make a request to something called an network time protocol (NTP) server.
183187

@@ -193,7 +197,7 @@ TIMESTAMP = 2208988800
193197
# Create new socket
194198
client = usocket.socket(usocket.AF_INET, usocket.SOCK_DGRAM)
195199
client.bind(("", 8080))
196-
#client.settimeout(3.0)
200+
client.settimeout(3.0)
197201

198202
# Get addr info via DNS
199203
addr = usocket.getaddrinfo("pool.ntp.org", 123)[0][4]

0 commit comments

Comments
 (0)