diff options
author | Tomasz Kramkowski <tomasz@kramkow.ski> | 2025-08-15 21:13:44 +0100 |
---|---|---|
committer | Tomasz Kramkowski <tomasz@kramkow.ski> | 2025-08-15 21:46:37 +0100 |
commit | ae9102482560b557628c83a247ab35063ade0bf7 (patch) | |
tree | 2f08afac5a943aac31186e2c5c0c7d60e6d8837a /src | |
parent | 121edea90cde8295f720ed9d2f2fccca61f66bb4 (diff) | |
download | kutter-ae9102482560b557628c83a247ab35063ade0bf7.tar.gz kutter-ae9102482560b557628c83a247ab35063ade0bf7.tar.xz kutter-ae9102482560b557628c83a247ab35063ade0bf7.zip |
Rename everything significant to Kutter except for docs
Diffstat (limited to 'src')
-rw-r--r-- | src/Kconfig | 2 | ||||
-rw-r--r-- | src/ar100/Makefile | 14 | ||||
-rw-r--r-- | src/ar100/ar100.ld | 2 | ||||
-rw-r--r-- | src/atsam/Makefile | 12 | ||||
-rw-r--r-- | src/atsamd/Makefile | 16 | ||||
-rw-r--r-- | src/avr/Makefile | 8 | ||||
-rw-r--r-- | src/generic/canserial.c | 10 | ||||
-rw-r--r-- | src/generic/usb_canbus.c | 2 | ||||
-rw-r--r-- | src/generic/usb_cdc.c | 2 | ||||
-rw-r--r-- | src/hc32f460/Makefile | 10 | ||||
-rw-r--r-- | src/hc32f460/serial.c | 2 | ||||
-rw-r--r-- | src/linux/Makefile | 4 | ||||
-rw-r--r-- | src/linux/gpio.c | 2 | ||||
-rw-r--r-- | src/linux/main.c | 2 | ||||
-rw-r--r-- | src/lpc176x/Makefile | 14 | ||||
-rw-r--r-- | src/pru/Makefile | 8 | ||||
-rw-r--r-- | src/pru/pru.lds | 2 | ||||
-rw-r--r-- | src/rp2040/Makefile | 18 | ||||
-rw-r--r-- | src/stm32/Makefile | 16 | ||||
-rw-r--r-- | src/stm32/hard_pwm.c | 2 |
20 files changed, 74 insertions, 74 deletions
diff --git a/src/Kconfig b/src/Kconfig index 6740946d..d8aa0188 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -1,6 +1,6 @@ # Main Kconfig settings -mainmenu "Klipper Firmware Configuration" +mainmenu "Kutter Firmware Configuration" config LOW_LEVEL_OPTIONS bool "Enable extra low-level configuration options" diff --git a/src/ar100/Makefile b/src/ar100/Makefile index 275944d4..a5f6493a 100644 --- a/src/ar100/Makefile +++ b/src/ar100/Makefile @@ -7,9 +7,9 @@ CFLAGS += -fno-pie CFLAGS += -ffreestanding CFLAGS += -msfimm -mshftimm -msoft-div -msoft-mul CFLAGS += -Ilib/ar100 -CFLAGS_klipper.elf := $(CFLAGS) -T src/ar100/ar100.ld -CFLAGS_klipper.elf += -Wl,--gc-sections -static -CFLAGS_klipper.elf += -Wl,--no-dynamic-linker +CFLAGS_kutter.elf := $(CFLAGS) -T src/ar100/ar100.ld +CFLAGS_kutter.elf += -Wl,--gc-sections -static +CFLAGS_kutter.elf += -Wl,--no-dynamic-linker SFLAGS = -nostdinc -MMD SFLAGS += -Ilib/ar100 @@ -19,8 +19,8 @@ src-y += ar100/main.c ar100/gpio.c ar100/serial.c src-y += ar100/util.c ar100/timer.c src-y += generic/crc16_ccitt.c generic/timer_irq.c -OBJS_klipper.elf += $(OUT)lib/ar100/start.o -OBJS_klipper.elf += $(OUT)lib/ar100/runtime.o +OBJS_kutter.elf += $(OUT)lib/ar100/start.o +OBJS_kutter.elf += $(OUT)lib/ar100/runtime.o # Build the AR100 binary target-y += $(OUT)ar100.bin @@ -33,7 +33,7 @@ $(OUT)lib/ar100/runtime.o: @echo " Compiling $@" $(Q)$(CC) $(SFLAGS) -c $(PWD)/lib/ar100/runtime.S -o $@ -$(OUT)ar100.bin: $(OUT)klipper.elf +$(OUT)ar100.bin: $(OUT)kutter.elf @echo " Object copy $@" - $(OBJCOPY) -O binary -S --reverse-bytes 4 $(OUT)klipper.elf $@ + $(OBJCOPY) -O binary -S --reverse-bytes 4 $(OUT)kutter.elf $@ truncate -s %8 $@ diff --git a/src/ar100/ar100.ld b/src/ar100/ar100.ld index 903620b5..2cc47cf8 100644 --- a/src/ar100/ar100.ld +++ b/src/ar100/ar100.ld @@ -45,7 +45,7 @@ SECTIONS __stack_end = .; } >SRAM_A2 - ASSERT(. <= (SRAM_A2_SIZE), "Klipper image is too large") + ASSERT(. <= (SRAM_A2_SIZE), "Kutter image is too large") /DISCARD/ : { *(.comment*) diff --git a/src/atsam/Makefile b/src/atsam/Makefile index 15bef326..63b79ba8 100644 --- a/src/atsam/Makefile +++ b/src/atsam/Makefile @@ -22,8 +22,8 @@ CFLAGS += $(CFLAGS-y) -D__$(MCU)__ -mthumb -Ilib/cmsis-core -Ilib/fast-hash samlink-y := $(OUT)src/generic/armcm_link.ld samlink-$(CONFIG_MACH_SAME70) := $(OUT)src/atsam/same70_link.ld -CFLAGS_klipper.elf += -nostdlib -lgcc -lc_nano -T $(samlink-y) -$(OUT)klipper.elf: $(samlink-y) +CFLAGS_kutter.elf += -nostdlib -lgcc -lc_nano -T $(samlink-y) +$(OUT)kutter.elf: $(samlink-y) # Add source files src-y += atsam/main.c atsam/gpio.c atsam/i2c.c atsam/spi.c @@ -48,9 +48,9 @@ src-$(CONFIG_MACH_SAM4E) += ../lib/sam4e/gcc/system_sam4e.c src-$(CONFIG_MACH_SAME70) += atsam/same70_sysinit.c atsam/sam4e_afec.c # Build the additional bin output file -target-y += $(OUT)klipper.bin +target-y += $(OUT)kutter.bin -$(OUT)klipper.bin: $(OUT)klipper.elf +$(OUT)kutter.bin: $(OUT)kutter.elf @echo " Creating bin file $@" $(Q)$(OBJCOPY) -O binary $< $@ @@ -59,6 +59,6 @@ lib/bossac/bin/bossac: @echo " Building bossac" $(Q)make -C lib/bossac bin/bossac -flash: $(OUT)klipper.bin lib/bossac/bin/bossac +flash: $(OUT)kutter.bin lib/bossac/bin/bossac @echo " Flashing $< to $(FLASH_DEVICE)" - $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" $(OUT)klipper.bin + $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" $(OUT)kutter.bin diff --git a/src/atsamd/Makefile b/src/atsamd/Makefile index c79c0a93..0d5e0241 100644 --- a/src/atsamd/Makefile +++ b/src/atsamd/Makefile @@ -15,9 +15,9 @@ CFLAGS-$(CONFIG_MACH_SAME51) += -Ilib/same51/include CFLAGS-$(CONFIG_MACH_SAMX5) += -mcpu=cortex-m4 -Ilib/same54/include CFLAGS += $(CFLAGS-y) -D__$(MCU)__ -mthumb -Ilib/cmsis-core -Ilib/fast-hash -CFLAGS_klipper.elf += -nostdlib -lgcc -lc_nano -CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_link.ld -$(OUT)klipper.elf: $(OUT)src/generic/armcm_link.ld +CFLAGS_kutter.elf += -nostdlib -lgcc -lc_nano +CFLAGS_kutter.elf += -T $(OUT)src/generic/armcm_link.ld +$(OUT)kutter.elf: $(OUT)src/generic/armcm_link.ld # Add source files src-y += atsamd/main.c atsamd/gpio.c generic/crc16_ccitt.c @@ -41,13 +41,13 @@ src-$(CONFIG_MACH_SAMX5) += atsamd/samd51_watchdog.c src-$(CONFIG_MACH_SAMX5) += atsamd/samd51_clock.c generic/armcm_timer.c # Build the additional hex and bin output files -target-y += $(OUT)klipper.bin $(OUT)klipper.elf.hex +target-y += $(OUT)kutter.bin $(OUT)kutter.elf.hex -$(OUT)klipper.bin: $(OUT)klipper.elf +$(OUT)kutter.bin: $(OUT)kutter.elf @echo " Creating bin file $@" $(Q)$(OBJCOPY) -O binary $< $@ -$(OUT)klipper.elf.hex: $(OUT)klipper.elf +$(OUT)kutter.elf.hex: $(OUT)kutter.elf @echo " Creating hex file $@" $(Q)$(OBJCOPY) -j .text -j .relocate -O ihex $< $@ @@ -59,6 +59,6 @@ lib/bossac/bin/bossac: BOSSAC_OFFSET-$(CONFIG_MACH_SAMD21) := 0x2000 BOSSAC_OFFSET-$(CONFIG_MACH_SAMX5) := 0x4000 -flash: $(OUT)klipper.bin lib/bossac/bin/bossac +flash: $(OUT)kutter.bin lib/bossac/bin/bossac @echo " Flashing $< to $(FLASH_DEVICE)" - $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" -s "$(BOSSAC_OFFSET-y)" $(OUT)klipper.bin + $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" -s "$(BOSSAC_OFFSET-y)" $(OUT)kutter.bin diff --git a/src/avr/Makefile b/src/avr/Makefile index f667de3b..7750bbbe 100644 --- a/src/avr/Makefile +++ b/src/avr/Makefile @@ -20,16 +20,16 @@ src-$(CONFIG_USBSERIAL) += avr/usbserial.c generic/usb_cdc.c src-$(CONFIG_SERIAL) += avr/serial.c generic/serial_irq.c # Suppress broken "misspelled signal handler" warnings on gcc 4.8.1 -CFLAGS_klipper.elf := $(CFLAGS_klipper.elf) $(if $(filter 4.8.1, $(shell $(CC) -dumpversion)), -w) +CFLAGS_kutter.elf := $(CFLAGS_kutter.elf) $(if $(filter 4.8.1, $(shell $(CC) -dumpversion)), -w) # Build the additional hex output file -target-y += $(OUT)klipper.elf.hex +target-y += $(OUT)kutter.elf.hex -$(OUT)klipper.elf.hex: $(OUT)klipper.elf +$(OUT)kutter.elf.hex: $(OUT)kutter.elf @echo " Creating hex file $@" $(Q)$(OBJCOPY) -j .text -j .data -O ihex $< $@ -flash: $(OUT)klipper.elf.hex +flash: $(OUT)kutter.elf.hex @echo " Flashing $< to $(FLASH_DEVICE) via avrdude" $(Q)if [ -z $(FLASH_DEVICE) ]; then echo "Please specify FLASH_DEVICE"; exit 1; fi $(Q)avrdude -p$(CONFIG_MCU) -c$(CONFIG_AVRDUDE_PROTOCOL) -P"$(FLASH_DEVICE)" -D -U"flash:w:$(<):i" diff --git a/src/generic/canserial.c b/src/generic/canserial.c index b90eb659..c552edcc 100644 --- a/src/generic/canserial.c +++ b/src/generic/canserial.c @@ -114,7 +114,7 @@ console_sendf(const struct command_encoder *ce, va_list args) // Available commands and responses #define CANBUS_CMD_QUERY_UNASSIGNED 0x00 -#define CANBUS_CMD_SET_KLIPPER_NODEID 0x01 +#define CANBUS_CMD_SET_KUTTER_NODEID 0x01 #define CANBUS_CMD_REQUEST_BOOTLOADER 0x02 #define CANBUS_RESP_NEED_NODEID 0x20 @@ -150,7 +150,7 @@ can_process_query_unassigned(struct canbus_msg *msg) send.dlc = 8; send.data[0] = CANBUS_RESP_NEED_NODEID; memcpy(&send.data[1], CanData.uuid, sizeof(CanData.uuid)); - send.data[7] = CANBUS_CMD_SET_KLIPPER_NODEID; + send.data[7] = CANBUS_CMD_SET_KUTTER_NODEID; // Send with retry for (;;) { int ret = canbus_send(&send); @@ -168,7 +168,7 @@ can_id_conflict(void) } static void -can_process_set_klipper_nodeid(struct canbus_msg *msg) +can_process_set_kutter_nodeid(struct canbus_msg *msg) { if (msg->dlc < 8) return; @@ -201,8 +201,8 @@ can_process_admin(struct canbus_msg *msg) case CANBUS_CMD_QUERY_UNASSIGNED: can_process_query_unassigned(msg); break; - case CANBUS_CMD_SET_KLIPPER_NODEID: - can_process_set_klipper_nodeid(msg); + case CANBUS_CMD_SET_KUTTER_NODEID: + can_process_set_kutter_nodeid(msg); break; case CANBUS_CMD_REQUEST_BOOTLOADER: can_process_request_bootloader(msg); diff --git a/src/generic/usb_canbus.c b/src/generic/usb_canbus.c index 3505717c..63d32175 100644 --- a/src/generic/usb_canbus.c +++ b/src/generic/usb_canbus.c @@ -402,7 +402,7 @@ usb_notify_bulk_in(void) #define CONCAT1(a, b) a ## b #define CONCAT(a, b) CONCAT1(a, b) -#define USB_STR_MANUFACTURER u"Klipper" +#define USB_STR_MANUFACTURER u"Kutter" #define USB_STR_PRODUCT CONCAT(u,CONFIG_MCU) #define USB_STR_SERIAL CONCAT(u,CONFIG_USB_SERIAL_NUMBER) diff --git a/src/generic/usb_cdc.c b/src/generic/usb_cdc.c index 961c6330..f98ffdf7 100644 --- a/src/generic/usb_cdc.c +++ b/src/generic/usb_cdc.c @@ -135,7 +135,7 @@ DECL_TASK(usb_bulk_out_task); #define CONCAT1(a, b) a ## b #define CONCAT(a, b) CONCAT1(a, b) -#define USB_STR_MANUFACTURER u"Klipper" +#define USB_STR_MANUFACTURER u"Kutter" #define USB_STR_PRODUCT CONCAT(u,CONFIG_MCU) #define USB_STR_SERIAL CONCAT(u,CONFIG_USB_SERIAL_NUMBER) diff --git a/src/hc32f460/Makefile b/src/hc32f460/Makefile index 2d2d5008..178e838b 100644 --- a/src/hc32f460/Makefile +++ b/src/hc32f460/Makefile @@ -7,9 +7,9 @@ dirs-y += src/hc32f460 src/generic lib/hc32f460/driver/src lib/hc32f460/mcu/comm CFLAGS += -mthumb -mcpu=cortex-m4 -Isrc/hc32f460 -Ilib/hc32f460/driver/inc -Ilib/hc32f460/mcu/common -Ilib/cmsis-core -DHC32F460 -CFLAGS_klipper.elf += -nostdlib -lgcc -lc_nano -CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_link.ld -$(OUT)klipper.elf: $(OUT)src/generic/armcm_link.ld +CFLAGS_kutter.elf += -nostdlib -lgcc -lc_nano +CFLAGS_kutter.elf += -T $(OUT)src/generic/armcm_link.ld +$(OUT)kutter.elf: $(OUT)src/generic/armcm_link.ld # Add source files src-y += hc32f460/main.c @@ -30,8 +30,8 @@ src-y += generic/armcm_reset.c generic/crc16_ccitt.c # Build the additional bin output file -target-y += $(OUT)klipper.bin +target-y += $(OUT)kutter.bin -$(OUT)klipper.bin: $(OUT)klipper.elf +$(OUT)kutter.bin: $(OUT)kutter.elf @echo " Creating bin file $@" $(Q)$(OBJCOPY) -O binary $< $@ diff --git a/src/hc32f460/serial.c b/src/hc32f460/serial.c index 7cf4b6dd..4e780903 100644 --- a/src/hc32f460/serial.c +++ b/src/hc32f460/serial.c @@ -130,7 +130,7 @@ serialRx(void) { uint16_t data = USART_RecData(USARTx); - // call to klipper generic/serial_irq function + // call to kutter generic/serial_irq function serial_rx_byte(data); } DECL_ARMCM_IRQ(serialRx, Int000_IRQn); diff --git a/src/linux/Makefile b/src/linux/Makefile index 7c1de7c1..87dda7c5 100644 --- a/src/linux/Makefile +++ b/src/linux/Makefile @@ -7,8 +7,8 @@ src-y += linux/pca9685.c linux/spidev.c linux/analog.c linux/hard_pwm.c src-y += linux/i2c.c linux/gpio.c generic/crc16_ccitt.c generic/alloc.c src-y += linux/sensor_ds18b20.c -CFLAGS_klipper.elf += -lutil -lrt -lpthread +CFLAGS_kutter.elf += -lutil -lrt -lpthread -flash: $(OUT)klipper.elf +flash: $(OUT)kutter.elf @echo " Flashing" $(Q)sudo ./scripts/flash-linux.sh $(OUT) diff --git a/src/linux/gpio.c b/src/linux/gpio.c index c7f4c5bf..e937f147 100644 --- a/src/linux/gpio.c +++ b/src/linux/gpio.c @@ -16,7 +16,7 @@ #include "internal.h" // report_errno #include "sched.h" // sched_shutdown -#define GPIO_CONSUMER "klipper" +#define GPIO_CONSUMER "kutter" DECL_ENUMERATION_RANGE("pin", "gpio0", GPIO(0, 0), MAX_GPIO_LINES); DECL_ENUMERATION_RANGE("pin", "gpiochip0/gpio0", GPIO(0, 0), MAX_GPIO_LINES); diff --git a/src/linux/main.c b/src/linux/main.c index b260f162..2675eb70 100644 --- a/src/linux/main.c +++ b/src/linux/main.c @@ -69,7 +69,7 @@ main(int argc, char **argv) // Parse program args orig_argv = argv; int opt, watchdog = 0, realtime = 0; - char *serial = "/tmp/klipper_host_mcu"; + char *serial = "/tmp/kutter_host_mcu"; while ((opt = getopt(argc, argv, "wrI:")) != -1) { switch (opt) { case 'w': diff --git a/src/lpc176x/Makefile b/src/lpc176x/Makefile index 0e2b41cf..0bbfc8d9 100644 --- a/src/lpc176x/Makefile +++ b/src/lpc176x/Makefile @@ -7,9 +7,9 @@ dirs-y += src/lpc176x src/generic lib/lpc176x/device CFLAGS += -mthumb -mcpu=cortex-m3 -Ilib/lpc176x/device -Ilib/cmsis-core -CFLAGS_klipper.elf += -nostdlib -lgcc -lc_nano -CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_link.ld -$(OUT)klipper.elf: $(OUT)src/generic/armcm_link.ld +CFLAGS_kutter.elf += -nostdlib -lgcc -lc_nano +CFLAGS_kutter.elf += -T $(OUT)src/generic/armcm_link.ld +$(OUT)kutter.elf: $(OUT)src/generic/armcm_link.ld # Add source files src-y += lpc176x/main.c lpc176x/gpio.c @@ -25,13 +25,13 @@ src-$(CONFIG_SERIAL) += lpc176x/serial.c generic/serial_irq.c src-$(CONFIG_WANT_HARD_PWM) += lpc176x/hard_pwm.c # Build the additional bin output file -target-y += $(OUT)klipper.bin +target-y += $(OUT)kutter.bin -$(OUT)klipper.bin: $(OUT)klipper.elf +$(OUT)kutter.bin: $(OUT)kutter.elf @echo " Creating bin file $@" $(Q)$(OBJCOPY) -O binary $< $@ # Flash rules -flash: $(OUT)klipper.bin +flash: $(OUT)kutter.bin @echo " Flashing $< to $(FLASH_DEVICE)" - $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" $(if $(NOSUDO),--no-sudo) $(OUT)klipper.bin + $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" $(if $(NOSUDO),--no-sudo) $(OUT)kutter.bin diff --git a/src/pru/Makefile b/src/pru/Makefile index cd4a5b78..c64c0003 100644 --- a/src/pru/Makefile +++ b/src/pru/Makefile @@ -9,8 +9,8 @@ dirs-y += lib/pru_rpmsg CFLAGS += -Os -minrt -mmcu=am335x.pru1 CFLAGS += -Ilib/pru_rpmsg/include -Ilib/pru_rpmsg/include/am335x -CFLAGS_klipper.elf := $(filter-out -mmcu=%, $(CFLAGS)) -CFLAGS_klipper.elf += -Wl,-r -nostdlib -Wl,-T,src/pru/pru.lds +CFLAGS_kutter.elf := $(filter-out -mmcu=%, $(CFLAGS)) +CFLAGS_kutter.elf += -Wl,-r -nostdlib -Wl,-T,src/pru/pru.lds CFLAGS_pru0.elf := $(filter-out -mmcu=%, $(CFLAGS)) -mmcu=am335x.pru0 CFLAGS_pru1.elf := $(CFLAGS) @@ -26,14 +26,14 @@ target-y += $(OUT)pru0.elf $(OUT)pru1.elf $(OUT)pru0.elf: $(patsubst %.c, $(OUT)src/%.o,$(pru0-y)) @echo " Linking $@" - $(Q)$(CC) $(CFLAGS_klipper.elf) $^ -o $(OUT)pru0.o + $(Q)$(CC) $(CFLAGS_kutter.elf) $^ -o $(OUT)pru0.o # dumping info about INTC $(Q)$(OBJCOPY) --dump-section '.pru_irq_map'=$(OUT)pru0.pru_irq_map.bin $(OUT)src/pru/pru0.o $(OUT)pru0.o.discard $(Q)$(CC) $(CFLAGS_pru0.elf) $(OUT)pru0.o -o $@ # in previous step linker did loose info about INTC during optimization, restoring it here (P.S. pru.lds is not helping) $(Q)$(OBJCOPY) --add-section '.pru_irq_map'=$(OUT)pru0.pru_irq_map.bin $@ -$(OUT)pru1.elf: $(OUT)klipper.elf +$(OUT)pru1.elf: $(OUT)kutter.elf @echo " Linking $@" $(Q)$(CC) $(CFLAGS_pru1.elf) $< -o $@ diff --git a/src/pru/pru.lds b/src/pru/pru.lds index 48f71d6d..82cb97a9 100644 --- a/src/pru/pru.lds +++ b/src/pru/pru.lds @@ -1,4 +1,4 @@ -/* Final linker script klipper.elf on the PRU */ +/* Final linker script kutter.elf on the PRU */ SECTIONS { /* binutils on the PRU doesn't support --gc-sections so manually diff --git a/src/rp2040/Makefile b/src/rp2040/Makefile index 359d99c1..f34bf51e 100644 --- a/src/rp2040/Makefile +++ b/src/rp2040/Makefile @@ -47,26 +47,26 @@ $(OUT)lib/elf2uf2/elf2uf2: lib/elf2uf2/main.cpp @echo " Building $@" $(Q)g++ -g -O -Ilib/pico-sdk $< -o $@ -$(OUT)klipper.uf2: $(OUT)klipper.elf $(OUT)lib/elf2uf2/elf2uf2 +$(OUT)kutter.uf2: $(OUT)kutter.elf $(OUT)lib/elf2uf2/elf2uf2 @echo " Creating uf2 file $@" $(Q)$(OUT)lib/elf2uf2/elf2uf2 $< $@ -rptarget-y := $(OUT)klipper.uf2 +rptarget-y := $(OUT)kutter.uf2 stage2-$(CONFIG_RP2040_HAVE_STAGE2) := $(OUT)stage2.o # rp2040 building when using a bootloader -$(OUT)klipper.bin: $(OUT)klipper.elf +$(OUT)kutter.bin: $(OUT)kutter.elf @echo " Creating bin file $@" $(Q)$(OBJCOPY) -O binary $< $@ -rptarget-$(CONFIG_RPXXXX_HAVE_BOOTLOADER) := $(OUT)klipper.bin +rptarget-$(CONFIG_RPXXXX_HAVE_BOOTLOADER) := $(OUT)kutter.bin -# Set klipper.elf linker rules +# Set kutter.elf linker rules target-y += $(rptarget-y) -CFLAGS_klipper.elf += -nostdlib -lgcc -lc_nano -CFLAGS_klipper.elf += -T $(OUT)src/rp2040/rpxxxx_link.ld -OBJS_klipper.elf += $(stage2-y) -$(OUT)klipper.elf: $(stage2-y) $(OUT)src/rp2040/rpxxxx_link.ld +CFLAGS_kutter.elf += -nostdlib -lgcc -lc_nano +CFLAGS_kutter.elf += -T $(OUT)src/rp2040/rpxxxx_link.ld +OBJS_kutter.elf += $(stage2-y) +$(OUT)kutter.elf: $(stage2-y) $(OUT)src/rp2040/rpxxxx_link.ld # Flash rules lib/rp2040_flash/rp2040_flash: diff --git a/src/stm32/Makefile b/src/stm32/Makefile index 0ee71dcf..c4ec2fcf 100644 --- a/src/stm32/Makefile +++ b/src/stm32/Makefile @@ -32,9 +32,9 @@ CFLAGS-$(CONFIG_MACH_STM32H7) += -mcpu=cortex-m7 -Ilib/stm32h7/include CFLAGS-$(CONFIG_MACH_STM32L4) += -mcpu=cortex-m4 -Ilib/stm32l4/include CFLAGS += $(CFLAGS-y) -D$(MCU_UPPER) -mthumb -Ilib/cmsis-core -Ilib/fast-hash -CFLAGS_klipper.elf += -nostdlib -lgcc -lc_nano -CFLAGS_klipper.elf += -T $(OUT)src/generic/armcm_link.ld -$(OUT)klipper.elf: $(OUT)src/generic/armcm_link.ld +CFLAGS_kutter.elf += -nostdlib -lgcc -lc_nano +CFLAGS_kutter.elf += -T $(OUT)src/generic/armcm_link.ld +$(OUT)kutter.elf: $(OUT)src/generic/armcm_link.ld # Add source files src-y += stm32/watchdog.c stm32/clockline.c stm32/dfu_reboot.c @@ -91,9 +91,9 @@ src-$(CONFIG_WANT_HARD_PWM) += stm32/hard_pwm.c src-$(CONFIG_HAVE_GPIO_SDIO) += stm32/sdio.c # Binary output file rules -target-y += $(OUT)klipper.bin +target-y += $(OUT)kutter.bin -$(OUT)klipper.bin: $(OUT)klipper.elf +$(OUT)kutter.bin: $(OUT)kutter.elf @echo " Creating hex file $@" $(Q)$(OBJCOPY) -O binary $< $@ @@ -102,10 +102,10 @@ lib/hidflash/hid-flash: @echo " Building hid-flash" $(Q)make -C lib/hidflash -flash: $(OUT)klipper.bin lib/hidflash/hid-flash +flash: $(OUT)kutter.bin lib/hidflash/hid-flash @echo " Flashing $< to $(FLASH_DEVICE)" - $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" -s "$(CONFIG_FLASH_APPLICATION_ADDRESS)" $(if $(NOSUDO),--no-sudo) $(OUT)klipper.bin + $(Q)$(PYTHON) ./scripts/flash_usb.py -t $(CONFIG_MCU) -d "$(FLASH_DEVICE)" -s "$(CONFIG_FLASH_APPLICATION_ADDRESS)" $(if $(NOSUDO),--no-sudo) $(OUT)kutter.bin -serialflash: $(OUT)klipper.bin +serialflash: $(OUT)kutter.bin @echo " Flashing $< to $(FLASH_DEVICE) via stm32flash" $(Q)stm32flash -w $< -v -g 0 $(FLASH_DEVICE) diff --git a/src/stm32/hard_pwm.c b/src/stm32/hard_pwm.c index 6ed27a30..7252be04 100644 --- a/src/stm32/hard_pwm.c +++ b/src/stm32/hard_pwm.c @@ -133,7 +133,7 @@ static const struct gpio_pwm_info pwm_regs[] = { {TIM14, GPIO('A', 7), 1, GPIO_FUNCTION(9)}, {TIM14, GPIO('F', 9), 1, GPIO_FUNCTION(9)}, #endif - // Pins that map to all klipper defined STM32F4 procs + // Pins that map to all kutter defined STM32F4 procs {TIM1, GPIO('A', 8), 1, GPIO_FUNCTION(1)}, {TIM1, GPIO('E', 9), 1, GPIO_FUNCTION(1)}, {TIM1, GPIO('A', 9), 2, GPIO_FUNCTION(1)}, |