diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2022-12-19 11:54:19 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2022-12-30 21:28:32 -0500 |
| commit | 4ca1e5f670616491cf27de833a90290d0aaf6fb0 (patch) | |
| tree | edec509c116ea323da4fd4a53f3e6dc39b0415e3 /src | |
| parent | 4753315601b4203c500c979f87b2e55be2aedaa5 (diff) | |
| download | kutter-4ca1e5f670616491cf27de833a90290d0aaf6fb0.tar.gz kutter-4ca1e5f670616491cf27de833a90290d0aaf6fb0.tar.xz kutter-4ca1e5f670616491cf27de833a90290d0aaf6fb0.zip | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Kconfig | 4 | ||||
| -rw-r--r-- | src/generic/serial_irq.c | 2 | ||||
| -rw-r--r-- | src/lpc176x/Kconfig | 2 | ||||
| -rw-r--r-- | src/stm32/Kconfig | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/Kconfig b/src/Kconfig index 2309fe9e..53b6d166 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -43,8 +43,6 @@ source "src/simulator/Kconfig" # Generic configuration options for serial ports config SERIAL bool -config SERIAL_BOOTLOADER_SIDECHANNEL - bool config SERIAL_BAUD depends on SERIAL int "Baud rate for serial port" if LOW_LEVEL_OPTIONS @@ -126,6 +124,8 @@ config HAVE_CHIPID bool config HAVE_STEPPER_BOTH_EDGE bool +config HAVE_BOOTLOADER_REQUEST + bool config INLINE_STEPPER_HACK # Enables gcc to inline stepper_event() into the main timer irq handler diff --git a/src/generic/serial_irq.c b/src/generic/serial_irq.c index 434a98bb..98910735 100644 --- a/src/generic/serial_irq.c +++ b/src/generic/serial_irq.c @@ -79,7 +79,7 @@ console_task(void) if (ret > 0) command_dispatch(receive_buf, pop_count); 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)) bootloader_request(); console_pop_input(pop_count); diff --git a/src/lpc176x/Kconfig b/src/lpc176x/Kconfig index 02da06da..79c3b300 100644 --- a/src/lpc176x/Kconfig +++ b/src/lpc176x/Kconfig @@ -14,7 +14,7 @@ config LPC_SELECT select HAVE_CHIPID select HAVE_GPIO_HARD_PWM select HAVE_STEPPER_BOTH_EDGE - select SERIAL_BOOTLOADER_SIDECHANNEL + select HAVE_BOOTLOADER_REQUEST config BOARD_DIRECTORY string diff --git a/src/stm32/Kconfig b/src/stm32/Kconfig index dac884a0..a3a9da02 100644 --- a/src/stm32/Kconfig +++ b/src/stm32/Kconfig @@ -14,7 +14,7 @@ config STM32_SELECT select HAVE_STRICT_TIMING select HAVE_CHIPID select HAVE_STEPPER_BOTH_EDGE - select SERIAL_BOOTLOADER_SIDECHANNEL + select HAVE_BOOTLOADER_REQUEST config BOARD_DIRECTORY string |