From 0fb01f84ff48ee4a50463214d43531512ae37b25 Mon Sep 17 00:00:00 2001 From: "Daniel.Cao" Date: Fri, 4 Jul 2025 10:56:28 +0800 Subject: [PATCH 1/4] fix(board): Update PSRAM configuration for RAK3112 to fix PSRAM error --- boards.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index e47995985ed..c88759df214 100644 --- a/boards.txt +++ b/boards.txt @@ -50809,8 +50809,10 @@ rakwireless_rak3112.build.flash_mode=dio rakwireless_rak3112.build.boot=dio rakwireless_rak3112.build.partitions=default rakwireless_rak3112.build.defines= +rakwireless_rak3112.build.psram_type=opi +rakwireless_rak3112.build.memory_type={build.boot}_{build.psram_type} -rakwireless_rak3112.menu.PSRAM.enabled=Enabled +rakwireless_rak3112.menu.PSRAM.enabled=OPI PSRAM rakwireless_rak3112.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM rakwireless_rak3112.menu.PSRAM.enabled.build.psram_type=opi rakwireless_rak3112.menu.PSRAM.disabled=Disabled From 2fc8050ca0a1051e325f9e8e023e196a31c6bbf9 Mon Sep 17 00:00:00 2001 From: "Daniel.Cao" Date: Fri, 4 Jul 2025 12:03:51 +0800 Subject: [PATCH 2/4] feat(board): RAK3112 add WisBlock module pin definitions to pins_arduino.h --- variants/rakwireless_rak3112/pins_arduino.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/variants/rakwireless_rak3112/pins_arduino.h b/variants/rakwireless_rak3112/pins_arduino.h index 5d1e451494a..a141e7f1cff 100644 --- a/variants/rakwireless_rak3112/pins_arduino.h +++ b/variants/rakwireless_rak3112/pins_arduino.h @@ -47,4 +47,17 @@ static const uint8_t SCK = 13; #define LORA_BUSY 48 #define LORA_IRQ LORA_DIO1 +// For WisBlock modules, see: https://docs.rakwireless.com/Product-Categories/WisBlock/ +#define WB_IO1 21 +#define WB_IO2 14 +#define WB_IO3 41 +#define WB_IO4 42 +#define WB_IO5 38 +#define WB_IO6 39 +#define WB_A0 1 +#define WB_A1 2 +#define WB_CS 12 +#define WB_LED1 46 +#define WB_LED2 45 + #endif /* Pins_Arduino_h */ From 916caede51343fb2ac0e6ada01963f746864cc9d Mon Sep 17 00:00:00 2001 From: "Daniel.Cao" Date: Fri, 4 Jul 2025 17:39:42 +0800 Subject: [PATCH 3/4] fix(board): Update RAK3112 flash mode and boot settings for improved performance --- boards.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boards.txt b/boards.txt index c88759df214..ac2b1a336e4 100644 --- a/boards.txt +++ b/boards.txt @@ -50805,14 +50805,14 @@ rakwireless_rak3112.build.dfu_on_boot=0 rakwireless_rak3112.build.f_cpu=240000000L rakwireless_rak3112.build.flash_size=16MB rakwireless_rak3112.build.flash_freq=80m -rakwireless_rak3112.build.flash_mode=dio -rakwireless_rak3112.build.boot=dio +rakwireless_rak3112.build.flash_mode=qio +rakwireless_rak3112.build.boot=qio rakwireless_rak3112.build.partitions=default rakwireless_rak3112.build.defines= rakwireless_rak3112.build.psram_type=opi rakwireless_rak3112.build.memory_type={build.boot}_{build.psram_type} -rakwireless_rak3112.menu.PSRAM.enabled=OPI PSRAM +rakwireless_rak3112.menu.PSRAM.enabled=Enabled rakwireless_rak3112.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM rakwireless_rak3112.menu.PSRAM.enabled.build.psram_type=opi rakwireless_rak3112.menu.PSRAM.disabled=Disabled From b86c681ff75dfbbad12a20af1b8d953ab9b34c23 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Mon, 7 Jul 2025 07:25:17 +0000 Subject: [PATCH 4/4] ci(pre-commit): Apply automatic fixes --- variants/rakwireless_rak3112/pins_arduino.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/variants/rakwireless_rak3112/pins_arduino.h b/variants/rakwireless_rak3112/pins_arduino.h index a141e7f1cff..f1bcc7a6120 100644 --- a/variants/rakwireless_rak3112/pins_arduino.h +++ b/variants/rakwireless_rak3112/pins_arduino.h @@ -48,15 +48,15 @@ static const uint8_t SCK = 13; #define LORA_IRQ LORA_DIO1 // For WisBlock modules, see: https://docs.rakwireless.com/Product-Categories/WisBlock/ -#define WB_IO1 21 -#define WB_IO2 14 -#define WB_IO3 41 -#define WB_IO4 42 -#define WB_IO5 38 -#define WB_IO6 39 -#define WB_A0 1 -#define WB_A1 2 -#define WB_CS 12 +#define WB_IO1 21 +#define WB_IO2 14 +#define WB_IO3 41 +#define WB_IO4 42 +#define WB_IO5 38 +#define WB_IO6 39 +#define WB_A0 1 +#define WB_A1 2 +#define WB_CS 12 #define WB_LED1 46 #define WB_LED2 45