Skip to content

Commit c110ed7

Browse files
authored
Merge branch 'arduino:main' into patch-1
2 parents 634a61e + aa98421 commit c110ed7

File tree

20 files changed

+362
-93
lines changed

20 files changed

+362
-93
lines changed

.github/workflows/deploy-production.yml

+19-9
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- uses: actions/checkout@v4
2828
with:
29-
fetch-depth: 0
29+
fetch-depth: 1
3030
- uses: actions/setup-node@v4
3131
with:
3232
node-version: 18
@@ -66,6 +66,9 @@ jobs:
6666
- run: npm install
6767
- run: npm run build
6868

69+
- name: Clean up node_modules
70+
run: rm -rf node_modules
71+
6972
- name: Configure AWS credentials from Production account
7073
uses: aws-actions/configure-aws-credentials@v4
7174
with:
@@ -79,12 +82,19 @@ jobs:
7982
# Don't cache any HTML or JSON file: they should always be up-to-dates
8083
run: aws s3 sync --cache-control "public, max-age=0, must-revalidate" --include "*.html" --include="sw.js" --include="*.json" --include "*.css" --exclude="*.js" --exclude="*.gif" --exclude="*.png" --exclude="*.svg" --exclude="*.pdf" --delete public/ s3://${{ secrets.PRODUCTION_BUCKET_NAME }}/
8184

82-
- name: Sync PDF
83-
run: aws s3 sync --cache-control "public, max-age=86400, must-revalidate" --include "*.pdf" --exclude="*.js" --exclude="*.gif" --exclude="*.png" --exclude="*.svg" --exclude="*.css" --exclude="*.html" --exclude="*.json" --exclude="sw.json" --delete public/ s3://${{ secrets.PRODUCTION_BUCKET_NAME }}/
85+
# - name: Sync PDF
86+
# run: aws s3 sync --cache-control "public, max-age=86400, must-revalidate" --include "*.pdf" --exclude="*.js" --exclude="*.gif" --exclude="*.png" --exclude="*.svg" --exclude="*.css" --exclude="*.html" --exclude="*.json" --exclude="sw.json" --delete public/ s3://${{ secrets.PRODUCTION_BUCKET_NAME }}/
8487

85-
- name: Purge cache on CloudFlare
86-
run: |
87-
curl -X POST "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE }}/purge_cache" \
88-
-H "Authorization: Bearer ${{ secrets.CLOUDFLARE_PURGE_API_TOKEN }}" \
89-
-H "Content-Type: application/json" \
90-
--data '{"prefixes":["${{ vars.DATASHEETS_BASE_URL }}"]}'
88+
# - name: Purge cache on CloudFlare
89+
# run: |
90+
# curl -X POST "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE }}/purge_cache" \
91+
# -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_PURGE_API_TOKEN }}" \
92+
# -H "Content-Type: application/json" \
93+
# --data '{"prefixes":["${{ vars.DATASHEETS_BASE_URL }}"]}'
94+
95+
- name: Sync all cacheable assets
96+
run: aws s3 sync --cache-control "public, max-age=31536000, immutable" --include "*.css" --include="*.js" --include="*.gif" --include="*.png" --include="*.svg" --exclude "*.html" --exclude="sw.js" --exclude="*.json" --delete public/ s3://${{ secrets.PRODUCTION_BUCKET_NAME }}/
97+
98+
- name: Sync all non-cacheable assets
99+
# Don't cache any HTML or JSON file: they should always be up-to-dates
100+
run: aws s3 sync --cache-control "public, max-age=0, must-revalidate" --include "*.html" --include="sw.js" --include="*.json" --include "*.css" --exclude="*.js" --exclude="*.gif" --exclude="*.png" --exclude="*.svg" --delete public/ s3://${{ secrets.PRODUCTION_BUCKET_NAME }}/

.github/workflows/deploy-staging.yml

+23-12
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v4
2727
with:
28-
fetch-depth: 0
28+
fetch-depth: 1
2929
- uses: actions/setup-node@v4
3030
with:
3131
node-version: 18
@@ -65,25 +65,36 @@ jobs:
6565
- run: npm install
6666
- run: npm run build
6767

68+
- name: Clean up node_modules
69+
run: rm -rf node_modules
70+
6871
- name: Configure AWS credentials from Staging account
6972
uses: aws-actions/configure-aws-credentials@v4
7073
with:
7174
role-to-assume: ${{ secrets.STAGING_IAM_ROLE }}
7275
aws-region: us-east-1
7376

77+
# - name: Sync all cacheable assets
78+
# run: aws s3 sync --cache-control "public, max-age=31536000, immutable" --include "*.css" --include="*.js" --include="*.gif" --include="*.png" --include="*.svg" --exclude "*.html" --exclude="sw.js" --exclude="*.json" --exclude="*.pdf" --delete public/ s3://${{ secrets.STAGING_BUCKET_NAME }}/
79+
80+
# - name: Sync all non-cacheable assets
81+
# # Don't cache any HTML or JSON file: they should always be up-to-dates
82+
# run: aws s3 sync --cache-control "public, max-age=0, must-revalidate" --include "*.html" --include="sw.js" --include="*.json" --include "*.css" --exclude="*.js" --exclude="*.gif" --exclude="*.png" --exclude="*.svg" --exclude="*.pdf" --delete public/ s3://${{ secrets.STAGING_BUCKET_NAME }}/
83+
84+
# - name: Sync PDF
85+
# run: aws s3 sync --cache-control "public, max-age=86400, must-revalidate" --include "*.pdf" --exclude="*.js" --exclude="*.gif" --exclude="*.png" --exclude="*.svg" --exclude="*.css" --exclude="*.html" --exclude="*.json" --exclude="sw.json" --delete public/ s3://${{ secrets.STAGING_BUCKET_NAME }}/
86+
87+
# - name: Purge cache on CloudFlare
88+
# run: |
89+
# curl -X POST "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE }}/purge_cache" \
90+
# -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_PURGE_API_TOKEN }}" \
91+
# -H "Content-Type: application/json" \
92+
# --data '{"prefixes":["${{ vars.DATASHEETS_BASE_URL }}"]}'
93+
7494
- name: Sync all cacheable assets
75-
run: aws s3 sync --cache-control "public, max-age=31536000, immutable" --include "*.css" --include="*.js" --include="*.gif" --include="*.png" --include="*.svg" --exclude "*.html" --exclude="sw.js" --exclude="*.json" --exclude="*.pdf" --delete public/ s3://${{ secrets.STAGING_BUCKET_NAME }}/
95+
run: aws s3 sync --cache-control "public, max-age=31536000, immutable" --include "*.css" --include="*.js" --include="*.gif" --include="*.png" --include="*.svg" --exclude "*.html" --exclude="sw.js" --exclude="*.json" --delete public/ s3://${{ secrets.STAGING_BUCKET_NAME }}/
7696

7797
- name: Sync all non-cacheable assets
7898
# Don't cache any HTML or JSON file: they should always be up-to-dates
79-
run: aws s3 sync --cache-control "public, max-age=0, must-revalidate" --include "*.html" --include="sw.js" --include="*.json" --include "*.css" --exclude="*.js" --exclude="*.gif" --exclude="*.png" --exclude="*.svg" --exclude="*.pdf" --delete public/ s3://${{ secrets.STAGING_BUCKET_NAME }}/
80-
81-
- name: Sync PDF
82-
run: aws s3 sync --cache-control "public, max-age=86400, must-revalidate" --include "*.pdf" --exclude="*.js" --exclude="*.gif" --exclude="*.png" --exclude="*.svg" --exclude="*.css" --exclude="*.html" --exclude="*.json" --exclude="sw.json" --delete public/ s3://${{ secrets.STAGING_BUCKET_NAME }}/
99+
run: aws s3 sync --cache-control "public, max-age=0, must-revalidate" --include "*.html" --include="sw.js" --include="*.json" --include "*.css" --exclude="*.js" --exclude="*.gif" --exclude="*.png" --exclude="*.svg" --delete public/ s3://${{ secrets.STAGING_BUCKET_NAME }}/
83100

84-
- name: Purge cache on CloudFlare
85-
run: |
86-
curl -X POST "https://api.cloudflare.com/client/v4/zones/${{ secrets.CLOUDFLARE_ZONE }}/purge_cache" \
87-
-H "Authorization: Bearer ${{ secrets.CLOUDFLARE_PURGE_API_TOKEN }}" \
88-
-H "Content-Type: application/json" \
89-
--data '{"prefixes":["${{ vars.DATASHEETS_BASE_URL }}"]}'
Loading

content/arduino-cloud/04.cloud-editor/embedding-create-iframes/embedding-create-iframes.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ description: 'Learn about different methods when embedding your sketches in a we
44
author: 'Karl Söderby'
55
---
66

7-
The Web Editor is a great tool for creating and uploading programs while also collecting all of your sketches in one place. Another great feature is embedding them as iframes, such as articles, blogposts or journals.
7+
The Cloud Editor is a great tool for creating and uploading programs while also collecting all of your sketches in one place. Another great feature is embedding them as iframes, such as articles, blogposts or journals.
88

9-
To embed an iframe is very easy, and we just need to copy and paste a link from our sketch in the Web Editor. But we can also do a series of modifications to that iframe, and in this tutorial we will take a look at how to do that.
9+
To embed an iframe is very easy, and we just need to copy and paste a link from our sketch in the Cloud Editor. But we can also do a series of modifications to that iframe, and in this tutorial we will take a look at how to do that.
1010

1111
## Let's start
1212

13-
First of all, we need to navigate to the [Web Editor](https://create.arduino.cc/editor). If we do not have an account, we can register one with just a few simple steps.
13+
First of all, we need to navigate to the [Cloud Editor](https://create.arduino.cc/editor). If we do not have an account, we can register one with just a few simple steps.
1414

15-
Then, we need to have a code. In this tutorial, we are just going to use the good old **blink** example. When we have our sketch ready, click on the **share** button next to the port selection tool. This will open up a new window, that will have two fields: **link** and **iframe**. Copy the iframe field.
15+
Then, we need to have a code. In this tutorial, we are just going to use the good old **blink** example. When we have our sketch ready, click on the **share** button next to the serial monitor tool. This will open up a new window, that will have two fields: **link** and **embed**. Copy the embed field.
1616

17-
![iframe field](assets/iframe_highlight.png)
17+
![embed field](assets/iframe-highlight.png)
1818

19-
It should look something like this, where `{YOUR_ACCOUNT}` and `{SKETCH_URL}` is replaced by your own credentials.
19+
It should look something like this:
2020

2121
```markup
22-
<iframe src="https://create.arduino.cc/editor/{YOUR_ACCOUNT}/{SKETCH_URL}/preview?embed" style="height:510px;width:100%;margin:10px 0" frameborder="0"></iframe>
22+
<iframe src="https://app.arduino.cc/sketches/examples?eid=01.Basics%2FBlink&view-mode=embed" style="height:510px;width:100%;margin:10px 0" frameborder=0></iframe>
2323
```
2424

2525
This iframe can now simply be embedded in a HTML page, and it will look like this:
2626

27-
<iframe src="https://create.arduino.cc/editor/FT-CONTENT/189d16e1-ba13-421a-9413-7de6e9e46ed7/preview?embed" style="height:510px;width:100%;margin:10px 0" frameborder="0"></iframe>
27+
<iframe src="https://app.arduino.cc/sketches/examples?eid=01.Basics%2FBlink&view-mode=embed" style="height:510px;width:100%;margin:10px 0" frameborder=0></iframe>
2828

2929
But there are many ways we can modify the iframe to look different. So let's take a look the available modifications we can make!
3030

@@ -39,12 +39,12 @@ To do this, we just need to add the following code to the end of the URL:
3939
```
4040
The result is the following:
4141

42-
<iframe src="https://create.arduino.cc/editor/FT-CONTENT/189d16e1-ba13-421a-9413-7de6e9e46ed7/preview?embed&snippet" style="height:510px;width:100%;margin:10px 0" frameborder="0"></iframe>
42+
<iframe src="https://app.arduino.cc/sketches/examples?eid=01.Basics%2FBlink&view-mode=embed&snippet" style="height:510px;width:100%;margin:10px 0" frameborder=0></iframe>
4343

4444
And the full URL should look like this:
4545

4646
```markup
47-
<iframe src="https://create.arduino.cc/editor/{YOUR_ACCOUNT}/{SKETCH_URL}/preview?embed&snippet" style="height:510px;width:100%;margin:10px 0" frameborder="0"></iframe>
47+
<iframe src="https://app.arduino.cc/sketches/examples?eid=01.Basics%2FBlink&view-mode=embed&snippet" style="height:510px;width:100%;margin:10px 0" frameborder=0></iframe>
4848
```
4949

5050

@@ -58,12 +58,12 @@ Next is the highlighting feature. To use this, simply add the following lines to
5858

5959
The result is that line 3 and 4 are highlighted:
6060

61-
<iframe src="https://create.arduino.cc/editor/FT-CONTENT/189d16e1-ba13-421a-9413-7de6e9e46ed7/preview?embed&snippet#L3-L4" style="height:510px;width:100%;margin:10px 0" frameborder="0"></iframe>
61+
<iframe src="https://app.arduino.cc/sketches/examples?eid=01.Basics%2FBlink&view-mode=embed&snippet#L3-L4" style="height:510px;width:100%;margin:10px 0" frameborder=0></iframe>
6262

6363
And the full URL should look like this:
6464

6565
```markup
66-
<iframe src="https://create.arduino.cc/editor/{YOUR_ACCOUNT}/{SKETCH_URL}/preview?embed&amp;snippet#L3-L4" style="height:510px;width:100%;margin:10px 0" frameborder="0"></iframe>
66+
<iframe src="https://app.arduino.cc/sketches/examples?eid=01.Basics%2FBlink&view-mode=embed&snippet#L3-L4" style="height:510px;width:100%;margin:10px 0" frameborder=0></iframe>
6767
```
6868

6969
You can highlight as many lines as you want, and it is easily configurable. For example, if we want to highlight line 1, 3 and 5-8, we simply need to add the following to the URL:
@@ -90,7 +90,7 @@ style="height:200px;width:50%;margin:10px 0"
9090

9191
Which will look like this:
9292

93-
<iframe src="https://create.arduino.cc/editor/FT-CONTENT/189d16e1-ba13-421a-9413-7de6e9e46ed7/preview?embed&snippet" style="height:200px;width:50%;margin:10px 0" frameborder="0"></iframe>
93+
<iframe src="https://app.arduino.cc/sketches/examples?eid=01.Basics%2FBlink&view-mode=embed&snippet" style="height:200px;width:50%;margin:10px 0" frameborder=0></iframe>
9494

9595
## Automatically re-sizing your sketches
9696

@@ -104,9 +104,9 @@ And then using the class `arduino-sketch-iframe` in your HTML element.
104104

105105
## Summary
106106

107-
There are several cool ways of working with iframes from the Web Editor, and it is a really easy process that requires very little coding.
107+
There are several cool ways of working with iframes from the Cloud Editor, and it is a really easy process that requires very little coding.
108108

109-
The Web Editor helps you keep track on all of your sketches, and with the iframes, including your projects on other pages has never been easier.
109+
The Cloud Editor helps you keep track on all of your sketches, and with the iframes, including your projects on other pages has never been easier.
110110

111111
### More tutorials
112112

content/hardware/03.nano/boards/nano-esp32/datasheet/datasheet.md

+20-8
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,11 @@ Lors de l’ installation et de l’ exploitation de ce dispositif, la distance
467467

468468
Hereby, Arduino S.r.l. declares that this product is in compliance with essential requirements and other relevant provisions of Directive 201453/EU. This product is allowed to be used in all EU member states.
469469

470+
## SRRC
471+
472+
This equipment contains a radio transmitter module with model approval code: CMIIT ID: 24J993CLD252.
473+
474+
470475
## Company Information
471476

472477
| Company name | Arduino S.r.l. |
@@ -497,6 +502,8 @@ Hereby, Arduino S.r.l. declares that this product is in compliance with essentia
497502
| 11/23/2023 | Added label to LP modes |
498503
| 23/02/2024 | Added antenna frequency to block diagram |
499504
| 25/04/2024 | Updated link to new Cloud Editor |
505+
| 23/08/2024 | Added SRRC certification |
506+
500507

501508

502509
# 中文 (ZH)
@@ -954,6 +961,10 @@ Lors de l’ installation et de l’ exploitation de ce dispositif, la distance
954961

955962
Arduino S.r.l. 特此声明,本产品符合 201453/EU 指令的基本要求和其他相关规定。本产品允许在所有欧盟成员国使用。
956963

964+
## SRRC
965+
966+
本设备包含型号核准代码为:CMIIT ID: 24J993CLD252 的无线电发射模块。
967+
957968
## 公司信息
958969

959970
| 公司名称 | Arduino S.r.l. |
@@ -973,13 +984,14 @@ Arduino S.r.l. 特此声明,本产品符合 201453/EU 指令的基本要求和
973984

974985
## 变更日志
975986

976-
| **日期** | **变更** |
977-
| ---------- | ------------------------------------------------------ |
978-
| 2023/08/06 | 发布 |
979-
| 2023/09/01 | 更新电源树流程图。 |
987+
| **日期** | **变更** |
988+
| ---------- | -------------------------------------- |
989+
| 2023/08/06 | 发布 |
990+
| 2023/09/01 | 更新电源树流程图。 |
980991
| 2023/09/11 | 更新 SPI 部分,更新模拟/数字引脚部分。 |
981-
| 2023/11/06 | 更正公司名称,更正 VBUS/VUSB |
982-
| 2023/11/09 | 方框图更新,天线规格 |
983-
| 2023/11/15 | 环境温度更新 |
984-
| 2023/11/23 | 为 LP 模式添加了标签 |
992+
| 2023/11/06 | 更正公司名称,更正 VBUS/VUSB |
993+
| 2023/11/09 | 方框图更新,天线规格 |
994+
| 2023/11/15 | 环境温度更新 |
995+
| 2023/11/23 | 为 LP 模式添加了标签 |
985996
| 2024/02/23 | 在方框图中添加了天线频率 |
997+
| 2024/08/23 | SRRC 认证 |

content/hardware/03.nano/boards/nano-esp32/tech-specs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Board:
22
Name: Arduino® Nano ESP32
3-
SKU: ABX00083 / ABX00092
3+
SKU: ABX00083 / ABX00092 / ABX00083_CN / ABX00092_CN
44
Microcontroller: u-blox® NORA-W106 (ESP32-S3)
55
USB connector: USB-C®
66
Pins:

content/hardware/07.opta/opta-family/opta/features.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Arduino Opta® is available in three variants:
2525

2626
<Feature title="Connectivity" image="wifi-bluetooth">
2727

28-
Multiple choices are available for network connectivity, including USB, Ethernet, and Wi-Fi®/Bluetooth® Low Energy in addition to industry-specific protocols such as RS-485.
28+
Multiple choices are available for network connectivity, including USB, Ethernet, and Wi-Fi®/Bluetooth® Low Energy, as well as industry-specific communication interfaces like RS-485.
2929

3030
</Feature>
3131

content/hardware/07.opta/opta-family/opta/tech-specs.yml

+12-11
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,17 @@ Relays:
2020
Relay maximum switching voltage: 400 VAC
2121
Maximum current per relay: 10 A
2222
Maximum peak current per relay: 15 A
23-
Connectivity:
24-
USB Programming Port: Yes
25-
Ethernet:
26-
TCP/IP: Yes
27-
ModBus TCP: Yes
28-
Bluetooth® Low Energy: Arduino Opta® WiFi Only
29-
Wi-Fi®: Arduino Opta® WiFi Only
30-
Communication protocols:
31-
RS-485: Arduino Opta® RS485 & Arduino Opta® WiFi Only
32-
Programmable Serial ports: RS-485
23+
Connectivity and communication:
24+
USB-C®:
25+
For programming and data logging: All variants
26+
Ethernet:
27+
TCP/IP or Modbus TCP: All variants
28+
Bluetooth® Low Energy:
29+
Local sensor data acquisition: Arduino Opta® WiFi Only
30+
Wi-Fi®:
31+
Network connectivity: Arduino Opta® WiFi Only
32+
RS-485:
33+
Modbus RTU: Arduino Opta® RS485 & Arduino Opta® WiFi Only
3334
Power:
3435
Input voltage: 12-24 VDC
3536
Memory:
@@ -46,7 +47,7 @@ Secure element: ATECC608B
4647
Programming:
4748
Arduino programming language: Via Arduino IDEs, Arduino CLI, Arduino Web Editor
4849
IEC-61131-3: Ladder Diagram (LD), Function Block Diagram (FBD), Sequential Function Chart (SFC), Structured Text (ST), Instruction List (IL)
49-
Wiring Specifications:
50+
Wiring specifications:
5051
Recommended torque: 0.80 Nm
5152
Recommended tool: "#1 Phillips-headscrewdriver"
5253
Stripping length: 9 mm
Loading
Loading
Loading

0 commit comments

Comments
 (0)