3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial_irq: Rename SERIAL_BOOTLOADER_SIDECHANNEL to HAVE_BOOTLOADER_REQUEST 

Rename the build symbol.  This is in preparation for enabling
HAVE_BOOTLOADER_REQUEST on usb and canbus.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2022-12-19 11:54:19 -05:00
parent 4753315601
commit 4ca1e5f670
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kconfig
View File

@ -43,8 +43,6 @@ source "src/simulator/Kconfig"
# Generic configuration options for serial ports # Generic configuration options for serial ports
config SERIAL config SERIAL
bool bool
config SERIAL_BOOTLOADER_SIDECHANNEL
bool
config SERIAL_BAUD config SERIAL_BAUD
depends on SERIAL depends on SERIAL
int "Baud rate for serial port" if LOW_LEVEL_OPTIONS int "Baud rate for serial port" if LOW_LEVEL_OPTIONS
@ -126,6 +124,8 @@ config HAVE_CHIPID
bool bool
config HAVE_STEPPER_BOTH_EDGE config HAVE_STEPPER_BOTH_EDGE
bool bool
config HAVE_BOOTLOADER_REQUEST
bool
config INLINE_STEPPER_HACK config INLINE_STEPPER_HACK
# Enables gcc to inline stepper_event() into the main timer irq handler # Enables gcc to inline stepper_event() into the main timer irq handler

2
src/generic/serial_irq.c
View File

@ -79,7 +79,7 @@ console_task(void)
if (ret > 0) if (ret > 0)
command_dispatch(receive_buf, pop_count); command_dispatch(receive_buf, pop_count);
if (ret) { if (ret) {
if (CONFIG_SERIAL_BOOTLOADER_SIDECHANNEL && ret < 0 && pop_count == 32 if (CONFIG_HAVE_BOOTLOADER_REQUEST && ret < 0 && pop_count == 32
&& !memcmp(receive_buf, " \x1c Request Serial Bootloader!! ~", 32)) && !memcmp(receive_buf, " \x1c Request Serial Bootloader!! ~", 32))
bootloader_request(); bootloader_request();
console_pop_input(pop_count); console_pop_input(pop_count);

2
src/lpc176x/Kconfig
View File

@ -14,7 +14,7 @@ config LPC_SELECT
select HAVE_CHIPID select HAVE_CHIPID
select HAVE_GPIO_HARD_PWM select HAVE_GPIO_HARD_PWM
select HAVE_STEPPER_BOTH_EDGE select HAVE_STEPPER_BOTH_EDGE
select SERIAL_BOOTLOADER_SIDECHANNEL select HAVE_BOOTLOADER_REQUEST
config BOARD_DIRECTORY config BOARD_DIRECTORY
string string

2
src/stm32/Kconfig
View File

@ -14,7 +14,7 @@ config STM32_SELECT
select HAVE_STRICT_TIMING select HAVE_STRICT_TIMING
select HAVE_CHIPID select HAVE_CHIPID
select HAVE_STEPPER_BOTH_EDGE select HAVE_STEPPER_BOTH_EDGE
select SERIAL_BOOTLOADER_SIDECHANNEL select HAVE_BOOTLOADER_REQUEST
config BOARD_DIRECTORY config BOARD_DIRECTORY
string string