Skip to content

Commit 6ce0322

Browse files
vanvughtvanvught
committed
Remove ENABLE_CONTENT content flag; add store config checks
Remove ENABLE_CONTENT dependency from multiple GD32 target Makefiles and decouple web-browser support so ENABLE_HTTPD alone enables Art-Net web capability. Adjust HTTPD source to always compile content handling (unless explicitly disabled via CONFIG_HTTPD_OPTIMIZE_NONE) and normalize GCC optimization pragmas. Add compile-time sanity checks across store device backends (SPI/I2C/ROM/RAM) to prevent mutually exclusive configurations, update copyright years to 2026, and apply minor code cleanups (IWYU pragmas, destructor formatting, DEBUG handling). Also tweak Board.mk board-specific defines (HTTPD optimization, store/backing selection and NO_EMAC) and minor Makefile reordering.
1 parent ad416d1 commit 6ce0322

17 files changed

Lines changed: 73 additions & 40 deletions

File tree

‎common/make/gd32/Board.mk‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,18 @@ endif
1717
ifeq ($(strip $(BOARD)),BOARD_GD32F107RC)
1818
MCU=GD32F107RC
1919
DEFINES+=-DCONFIG_STORE_USE_ROM
20+
DEFINES+=-DCONFIG_HTTPD_OPTIMIZE_NONE
2021
endif
2122

2223
ifeq ($(strip $(BOARD)),BOARD_GD32F207RG)
2324
MCU=GD32F207RG
2425
DEFINES+=-DCONFIG_STORE_USE_SPI
25-
DEFINES+=-DCONFIG_HTTPD_OPTIMIZE_O2
26+
endif
27+
28+
ifeq ($(strip $(BOARD)),BOARD_GD32F303CB)
29+
MCU=GD32F303CB
30+
DEFINES+=-DCONFIG_STORE_USE_ROM
31+
DEFINES+=-DNO_EMAC
2632
endif
2733

2834
ifeq ($(strip $(BOARD)),BOARD_GD32F303RC)
@@ -34,22 +40,20 @@ endif
3440
ifeq ($(strip $(BOARD)),BOARD_GD32F407RE)
3541
MCU=GD32F407RE
3642
DEFINES+=-DCONFIG_STORE_USE_SPI
37-
DEFINES+=-DCONFIG_HTTPD_OPTIMIZE_O2
3843
endif
3944

4045
ifeq ($(strip $(BOARD)),BOARD_GD32F450VI)
4146
MCU=GD32F450VI
42-
DEFINES+=-DCONFIG_HTTPD_OPTIMIZE_O2
4347
endif
4448

4549
ifeq ($(strip $(BOARD)),BOARD_16X4U_PIXEL)
4650
MCU=GD32F450VI
47-
DEFINES+=-DCONFIG_HTTPD_OPTIMIZE_O2
51+
DEFINES+=-DCONFIG_STORE_USE_SPI
4852
endif
4953

5054
ifeq ($(strip $(BOARD)),BOARD_GD32F470VG)
5155
MCU=GD32F470VG
52-
DEFINES+=-DCONFIG_HTTPD_OPTIMIZE_O2
56+
DEFINES+=-DCONFIG_STORE_USE_SPI
5357
endif
5458

5559
ifeq ($(strip $(BOARD)),BOARD_GD32F207C_EVAL)
@@ -70,19 +74,16 @@ endif
7074
ifeq ($(strip $(BOARD)),BOARD_BW_OPIDMX4)
7175
BOARD_DMX=4
7276
DEFINES+=-DCONFIG_STORE_USE_SPI
73-
DEFINES+=-DCONFIG_HTTPD_OPTIMIZE_O2
7477
endif
7578

7679
ifeq ($(strip $(BOARD)),BOARD_DMX3)
7780
BOARD_DMX=3
7881
DEFINES+=-DCONFIG_STORE_USE_SPI
79-
DEFINES+=-DCONFIG_HTTPD_OPTIMIZE_O2
8082
endif
8183

8284
ifeq ($(strip $(BOARD)),BOARD_DMX4)
83-
BOARD_DMX=4
8485
DEFINES+=-DCONFIG_STORE_USE_SPI
85-
DEFINES+=-DCONFIG_HTTPD_OPTIMIZE_O2
86+
BOARD_DMX=4
8687
endif
8788

8889
ifdef BOARD_DMX

‎gd32_emac_artnet_dmx_multi/Common.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ DEFINES+=RTL8201F_LED1_LINK_ALL
1515

1616
DEFINES+=DISPLAY_UDF
1717

18-
DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
18+
DEFINES+=ENABLE_HTTPD
1919

2020
DEFINES+=DISABLE_RTC
2121
DEFINES+=DISABLE_FS

‎gd32_emac_artnet_pixel_multi/Makefile-softuart0.GD32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DEFINES+=RTL8201F_LED1_LINK_ALL
1616

1717
DEFINES+=DISPLAY_UDF
1818

19-
DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
19+
DEFINES+=ENABLE_HTTPD
2020

2121
DEFINES+=CONFIG_STORE_USE_SPI
2222
DEFINES+=CONFIG_MDNS_DOMAIN_REVERSE

‎gd32_emac_artnet_pixel_multi/Makefile.GD32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DEFINES+=RTL8201F_LED1_LINK_ALL
1616

1717
DEFINES+=DISPLAY_UDF
1818

19-
DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
19+
DEFINES+=ENABLE_HTTPD
2020

2121
DEFINES+=CONFIG_STORE_USE_SPI
2222
DEFINES+=CONFIG_MDNS_DOMAIN_REVERSE

‎gd32_emac_ddp_pixel_multi/Makefile.GD32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DEFINES+=OUTPUT_DMX_PIXEL_MULTI PIXELPATTERNS_MULTI
1111

1212
DEFINES+=ENET_RXBUF_NUM=34 ENET_TXBUF_NUM=2
1313

14-
DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
14+
DEFINES+=ENABLE_HTTPD
1515

1616
DEFINES+=DISPLAY_UDF
1717

‎gd32_emac_e131_dmx_multi/Common.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DEFINES+=RTL8201F_LED1_LINK_ALL
66

77
DEFINES+=DISPLAY_UDF
88

9-
DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
9+
DEFINES+=ENABLE_HTTPD
1010

1111
DEFINES+=DISABLE_RTC
1212
DEFINES+=DISABLE_FS

‎gd32_emac_e131_dmx_multi/Makefile.GD32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DEFINES+=RTL8201F_LED1_LINK_ALL
1313

1414
DEFINES+=DISPLAY_UDF
1515

16-
DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
16+
DEFINES+=ENABLE_HTTPD
1717

1818
DEFINES+=DISABLE_RTC
1919
DEFINES+=DISABLE_FS

‎gd32_emac_e131_pixel_multi/Makefile.GD32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DEFINES+=RTL8201F_LED1_LINK_ALL
1616

1717
DEFINES+=DISPLAY_UDF
1818

19-
DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
19+
DEFINES+=ENABLE_HTTPD
2020

2121
DEFINES+=CONFIG_STORE_USE_SPI
2222
DEFINES+=CONFIG_MDNS_DOMAIN_REVERSE

‎gd32_emac_llrp/Makefile.GD32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DEFINES+=OUTPUT_DMX_NULL
44
DEFINES+=DISPLAY_UDF
55
DEFINES+=ENABLE_SSD1311
66

7-
DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
7+
DEFINES+=ENABLE_HTTPD
88

99
DEFINES+=ENABLE_NTP_CLIENT
1010

‎gd32_emac_pp_pixel_multi/Makefile.GD32‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ DEFINES+=RTL8201F_LED1_LINK_ALL
1515

1616
DEFINES+=DISPLAY_UDF
1717

18-
DEFINES+=ENABLE_HTTPD ENABLE_CONTENT
18+
DEFINES+=ENABLE_HTTPD
1919

2020
DEFINES+=CONFIG_STORE_USE_SPI
2121
DEFINES+=CONFIG_MDNS_DOMAIN_REVERSE

0 commit comments

Comments
 (0)