Skip to content

Commit 88fbafd

Browse files
committed
Update branch
1 parent 13854cd commit 88fbafd

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

.github/workflows/compile-examples.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,36 +34,47 @@ jobs:
3434
- fqbn: arduino:samd:mkrzero
3535
platforms: |
3636
- name: arduino:samd
37+
artifact-name-suffix: arduino-samd-mkrzero
3738
- fqbn: arduino:samd:mkr1000
3839
platforms: |
3940
- name: arduino:samd
41+
artifact-name-suffix: arduino-samd-mkr1000
4042
- fqbn: arduino:samd:mkrwifi1010
4143
platforms: |
4244
- name: arduino:samd
45+
artifact-name-suffix: arduino-samd-mkrwifi1010
4346
- fqbn: arduino:samd:mkrfox1200
4447
platforms: |
4548
- name: arduino:samd
49+
artifact-name-suffix: arduino-samd-mkrfox1200
4650
- fqbn: arduino:samd:mkrwan1300
4751
platforms: |
4852
- name: arduino:samd
53+
artifact-name-suffix: arduino-samd-mkrwan1300
4954
- fqbn: arduino:samd:mkrwan1310
5055
platforms: |
5156
- name: arduino:samd
57+
artifact-name-suffix: arduino-samd-mkrwan1310
5258
- fqbn: arduino:samd:mkrgsm1400
5359
platforms: |
5460
- name: arduino:samd
61+
artifact-name-suffix: arduino-samd-mkrgsm1400
5562
- fqbn: arduino:samd:mkrnb1500
5663
platforms: |
5764
- name: arduino:samd
65+
artifact-name-suffix: arduino-samd-mkrnb1500
5866
- fqbn: arduino:samd:mkrvidor4000
5967
platforms: |
6068
- name: arduino:samd
69+
artifact-name-suffix: arduino-samd-mkrvidor4000
6170
- fqbn: arduino:mbed_portenta:envie_m7
6271
platforms: |
6372
- name: arduino:mbed_portenta
73+
artifact-name-suffix: arduino-mbed_portenta-envie_m7
6474
- fqbn: arduino:mbed_opta:opta
6575
platforms: |
6676
- name: arduino:mbed_opta
77+
artifact-name-suffix: arduino-suffix-opta
6778

6879
steps:
6980
- name: Checkout repository
@@ -86,8 +97,8 @@ jobs:
8697
sketches-report-path: ${{ env.SKETCHES_REPORTS_PATH }}
8798

8899
- name: Save sketches report as workflow artifact
89-
uses: actions/upload-artifact@v3
100+
uses: actions/upload-artifact@v4
90101
with:
91102
if-no-files-found: error
92103
path: ${{ env.SKETCHES_REPORTS_PATH }}
93-
name: ${{ env.SKETCHES_REPORTS_PATH }}
104+
name: sketches-report-${{ matrix.board.artifact-name-suffix }}

.github/workflows/report-size-deltas.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
- name: Comment size deltas reports to PRs
2121
uses: arduino/report-size-deltas@v1
2222
with:
23-
# The name of the workflow artifact created by the sketch compilation workflow
24-
sketches-reports-source: sketches-reports
23+
# Regex matching the names of the workflow artifacts created by the "Compile Examples" workflow
24+
sketches-reports-source: ^sketches-report-.+

.github/workflows/sync-labels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
7171

7272
- name: Pass configuration files to next job via workflow artifact
73-
uses: actions/upload-artifact@v3
73+
uses: actions/upload-artifact@v4
7474
with:
7575
path: |
7676
*.yaml
@@ -108,13 +108,13 @@ jobs:
108108
uses: actions/checkout@v4
109109

110110
- name: Download configuration files artifact
111-
uses: actions/download-artifact@v3
111+
uses: actions/download-artifact@v4
112112
with:
113113
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
114114
path: ${{ env.CONFIGURATIONS_FOLDER }}
115115

116116
- name: Remove unneeded artifact
117-
uses: geekyeggo/delete-artifact@v2
117+
uses: geekyeggo/delete-artifact@v4
118118
with:
119119
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
120120

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.idea/

src/RS485.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#endif
3131
#endif
3232

33-
#ifndef RS485_DEFAULT_DE_PIN
3433
#ifdef __AVR__
3534
#define RS485_DEFAULT_DE_PIN 2
3635
#define RS485_DEFAULT_RE_PIN -1
@@ -41,11 +40,19 @@
4140
#define RS485_DEFAULT_DE_PIN A4
4241
#define RS485_DEFAULT_RE_PIN A5
4342
#else
43+
#ifndef RS485_DEFAULT_DE_PIN
4444
#define RS485_DEFAULT_DE_PIN A6
4545
#define RS485_DEFAULT_RE_PIN A5
4646
#endif
4747
#endif
4848

49+
#ifdef CUSTOM_RS485_DEFAULT_DE_PIN
50+
# define RS485_DEFAULT_DE_PIN CUSTOM_RS485_DEFAULT_DE_PIN
51+
#endif
52+
53+
#ifdef CUSTOM_RS485_DEFAULT_RE_PIN
54+
# define RS485_DEFAULT_RE_PIN CUSTOM_RS485_DEFAULT_RE_PIN
55+
#endif
4956

5057
#define RS485_DEFAULT_PRE_DELAY 50
5158
#define RS485_DEFAULT_POST_DELAY 50

0 commit comments

Comments
 (0)