Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- pi@octopi:~ $ cd ~/klipper/ ; git status ; git diff
- Auf Branch master
- Ihr Branch ist auf dem selben Stand wie 'origin/master'.
- Änderungen, die nicht zum Commit vorgemerkt sind:
- (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken)
- (benutzen Sie "git checkout -- <Datei>...", um die Änderungen im Arbeitsverzei chnis zu verwerfen)
- geändert: config/generic-ramps.cfg
- geändert: scripts/graphstats.py
- geändert: src/avr/timer.c
- Unbeobachtete Dateien:
- (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken)
- config/example-corexy_1.cfg
- loadgraph.png
- keine Änderungen zum Commit vorgemerkt (benutzen Sie "git add" und/oder "git com mit -a")
- diff --git a/config/generic-ramps.cfg b/config/generic-ramps.cfg
- index 614214d..e2a794d 100644
- --- a/config/generic-ramps.cfg
- +++ b/config/generic-ramps.cfg
- @@ -6,53 +6,59 @@
- [stepper_x]
- step_pin: ar54
- -dir_pin: ar55
- +dir_pin: !ar55
- enable_pin: !ar38
- step_distance: .0125
- -endstop_pin: ^ar3
- +endstop_pin: ^!ar3
- #endstop_pin: ^ar2
- position_endstop: 0
- -position_max: 200
- -homing_speed: 50
- +position_max: 320
- +homing_speed: 5
- [stepper_y]
- step_pin: ar60
- :...skipping...
- diff --git a/config/generic-ramps.cfg b/config/generic-ramps.cfg
- index 614214d..e2a794d 100644
- --- a/config/generic-ramps.cfg
- +++ b/config/generic-ramps.cfg
- @@ -6,53 +6,59 @@
- [stepper_x]
- step_pin: ar54
- -dir_pin: ar55
- +dir_pin: !ar55
- enable_pin: !ar38
- step_distance: .0125
- -endstop_pin: ^ar3
- +endstop_pin: ^!ar3
- #endstop_pin: ^ar2
- position_endstop: 0
- -position_max: 200
- -homing_speed: 50
- +position_max: 320
- +homing_speed: 5
- [stepper_y]
- step_pin: ar60
- dir_pin: !ar61
- enable_pin: !ar56
- step_distance: .0125
- -endstop_pin: ^ar14
- +endstop_pin: ^!ar14
- #endstop_pin: ^ar15
- position_endstop: 0
- -position_max: 200
- -homing_speed: 50
- +position_max: 320
- +homing_speed: 5
- [stepper_z]
- step_pin: ar46
- dir_pin: ar48
- enable_pin: !ar62
- -step_distance: 0.00025
- +step_distance: 0.00625
- endstop_pin: ^ar18
- #endstop_pin: ^ar19
- position_endstop: 0.5
- -position_max: 200
- +position_max: 320
- +[stepper_z1]
- +step_pin: ar36
- +dir_pin: ar34
- +enable_pin: !ar30
- +step_distance: 0.00625
- +endstop_pin: ^ar19
- [extruder]
- step_pin: ar26
- dir_pin: ar28
- enable_pin: !ar24
- -step_distance: .002
- +step_distance: .0105263157894737
- nozzle_diameter: 0.400
- filament_diameter: 1.750
- heater_pin: ar10
- sensor_type: EPCOS 100K B57560G104F
- sensor_pin: analog13
- control: pid
- -pid_Kp: 22.2
- -pid_Ki: 1.08
- -pid_Kd: 114
- +pid_Kp: 35.33
- +pid_Ki: 5.62
- +pid_Kd: 55.57
- min_temp: 0
- max_temp: 250
- -
- +#pressure_advance: 0.2
- #[extruder1]
- #step_pin: ar36
- #dir_pin: ar34
- @@ -74,11 +80,12 @@ pin: ar9
- [mcu]
- serial: /dev/ttyACM0
- +baud: 115200
- pin_map: arduino
- [printer]
- -kinematics: cartesian
- +kinematics: corexy
- max_velocity: 300
- max_accel: 3000
- -max_z_velocity: 5
- -max_z_accel: 100
- +max_z_velocity: 25
- +max_z_accel: 30
- diff --git a/scripts/graphstats.py b/scripts/graphstats.py
- index d037983..89998ea 100755
- --- a/scripts/graphstats.py
- +++ b/scripts/graphstats.py
- @@ -4,6 +4,9 @@
- # Copyright (C) 2016 Kevin O'Connor <kevin@koconnor.net>
- #
- # This file may be distributed under the terms of the GNU GPLv3 license.
- +import matplotlib
- +matplotlib.use('Agg')
- +
- import optparse, datetime
- import matplotlib.pyplot as plt, matplotlib.dates as mdates
- diff --git a/src/avr/timer.c b/src/avr/timer.c
- index dcd0186..c139693 100644
- --- a/src/avr/timer.c
- +++ b/src/avr/timer.c
- @@ -77,7 +77,7 @@ timer_repeat_set(uint16_t next)
- void
- timer_kick(void)
- {
- - timer_set(timer_get() + 50);
- + timer_set(timer_get() + 100);
- TIFR1 = 1<<OCF1A;
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement