Skip to content

Commit 5704a06

Browse files
facchinmfacchinm
committed
Mass rename old vidor2000
1 parent 2f97fc2 commit 5704a06

File tree

6 files changed

+19
-17
lines changed

6 files changed

+19
-17
lines changed

‎boards.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ mkrwifi1010.build.pid=0x8054
278278
mkrwifi1010.bootloader.tool=openocd
279279
mkrwifi1010.bootloader.file=mkrwifi1010/samd21_sam_ba_arduino_mkrwifi1010.bin
280280

281-
# Arduino MKR WiFi 1400
281+
# Arduino MKR Vidor 4000
282282
# --------------------
283283
mkrvidor.name=Arduino MKR Vidor 4000
284284
mkrvidor.vid.0=0x2341
@@ -288,13 +288,13 @@ mkrvidor.pid.1=0x0056
288288

289289
mkrvidor.upload.tool=bossacI
290290
mkrvidor.upload.protocol=sam-ba
291-
mkrvidor.upload.maximum_size=1048576
291+
mkrvidor.upload.maximum_size=262144
292292
mkrvidor.upload.use_1200bps_touch=true
293293
mkrvidor.upload.wait_for_upload_port=true
294294
mkrvidor.upload.native_usb=true
295295
mkrvidor.build.mcu=cortex-m0plus
296296
mkrvidor.build.f_cpu=48000000L
297-
mkrvidor.build.usb_product="Arduino MKR Vidor 2000"
297+
mkrvidor.build.usb_product="Arduino MKR Vidor 4000"
298298
mkrvidor.build.usb_manufacturer="Arduino LLC"
299299
mkrvidor.build.board=SAMD_MKRVIDOR
300300
mkrvidor.build.core=arduino
@@ -305,7 +305,7 @@ mkrvidor.build.variant=mkrvidor
305305
mkrvidor.build.vid=0x2341
306306
mkrvidor.build.pid=0x8056
307307
mkrvidor.bootloader.tool=openocd
308-
mkrvidor.bootloader.file=mkrvidor2000/samd21_sam_ba_arduino_mkrvidor.bin
308+
mkrvidor.bootloader.file=mkrvidor4000/samd21_sam_ba_arduino_mkrvidor.bin
309309

310310
# Adafruit Circuit Playground M0
311311
# ------------------------------

‎bootloaders/zero/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ BIN=$(NAME).bin
7575
HEX=$(NAME).hex
7676

7777

78-
INCLUDES=-I"$(MODULE_PATH)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.1.0/CMSIS/Device/ATMEL/"
78+
INCLUDES=-I"$(MODULE_PATH)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.2.0/CMSIS/Device/ATMEL/"
7979

8080
# -----------------------------------------------------------------------------
8181
# Linker options

‎bootloaders/zero/board_definitions.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include "board_definitions_arduino_mkrwan1300.h"
3636
#elif defined(BOARD_ID_arduino_mkrwifi1010)
3737
#include "board_definitions_arduino_mkrwifi1010.h"
38-
#elif defined(BOARD_ID_arduino_mkrvidor2000)
39-
#include "board_definitions_arduino_mkrvidor2000.h"
38+
#elif defined(BOARD_ID_arduino_mkrvidor4000)
39+
#include "board_definitions_arduino_mkrvidor4000.h"
4040
#else
4141
#error You must define a BOARD_ID and add the corresponding definitions in board_definitions.h
4242
#endif

bootloaders/zero/board_definitions_arduino_mkrvidor2000.h renamed to bootloaders/zero/board_definitions_arduino_mkrvidor4000.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/*
2323
* USB device definitions
2424
*/
25-
#define STRING_PRODUCT "Arduino MKR Vidor 2000"
25+
#define STRING_PRODUCT "Arduino MKR Vidor 4000"
2626
#define USB_VID_HIGH 0x23
2727
#define USB_VID_LOW 0x41
2828
#define USB_PID_HIGH 0x00
@@ -83,13 +83,15 @@
8383
#define TMS 14
8484

8585
#define LAST_FLASH_PAGE (0x200000 - 0x1000)
86+
#define SCRATCHPAD_FLASH_PAGE (0x200000 - 0x2000)
8687
//#define LAST_FLASH_PAGE (0x100000 - 0x1000)
8788

88-
typedef struct {
89+
typedef struct __attribute__((packed)) {
8990
uint32_t offset;
9091
uint32_t length;
9192
uint32_t sha256sum[8];
9293
uint32_t type;
94+
uint32_t force;
9395
} externalFlashSignatures;
9496

9597
#define SAM_BA_INTERFACE SAM_BA_USBCDC_ONLY

‎bootloaders/zero/build_all_bootloaders.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ mv -v samd21_sam_ba_arduino_mkrwan1300.* ../mkrwan1300/
2525
BOARD_ID=arduino_mkrwifi1010 NAME=samd21_sam_ba_arduino_mkrwifi1010 make clean all
2626
mv -v samd21_sam_ba_arduino_mkrwifi1010.* ../mkrwifi1010/
2727

28-
BOARD_ID=arduino_mkrvidor2000 NAME=samd21_sam_ba_arduino_mkrvidor make clean all
29-
mv -v samd21_sam_ba_arduino_mkrvidor.* ../mkrvidor2000/
28+
BOARD_ID=arduino_mkrvidor4000 NAME=samd21_sam_ba_arduino_mkrvidor make clean all
29+
mv -v samd21_sam_ba_arduino_mkrvidor.* ../mkrvidor4000/
3030

3131
echo Done building bootloaders!
3232

‎platform.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,23 +171,23 @@ tools.openocd.cmd.windows=bin/openocd.exe
171171

172172
tools.openocd.upload.params.verbose=-d2
173173
tools.openocd.upload.params.quiet=-d0
174-
tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.bin}} verify reset 0x2000; shutdown"
174+
tools.openocd.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {build.path}/{build.project_name}.bin verify reset 0x2000; shutdown"
175175

176176
tools.openocd.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
177177
tools.openocd.upload.network_pattern={network_cmd} -address {serial.port} -port 65280 -username arduino -password "{network.password}" -sketch "{build.path}/{build.project_name}.bin" -upload /sketch -b
178178

179179
# Program flashes the binary at 0x0000, so use the linker script without_bootloader
180180
tools.openocd.program.params.verbose=-d2
181181
tools.openocd.program.params.quiet=-d0
182-
tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.elf}} verify reset; shutdown"
182+
tools.openocd.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {build.path}/{build.project_name}.elf verify reset; shutdown"
183183

184184
tools.openocd.erase.params.verbose=-d3
185185
tools.openocd.erase.params.quiet=-d0
186186
tools.openocd.erase.pattern=
187187

188188
tools.openocd.bootloader.params.verbose=-d2
189189
tools.openocd.bootloader.params.quiet=-d0
190-
tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
190+
tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {runtime.platform.path}/bootloaders/{bootloader.file} verify reset; shutdown"
191191

192192
#
193193
# OpenOCD sketch upload - version with configurable bootloader size
@@ -200,17 +200,17 @@ tools.openocd-withbootsize.cmd.windows=bin/openocd.exe
200200

201201
tools.openocd-withbootsize.upload.params.verbose=-d2
202202
tools.openocd-withbootsize.upload.params.quiet=-d0
203-
tools.openocd-withbootsize.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.bin}} verify reset {bootloader.size}; shutdown"
203+
tools.openocd-withbootsize.upload.pattern="{path}/{cmd}" {upload.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{build.path}/{build.project_name}.bin} verify reset {bootloader.size}; shutdown"
204204

205205
# Program flashes the binary at 0x0000, so use the linker script without_bootloader
206206
tools.openocd-withbootsize.program.params.verbose=-d2
207207
tools.openocd-withbootsize.program.params.quiet=-d0
208-
tools.openocd-withbootsize.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {{{build.path}/{build.project_name}.elf}} verify reset; shutdown"
208+
tools.openocd-withbootsize.program.pattern="{path}/{cmd}" {program.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; program {build.path}/{build.project_name}.elf verify reset; shutdown"
209209

210210
tools.openocd-withbootsize.erase.params.verbose=-d3
211211
tools.openocd-withbootsize.erase.params.quiet=-d0
212212
tools.openocd-withbootsize.erase.pattern=
213213

214214
tools.openocd-withbootsize.bootloader.params.verbose=-d2
215215
tools.openocd-withbootsize.bootloader.params.quiet=-d0
216-
tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
216+
tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {runtime.platform.path}/bootloaders/{bootloader.file} verify reset; shutdown"

0 commit comments

Comments
 (0)