diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/README | 2 | ||||
| -rwxr-xr-x | lib/canboot/flash_can.py | 24 | ||||
| -rw-r--r-- | lib/hidflash/README | 6 | ||||
| -rw-r--r-- | lib/hidflash/changes.diff | 4 | ||||
| -rw-r--r-- | lib/hidflash/main.c | 4 | ||||
| -rw-r--r-- | lib/rp2040_flash/main.c | 2 |
6 files changed, 21 insertions, 21 deletions
@@ -134,7 +134,7 @@ version 1.9 (b176eeef918fc810045c832348590595120187b4). The hidflash directory contains code from: https://github.com/Serasidis/STM32_HID_Bootloader version 2.2.2 (2ab7927a27b7b78ef730782ea5f9b5d2c8f34671). It has been -modified to work with Klipper - see hidflash/README for the +modified to work with Kutter - see hidflash/README for the details. See changes.diff for the modifications. The pru_rpmsg directory contains code from: diff --git a/lib/canboot/flash_can.py b/lib/canboot/flash_can.py index b7877097..24440744 100755 --- a/lib/canboot/flash_can.py +++ b/lib/canboot/flash_can.py @@ -25,7 +25,7 @@ def output(msg: str) -> None: sys.stdout.write(msg) sys.stdout.flush() -# Standard crc16 ccitt, take from msgproto.py in Klipper +# Standard crc16 ccitt, take from msgproto.py in Kutter def crc16_ccitt(buf: Union[bytes, bytearray]) -> int: crc = 0xffff for data in buf: @@ -53,10 +53,10 @@ BOOTLOADER_CMDS = { ACK_SUCCESS = 0xa0 NACK = 0xf1 -# Klipper Admin Defs (for jumping to bootloader) -KLIPPER_ADMIN_ID = 0x3f0 -KLIPPER_SET_NODE_CMD = 0x01 -KLIPPER_REBOOT_CMD = 0x02 +# Kutter Admin Defs (for jumping to bootloader) +KUTTER_ADMIN_ID = 0x3f0 +KUTTER_SET_NODE_CMD = 0x01 +KUTTER_REBOOT_CMD = 0x02 # CAN Admin Defs CANBUS_ID_ADMIN = 0x3f0 @@ -386,12 +386,12 @@ class CanSocket: self.output_busy = False def _jump_to_bootloader(self, uuid: int): - # TODO: Send Klipper Admin command to jump to bootloader. + # TODO: Send Kutter Admin command to jump to bootloader. # It will need to be implemented output_line("Sending bootloader jump command...") plist = [(uuid >> ((5 - i) * 8)) & 0xFF for i in range(6)] - plist.insert(0, KLIPPER_REBOOT_CMD) - self.send(KLIPPER_ADMIN_ID, bytes(plist)) + plist.insert(0, KUTTER_REBOOT_CMD) + self.send(KUTTER_ADMIN_ID, bytes(plist)) async def _query_uuids(self) -> List[int]: output_line("Checking for canboot nodes...") @@ -411,7 +411,7 @@ class CanSocket: if resp[0] != CANBUS_RESP_NEED_NODEID: continue app_names = { - KLIPPER_SET_NODE_CMD: "Klipper", + KUTTER_SET_NODE_CMD: "Kutter", CANBUS_CMD_SET_NODEID: "CanBoot" } app = app_names.get(resp[7], "Unknown") @@ -565,9 +565,9 @@ def main(): help="Can Interface" ) parser.add_argument( - "-f", "--firmware", metavar="<klipper.bin>", - default="~/klipper/out/klipper.bin", - help="Path to Klipper firmware file") + "-f", "--firmware", metavar="<kutter.bin>", + default="~/kutter/out/kutter.bin", + help="Path to Kutter firmware file") parser.add_argument( "-u", "--uuid", metavar="<uuid>", default=None, help="Can device uuid" diff --git a/lib/hidflash/README b/lib/hidflash/README index 86ea39ce..99d7c8d7 100644 --- a/lib/hidflash/README +++ b/lib/hidflash/README @@ -12,9 +12,9 @@ This derivative contains the following changes: attempt to open a serial port and enter the bootloader, it will assume that the device has already entered the bootloader and look for a USB device with the appropriate Vendor and Product IDs. This change allows - Klipper's "flash_usb.py" script to enter the bootloader and wait for the + Kutter's "flash_usb.py" script to enter the bootloader and wait for the mcu to reconnect. -2) When the serial port is specified, hid-flash will use Klipper's procedure +2) When the serial port is specified, hid-flash will use Kutter's procedure for entering the bootloader (Open the port at 1200 baud and toggle DTR). 3) The hid-flash program now accepts a command from the bootloader that allows a STM32F103 device to identify itself as a "high-density" device during @@ -27,7 +27,7 @@ This derivative contains the following changes: to test for equality. 5) The Makefile was changed to check for the libusb-1.0 dependency. If it does not exist the user will be warned and the build aborted, however - no error will be generated. This allows Klipper's "make FLASH" + no error will be generated. This allows Kutter's "make FLASH" functionality to work when flashing via DFU without installing the libusb-1.0 dependency for hid-flash. diff --git a/lib/hidflash/changes.diff b/lib/hidflash/changes.diff index 029fce6f..6bfea21a 100644 --- a/lib/hidflash/changes.diff +++ b/lib/hidflash/changes.diff @@ -55,9 +55,9 @@ index a6a8f7f..84abc33 100644 * +* Modified 4/24/2020 +* by Eric Callahan <arksine.code@gmail.com> -+* This version of hid-flash has been modified to work with Klipper. ++* This version of hid-flash has been modified to work with Kutter. +* The serial port argument is now optional. If entered and found this program -+* will attempt to force Klipper jump to the bootloader by connecting at ++* will attempt to force Kutter jump to the bootloader by connecting at +* 1200 baud and enabling DTR. */ diff --git a/lib/hidflash/main.c b/lib/hidflash/main.c index 84abc335..bb4004aa 100644 --- a/lib/hidflash/main.c +++ b/lib/hidflash/main.c @@ -21,9 +21,9 @@ * * Modified 4/24/2020 * by Eric Callahan <arksine.code@gmail.com> -* This version of hid-flash has been modified to work with Klipper. +* This version of hid-flash has been modified to work with Kutter. * The serial port argument is now optional. If entered and found this program -* will attempt to force Klipper jump to the bootloader by connecting at +* will attempt to force Kutter jump to the bootloader by connecting at * 1200 baud and enabling DTR. */ diff --git a/lib/rp2040_flash/main.c b/lib/rp2040_flash/main.c index 017fe945..3b3063bc 100644 --- a/lib/rp2040_flash/main.c +++ b/lib/rp2040_flash/main.c @@ -1,4 +1,4 @@ -// Simple rp2040 picoboot based flash tool for use with Klipper +// Simple rp2040 picoboot based flash tool for use with Kutter // // Copyright (C) 2022 Lasse Dalegaard <dalegaard@gmail.com> // |