Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: flashing via usb fixed to not say CAN Flash Success #90

Merged
merged 1 commit into from
Nov 21, 2024

Conversation

krautech
Copy link
Collaborator

Description

Firmware.sh to use same katapult script for USB as CAN. Fixes "CAN Flash Successul" when flashing via USB.

Line change
~/klippy-env/bin/python ~/klipper/lib/canboot/flash_can.py -f $firmwareFile -d /dev/serial/by-id/$usbID

to

python3 ~/katapult/scripts/flash_can.py -f $firmwareFile -d /dev/serial/by-id/$usbID

@krautech krautech added the fix a bug fix label Nov 21, 2024
@krautech krautech added this to the v1.1.0 milestone Nov 21, 2024
@krautech krautech self-assigned this Nov 21, 2024
@krautech krautech changed the title flashing via usb fixed to not say CAN Flash Success fix: flashing via usb fixed to not say CAN Flash Success Nov 21, 2024
@github-actions github-actions bot added the bug Something isn't working label Nov 21, 2024
Revert "flashing via usb fixed to not say CAN Flash Success"

This reverts commit 7c1ccd6.

flashing via usb fixed to not say CAN Flash Success
@krautech krautech force-pushed the fix/change-canboot-to-katapult-on-firmware.sh branch from 8897c14 to 0b55fc1 Compare November 21, 2024 17:12
@krautech krautech merged commit 0a19597 into develop Nov 21, 2024
2 checks passed
@krautech krautech deleted the fix/change-canboot-to-katapult-on-firmware.sh branch November 21, 2024 17:18
Jomik added a commit that referenced this pull request Nov 28, 2024
* flashing via usb fixed to not say CAN Flash Success (#90)

flashing via usb fixed to not say CAN Flash Success

* chore: rewrote lambda as def (#83)

* Chore: removed random useless code (#80)

* Make MOVE argument configurable (#92)

* feat: make the MOVE argument configurable

Fixes #89

* feat: renamed MOVE to FUZZY_TOUCH and renamed scanner_touch_move to scanner_touch_fuzzy_move

* fix: set a maxval on fuzzy_touch config

---------

Co-authored-by: Chris Krause <[email protected]>

* chore: create macro to help us test (#97)

* feat: add 5.1.0 firmware (k1 missing) (#91)

* feat: add k1 USB 5.1.0 firmware (#100)

* fix: z offset bug (#102)

* Removed CARTOGRAPHER_THRESHOLD_TEST (#82)

* Remove PROBE_CALIBRATE and associated helper function (#81)

* removed PROBE_CALIBRATE and associated helper function
---------

Co-authored-by: Jonas Damtoft <[email protected]>

* Added error message when error during calibration (#84)

* Add types for config, printer and reactor (#94)

* Add 5.1.0 HT firmware (#107)

* feat: add HT firmware and -h flag to firmware.sh

* fix: HT folder name + script version

* fix/change max_retries float to int (#108)

* feat: add types for gcode and gcode command (#106)

* fix: fixes 5.1.0 HT firmware (#111)

* remove duplicate line (#116)

* fix: pin python version to 3.9 (#118)

* removes graph generation and imports (#124)

* fix: tolerance is not a tuple (#125)

* change max_temp to wait_temp (#117)

* Chore: Removed unused ADXL functions and variables (#114)

* chore: remove adxl probing remains

* removed more adxl stuff

* Check firmware version before homing (#112)

* feat(model): save firmware version used for calibration on model

* feat(model): validate against current firmware version

* fix: move mcu get_status to identify handler

* fixup! feat(model): validate against current firmware version

* fix: remove leftover adxl stuff

This became visible after adding the type to scanner

* chore: add recalibration docs url

* Feature: pass params from calibrate to touch (#120)

* pass params from calibrate to touch

* fix: types for GCodeCommand.get_command_parameters

---------

Co-authored-by: Jonas Damtoft <[email protected]>

* feat: setup ci to check k1 environment (#123)

* feat: setup ci to check k1 environment

fix: add build tools

fix: add setuptools to k1

fix: remove explicit build tools from actions

fix: add setuptools for standard env

add full pip3 freeze output from standard env

fix: full standard env

slim down standard env

fix: k1 builds

pycurl is not happy in gh

fix: align standard env

fix: update requirements to avoid breaking changes

fix(k1): disable rule for K1

* fix: use numpy-stubs instead

---------

Co-authored-by: KrauTech <[email protected]>
Co-authored-by: Chris Krause <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working fix a bug fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants