Skip to content

Create a variant to support the UNO R3 WIFI when the USB Jumper(SJ-1) is closed #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KurtE wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Create a variant to support the UNO R3 WIFI when the USB Jumper(SJ-1) is closed #236

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebac7c7
New variant with USB
KurtE Sep 15, 2023
e5c9df1
Update boards.txt
KurtE Sep 23, 2023
15ced2a
Still WIP
KurtE Sep 26, 2023
9968497
more changes
KurtE Sep 27, 2023
b3db1e6
WiFiS3 - work with different variant
KurtE Oct 1, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Still WIP
  • Loading branch information
@KurtE
KurtE committed Jan 8, 2024
commit 15ced2a6fa99c4b5606a4ce2b21fad3d8cdcf966
22 changes: 5 additions & 17 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ unor4wifiusb.build.float-abi=-mfloat-abi=hard
unor4wifiusb.build.board=UNOWIFIR4USB
unor4wifiusb.build.defines=-DF_CPU=48000000 -DARDUINO_UNOR4_WIFIUSB
unor4wifiusb.vid.0=0x2341
unor4wifiusb.pid.0=0x1002
unor4wifiusb.pid.0=0x006D
unor4wifiusb.vid.1=0x2341
unor4wifiusb.pid.1=0x006D
unor4wifiusb.pid.1=0x0369
unor4wifiusb.upload_port.0.vid=0x2341
unor4wifiusb.upload_port.0.pid=0x1002
unor4wifiusb.upload_port.0.pid=0x006D
unor4wifiusb.upload_port.1.vid=0x2341
unor4wifiusb.upload_port.1.pid=0x006D
unor4wifiusb.upload_port.1.pid=0x0369

unor4wifiusb.compiler.fsp.defines={build.variant.path}/defines.txt
unor4wifiusb.compiler.fsp.ldflags={build.variant.path}/ldflags.txt
Expand All @@ -174,24 +174,12 @@ unor4wifiusb.compiler.fsp.includes={build.variant.path}/includes.txt
unor4wifiusb.compiler.fsp.extra_ldflags=--specs=nano.specs -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
unor4wifiusb.compiler.fsp="{build.variant.path}/libs/libfsp.a"

#unor4wifiusb.upload.tool=bossac
#unor4wifiusb.upload.tool.default=bossac
#unor4wifiusb.upload.protocol=sam-ba
#unor4wifiusb.upload.transport=
#unor4wifiusb.upload.vid=0x2341
#unor4wifiusb.upload.pid=0x1002
#unor4wifiusb.upload.use_1200bps_touch=true
#unor4wifiusb.upload.wait_for_upload_port=false
#unor4wifiusb.upload.native_usb=true
#unor4wifiusb.upload.maximum_size=262144
#unor4wifiusb.upload.maximum_data_size=32768

unor4wifiusb.upload.tool=dfu-util
unor4wifiusb.upload.tool.default=dfu-util
unor4wifiusb.upload.protocol=
unor4wifiusb.upload.transport=
unor4wifiusb.upload.vid=0x2341
unor4wifiusb.upload.pid=0x1002
unor4wifiusb.upload.pid=0x369
unor4wifiusb.upload.address=0x00010000
unor4wifiusb.upload.interface=0
unor4wifiusb.upload.use_1200bps_touch=false
Expand Down
14 changes: 7 additions & 7 deletions variants/UNOWIFIR4USB/pins_arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ static const uint8_t D15 = PIN_D15;
/****** UART CORE DEFINES ******/

#define SERIAL_HOWMANY 3
#define UART1_TX_PIN 22
#define UART1_RX_PIN 23
#define UART2_TX_PIN 1
#define UART2_RX_PIN 0
#define UART3_TX_PIN 24
#define UART3_RX_PIN 25
#define UART1_TX_PIN 1
#define UART1_RX_PIN 0
#define UART2_TX_PIN 24
#define UART2_RX_PIN 25
#define UART3_TX_PIN 22
#define UART3_RX_PIN 23

/****** WIRE CORE DEFINES ******/

Expand Down Expand Up @@ -160,7 +160,7 @@ static const uint8_t SS = PIN_SPI_CS;

#define USB_VID (0x2341)
#define USB_PID (0x006D)
#define USB_NAME "UNO R4 WiFi"
#define USB_NAME "UNO R4 WiFi USB"

#define VUSB_LDO_ENABLE 1

Expand Down
4 changes: 1 addition & 3 deletions variants/UNOWIFIR4USB/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,10 @@ void configure_usb_mux() {
}

#include "FspTimer.h"

__attribute__((weak)) void __maybe_start_usb() {}

void initVariant() {
__maybe_start_usb();
// bootloader configures LED_BUILTIN as PWM output, deconfigure it to avoid spurious signals
__maybe_start_usb(); // bootloader configures LED_BUILTIN as PWM output, deconfigure it to avoid spurious signals
pinMode(LED_BUILTIN, OUTPUT);
//pinMode(LEDB, OUTPUT);
//pinMode(LEDR, OUTPUT);
Expand Down