Skip to content

Commit 3cab5a3

Browse files
vortigontvortigont
committed
feat(board): Update 3rd party board Huidu HD-WF2/HD-WF4
Followup espressif#10779 - fixed flash mode to 'dio' - removed psram flags - corrected gpio mapping defines
1 parent 5ba4c21 commit 3cab5a3

File tree

3 files changed

+42
-80
lines changed

3 files changed

+42
-80
lines changed

Diff for: ‎boards.txt

+4-32
Original file line numberDiff line numberDiff line change
@@ -48860,8 +48860,8 @@ huidu_hd_wf2.build.partitions=default
4886048860
huidu_hd_wf2.build.defines=
4886148861
huidu_hd_wf2.build.loop_core=
4886248862
huidu_hd_wf2.build.event_core=
48863-
huidu_hd_wf2.build.flash_type=qio
48864-
huidu_hd_wf2.build.psram_type=qspi
48863+
huidu_hd_wf2.build.flash_type=dio
48864+
huidu_hd_wf2.build.psram_type=
4886548865
huidu_hd_wf2.build.memory_type={build.flash_type}_{build.psram_type}
4886648866

4886748867
huidu_hd_wf2.menu.FlashSize.8M=8MB (64Mb)
@@ -48923,20 +48923,6 @@ huidu_hd_wf2.menu.CPUFreq.80.build.f_cpu=80000000L
4892348923
huidu_hd_wf2.menu.CPUFreq.40=40MHz
4892448924
huidu_hd_wf2.menu.CPUFreq.40.build.f_cpu=40000000L
4892548925

48926-
huidu_hd_wf2.menu.PSRAM.enabled=QSPI Flash fix
48927-
huidu_hd_wf2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
48928-
huidu_hd_wf2.menu.PSRAM.enabled.build.psram_type=qspi
48929-
48930-
huidu_hd_wf2.menu.FlashMode.qio=QIO 80MHz
48931-
huidu_hd_wf2.menu.FlashMode.qio.build.flash_mode=dio
48932-
huidu_hd_wf2.menu.FlashMode.qio.build.boot=qio
48933-
huidu_hd_wf2.menu.FlashMode.qio.build.boot_freq=80m
48934-
huidu_hd_wf2.menu.FlashMode.qio.build.flash_freq=80m
48935-
huidu_hd_wf2.menu.FlashMode.qio120=QIO 120MHz
48936-
huidu_hd_wf2.menu.FlashMode.qio120.build.flash_mode=dio
48937-
huidu_hd_wf2.menu.FlashMode.qio120.build.boot=qio
48938-
huidu_hd_wf2.menu.FlashMode.qio120.build.boot_freq=120m
48939-
huidu_hd_wf2.menu.FlashMode.qio120.build.flash_freq=80m
4894048926
huidu_hd_wf2.menu.FlashMode.dio=DIO 80MHz
4894148927
huidu_hd_wf2.menu.FlashMode.dio.build.flash_mode=dio
4894248928
huidu_hd_wf2.menu.FlashMode.dio.build.boot=dio
@@ -49013,8 +48999,8 @@ huidu_hd_wf4.build.partitions=default
4901348999
huidu_hd_wf4.build.defines=
4901449000
huidu_hd_wf4.build.loop_core=
4901549001
huidu_hd_wf4.build.event_core=
49016-
huidu_hd_wf4.build.flash_type=qio
49017-
huidu_hd_wf4.build.psram_type=qspi
49002+
huidu_hd_wf4.build.flash_type=dio
49003+
huidu_hd_wf4.build.psram_type=
4901849004
huidu_hd_wf4.build.memory_type={build.flash_type}_{build.psram_type}
4901949005

4902049006
huidu_hd_wf4.menu.FlashSize.8M=8MB (64Mb)
@@ -49076,20 +49062,6 @@ huidu_hd_wf4.menu.CPUFreq.80.build.f_cpu=80000000L
4907649062
huidu_hd_wf4.menu.CPUFreq.40=40MHz
4907749063
huidu_hd_wf4.menu.CPUFreq.40.build.f_cpu=40000000L
4907849064

49079-
huidu_hd_wf4.menu.PSRAM.enabled=QSPI Flash fix
49080-
huidu_hd_wf4.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
49081-
huidu_hd_wf4.menu.PSRAM.enabled.build.psram_type=qspi
49082-
49083-
huidu_hd_wf4.menu.FlashMode.qio=QIO 80MHz
49084-
huidu_hd_wf4.menu.FlashMode.qio.build.flash_mode=dio
49085-
huidu_hd_wf4.menu.FlashMode.qio.build.boot=qio
49086-
huidu_hd_wf4.menu.FlashMode.qio.build.boot_freq=80m
49087-
huidu_hd_wf4.menu.FlashMode.qio.build.flash_freq=80m
49088-
huidu_hd_wf4.menu.FlashMode.qio120=QIO 120MHz
49089-
huidu_hd_wf4.menu.FlashMode.qio120.build.flash_mode=dio
49090-
huidu_hd_wf4.menu.FlashMode.qio120.build.boot=qio
49091-
huidu_hd_wf4.menu.FlashMode.qio120.build.boot_freq=120m
49092-
huidu_hd_wf4.menu.FlashMode.qio120.build.flash_freq=80m
4909349065
huidu_hd_wf4.menu.FlashMode.dio=DIO 80MHz
4909449066
huidu_hd_wf4.menu.FlashMode.dio.build.flash_mode=dio
4909549067
huidu_hd_wf4.menu.FlashMode.dio.build.boot=dio

Diff for: ‎variants/huidu_hd_wf2/pins_arduino.h

-15
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,4 @@ static const uint8_t MOSI = 11;
5858
static const uint8_t MISO = 13;
5959
static const uint8_t SCK = 12;
6060

61-
static const uint8_t T1 = WF2_X1_R1_PIN;
62-
static const uint8_t T2 = WF2_X1_R2_PIN;
63-
static const uint8_t T3 = WF2_X1_G1_PIN;
64-
static const uint8_t T4 = WF2_X1_G2_PIN;
65-
static const uint8_t T5 = WF2_X1_B1_PIN;
66-
static const uint8_t T6 = WF2_X1_B2_PIN;
67-
static const uint8_t T7 = WF2_A_PIN;
68-
static const uint8_t T8 = WF2_B_PIN;
69-
static const uint8_t T9 = WF2_C_PIN;
70-
static const uint8_t T10 = WF2_D_PIN;
71-
static const uint8_t T11 = WF2_X1_E_PIN;
72-
static const uint8_t T12 = WF2_OE_PIN;
73-
static const uint8_t T13 = WF2_CLK_PIN;
74-
static const uint8_t T14 = WF2_LAT_PIN;
75-
7661
#endif /* Pins_Arduino_h */

Diff for: ‎variants/huidu_hd_wf4/pins_arduino.h

+38-33
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define WF4_CLK_PIN 34
2020
#define WF4_LAT_PIN 33
2121

22-
// X1
22+
// X1 HUB75
2323
#define WF4_X1_R1_PIN 2
2424
#define WF4_X1_R2_PIN 3
2525
#define WF4_X1_G1_PIN 6
@@ -28,7 +28,7 @@
2828
#define WF4_X1_B2_PIN 11
2929
#define WF4_X1_CS_PIN 45 // CS gpio must be set HIGH to enable X1 output
3030

31-
// X2
31+
// X2 HUB75
3232
#define WF4_X2_R1_PIN 4
3333
#define WF4_X2_R2_PIN 5
3434
#define WF4_X2_G1_PIN 8
@@ -37,7 +37,7 @@
3737
#define WF4_X2_B2_PIN 13
3838
#define WF4_X2_CS_PIN WF4_X1_CS_PIN // CS gpio must be set HIGH to enable X2 output
3939

40-
// X3
40+
// X3 HUB75
4141
#define WF4_X3_R1_PIN 2
4242
#define WF4_X3_R2_PIN 3
4343
#define WF4_X3_G1_PIN 6
@@ -46,7 +46,7 @@
4646
#define WF4_X3_B2_PIN 11
4747
#define WF4_X3_CS_PIN 14 // CS gpio must be set HIGH to enable X3 output
4848

49-
// X4
49+
// X4 HUB75
5050
#define WF4_X4_R1_PIN 4
5151
#define WF4_X4_R2_PIN 5
5252
#define WF4_X4_G1_PIN 8
@@ -55,14 +55,30 @@
5555
#define WF4_X4_B2_PIN 13
5656
#define WF4_X4_CS_PIN WF4_X3_CS_PIN // CS gpio must be set HIGH to enable X4 output
5757

58-
//#define WF4_P1_PIN UART
59-
#define WF4_P2_DATA_PIN 0 // GPIO0 boot
60-
#define WF4_P5_DATA_PIN 16 // temperature
61-
//#define WF4_P7_PIN VCC/GND
62-
#define WF4_P11_DATA_PIN 15 // IR
58+
// P1 is a UART connector
59+
#define WF4_P1_RX_PIN 44
60+
#define WF4_P1_TX_PIN 43
61+
62+
// P2: PCB holes gpio/gnd
63+
#define WF4_P2_DATA_PIN 0 // GPIO0 boot
64+
65+
// P5: temperature sensor connector
66+
#define WF4_P5_DATA_PIN 16
67+
68+
// P7: VCC/GPIO holes on PCB
69+
#define WF4_P7_DATA_PIN 1
70+
71+
// P11: IR connector
72+
#define WF4_P11_DATA_PIN 15
73+
74+
// P12: two gpio's, Vcc, GND
6375
#define WF4_P12_DATA1_PIN 47
6476
#define WF4_P12_DATA2_PIN 18
65-
#define WF4_S1_DATA_PIN 17 // Button
77+
78+
// S1 Button
79+
#define WF4_S1_DATA_PIN 17
80+
81+
// S2-S3 PCB holes
6682
#define WF4_S2_DATA_PIN 48
6783
#define WF4_S3_DATA_PIN 26
6884
#define WF4_S4_DATA_PIN 46
@@ -71,36 +87,25 @@
7187
#define WF4_LED_RUN_PIN 40 // Status LED on PCB
7288
#define WF4_BM8563_I2C_SDA 41 // RTC BM8563 I2C port
7389
#define WF4_BM8563_I2C_SCL 42
74-
#define WF4_USB_DM_PIN 19
75-
#define WF4_USB_DP_PIN 20
90+
#define WF4_USB_DN_PIN 19 // USB-A D-
91+
#define WF4_USB_DP_PIN 20 // USB-A D+
7692

7793
#define LED_BUILTIN WF4_LED_RUN_PIN
7894
#define BUILTIN_LED LED_BUILTIN // backward compatibility
7995

80-
static const uint8_t TX = 43;
81-
static const uint8_t RX = 44;
96+
static const uint8_t TX = WF4_P1_TX_PIN;
97+
static const uint8_t RX = WF4_P1_RX_PIN;
8298

8399
static const uint8_t SDA = WF4_BM8563_I2C_SDA;
84100
static const uint8_t SCL = WF4_BM8563_I2C_SCL;
85101

86-
static const uint8_t SS = 10;
87-
static const uint8_t MOSI = 11;
88-
static const uint8_t MISO = 13;
89-
static const uint8_t SCK = 12;
90-
91-
static const uint8_t T1 = WF4_X1_R1_PIN;
92-
static const uint8_t T2 = WF4_X1_R2_PIN;
93-
static const uint8_t T3 = WF4_X1_G1_PIN;
94-
static const uint8_t T4 = WF4_X1_G2_PIN;
95-
static const uint8_t T5 = WF4_X1_B1_PIN;
96-
static const uint8_t T6 = WF4_X1_B2_PIN;
97-
static const uint8_t T7 = WF4_A_PIN;
98-
static const uint8_t T8 = WF4_B_PIN;
99-
static const uint8_t T9 = WF4_C_PIN;
100-
static const uint8_t T10 = WF4_D_PIN;
101-
static const uint8_t T11 = WF4_E_PIN;
102-
static const uint8_t T12 = WF4_OE_PIN;
103-
static const uint8_t T13 = WF4_CLK_PIN;
104-
static const uint8_t T14 = WF4_LAT_PIN;
102+
// there is no dedicated SPI connector on board, but SPI could be accessed via PCB holes
103+
static const uint8_t SS = WF4_S2_DATA_PIN;
104+
static const uint8_t MOSI = WF4_S3_DATA_PIN;
105+
static const uint8_t MISO = WF4_S4_DATA_PIN;
106+
static const uint8_t SCK = WF4_P7_DATA_PIN;
107+
108+
// touch pins are mostly busy with HUB75 ports
109+
static const uint8_t T1 = WF4_P7_DATA_PIN;
105110

106111
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)