Advertisement
Tylon

Git Diff Status Klipper TylonHH

Jan 5th, 2018
231
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.89 KB | None | 0 0
  1. pi@octopi:~ $ cd ~/klipper/ ; git status ; git diff
  2. Auf Branch master
  3. Ihr Branch ist auf dem selben Stand wie 'origin/master'.
  4. Änderungen, die nicht zum Commit vorgemerkt sind:
  5. (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken)
  6. (benutzen Sie "git checkout -- <Datei>...", um die Änderungen im Arbeitsverzei chnis zu verwerfen)
  7.  
  8. geändert: config/generic-ramps.cfg
  9. geändert: scripts/graphstats.py
  10. geändert: src/avr/timer.c
  11.  
  12. Unbeobachtete Dateien:
  13. (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit vorzumerken)
  14.  
  15. config/example-corexy_1.cfg
  16. loadgraph.png
  17.  
  18. keine Änderungen zum Commit vorgemerkt (benutzen Sie "git add" und/oder "git com mit -a")
  19. diff --git a/config/generic-ramps.cfg b/config/generic-ramps.cfg
  20. index 614214d..e2a794d 100644
  21. --- a/config/generic-ramps.cfg
  22. +++ b/config/generic-ramps.cfg
  23. @@ -6,53 +6,59 @@
  24.  
  25. [stepper_x]
  26. step_pin: ar54
  27. -dir_pin: ar55
  28. +dir_pin: !ar55
  29. enable_pin: !ar38
  30. step_distance: .0125
  31. -endstop_pin: ^ar3
  32. +endstop_pin: ^!ar3
  33. #endstop_pin: ^ar2
  34. position_endstop: 0
  35. -position_max: 200
  36. -homing_speed: 50
  37. +position_max: 320
  38. +homing_speed: 5
  39.  
  40. [stepper_y]
  41. step_pin: ar60
  42. :...skipping...
  43. diff --git a/config/generic-ramps.cfg b/config/generic-ramps.cfg
  44. index 614214d..e2a794d 100644
  45. --- a/config/generic-ramps.cfg
  46. +++ b/config/generic-ramps.cfg
  47. @@ -6,53 +6,59 @@
  48.  
  49. [stepper_x]
  50. step_pin: ar54
  51. -dir_pin: ar55
  52. +dir_pin: !ar55
  53. enable_pin: !ar38
  54. step_distance: .0125
  55. -endstop_pin: ^ar3
  56. +endstop_pin: ^!ar3
  57. #endstop_pin: ^ar2
  58. position_endstop: 0
  59. -position_max: 200
  60. -homing_speed: 50
  61. +position_max: 320
  62. +homing_speed: 5
  63.  
  64. [stepper_y]
  65. step_pin: ar60
  66. dir_pin: !ar61
  67. enable_pin: !ar56
  68. step_distance: .0125
  69. -endstop_pin: ^ar14
  70. +endstop_pin: ^!ar14
  71. #endstop_pin: ^ar15
  72. position_endstop: 0
  73. -position_max: 200
  74. -homing_speed: 50
  75. +position_max: 320
  76. +homing_speed: 5
  77.  
  78. [stepper_z]
  79. step_pin: ar46
  80. dir_pin: ar48
  81. enable_pin: !ar62
  82. -step_distance: 0.00025
  83. +step_distance: 0.00625
  84. endstop_pin: ^ar18
  85. #endstop_pin: ^ar19
  86. position_endstop: 0.5
  87. -position_max: 200
  88. +position_max: 320
  89.  
  90. +[stepper_z1]
  91. +step_pin: ar36
  92. +dir_pin: ar34
  93. +enable_pin: !ar30
  94. +step_distance: 0.00625
  95. +endstop_pin: ^ar19
  96. [extruder]
  97. step_pin: ar26
  98. dir_pin: ar28
  99. enable_pin: !ar24
  100. -step_distance: .002
  101. +step_distance: .0105263157894737
  102. nozzle_diameter: 0.400
  103. filament_diameter: 1.750
  104. heater_pin: ar10
  105. sensor_type: EPCOS 100K B57560G104F
  106. sensor_pin: analog13
  107. control: pid
  108. -pid_Kp: 22.2
  109. -pid_Ki: 1.08
  110. -pid_Kd: 114
  111. +pid_Kp: 35.33
  112. +pid_Ki: 5.62
  113. +pid_Kd: 55.57
  114. min_temp: 0
  115. max_temp: 250
  116. -
  117. +#pressure_advance: 0.2
  118. #[extruder1]
  119. #step_pin: ar36
  120. #dir_pin: ar34
  121. @@ -74,11 +80,12 @@ pin: ar9
  122.  
  123. [mcu]
  124. serial: /dev/ttyACM0
  125. +baud: 115200
  126. pin_map: arduino
  127.  
  128. [printer]
  129. -kinematics: cartesian
  130. +kinematics: corexy
  131. max_velocity: 300
  132. max_accel: 3000
  133. -max_z_velocity: 5
  134. -max_z_accel: 100
  135. +max_z_velocity: 25
  136. +max_z_accel: 30
  137. diff --git a/scripts/graphstats.py b/scripts/graphstats.py
  138. index d037983..89998ea 100755
  139. --- a/scripts/graphstats.py
  140. +++ b/scripts/graphstats.py
  141. @@ -4,6 +4,9 @@
  142. # Copyright (C) 2016 Kevin O'Connor <kevin@koconnor.net>
  143. #
  144. # This file may be distributed under the terms of the GNU GPLv3 license.
  145. +import matplotlib
  146. +matplotlib.use('Agg')
  147. +
  148. import optparse, datetime
  149. import matplotlib.pyplot as plt, matplotlib.dates as mdates
  150.  
  151. diff --git a/src/avr/timer.c b/src/avr/timer.c
  152. index dcd0186..c139693 100644
  153. --- a/src/avr/timer.c
  154. +++ b/src/avr/timer.c
  155. @@ -77,7 +77,7 @@ timer_repeat_set(uint16_t next)
  156. void
  157. timer_kick(void)
  158. {
  159. - timer_set(timer_get() + 50);
  160. + timer_set(timer_get() + 100);
  161. TIFR1 = 1<<OCF1A;
  162. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement