UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion/console] Default ion sources have console_stdio, not _display

Browse Source
This commit is contained in:
Léa Saviot
2020-01-07 11:48:08 +01:00
committed by EmilieNumworks
parent f68ec6a28d
commit f1f4e43159
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/targets.mak
View File

@@ -13,7 +13,7 @@ $(BUILD_DIR)/epsilon.onboarding.beta.$(EXE): $(call object_for,$(epsilon_onboard
test_base_src = $(base_src) $(apps_tests_src) $(runner_src) $(tests_src)
test_runner_src = $(test_base_src) $(ion_default_src)
test_runner_src = $(test_base_src) $(ion_console_on_screen_src)
$(BUILD_DIR)/test.$(EXE): $(call object_for,$(test_runner_src))
# Define handy targets

3
ion/Makefile
View File

@@ -56,6 +56,7 @@ ion_all_src += $(ion_simulator_sdl_src) $(ion_simulator_headless_src)
ion_all_src += $(ion_device_dfu_relocated_src) $(ion_device_dfu_xip_src)
ion_all_src += $(ion_console_display_src) $(ion_console_stdio_src) $(ion_console_uart_src)
ion_default_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_relocated_src) $(ion_console_display_src)
ion_default_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_relocated_src) $(ion_console_stdio_src)
ion_console_on_screen_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_relocated_src) $(ion_console_display_src)
ion_xip_src = $(ion_src) $(ion_simulator_sdl_src) $(ion_device_dfu_xip_src) $(ion_console_uart_src)
ion_headless_src = $(ion_src) $(ion_simulator_headless_src) $(ion_device_dfu_relocated_src) $(ion_console_stdio_src)

1
ion/src/device/shared/drivers/Makefile
View File

@@ -23,4 +23,5 @@ ion_device_src += $(addprefix ion/src/device/shared/drivers/, \
)
ion_console_uart_src = ion/src/device/shared/drivers/console.cpp
ion_console_stdio_src += ion/src/device/shared/drivers/console_dummy.cpp
ion_console_display_src += ion/src/device/shared/drivers/console_dummy.cpp