Advertisement
reprapatopolis

Untitled

Jul 23rd, 2011
127
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.12 KB | None | 0 0
  1. < // #define THERMISTOR_BED 1
  2. ---
  3. > #define THERMISTOR_BED 1
  4. 49a50,95
  5.  
  6. diff /Users/jeremy/Desktop/Teacup_Firmware/config.h /Volumes/Home/Desktop/Teacup_Firmware/config.h
  7. 56,57c56,57
  8. < #define STEPS_PER_MM_X 320.000
  9. < #define STEPS_PER_MM_Y 320.000
  10. ---
  11. > #define STEPS_PER_MM_X 40.764914893/2 //320.000
  12. > #define STEPS_PER_MM_Y 40.764914893/2 //320.000
  13. 61c61
  14. < #define STEPS_PER_MM_E 320.000
  15. ---
  16. > #define STEPS_PER_MM_E 2.704 //320.000
  17. 72,73c72,73
  18. < #define MAXIMUM_FEEDRATE_X 200
  19. < #define MAXIMUM_FEEDRATE_Y 200
  20. ---
  21. > #define MAXIMUM_FEEDRATE_X 2000 //200
  22. > #define MAXIMUM_FEEDRATE_Y 2000 //200
  23. 75c75
  24. < #define MAXIMUM_FEEDRATE_E 200
  25. ---
  26. > #define MAXIMUM_FEEDRATE_E 2000
  27. 80c80
  28. < #define SEARCH_FEEDRATE_Z 50
  29. ---
  30. > #define SEARCH_FEEDRATE_Z 20 //50
  31. 92c92
  32. < #define X_MAX 200.0
  33. ---
  34. > #define X_MAX 140.0 //200.0
  35. 95c95
  36. < #define Y_MAX 200.0
  37. ---
  38. > #define Y_MAX 120.0 //200.0
  39. 98c98
  40. < #define Z_MAX 140.0
  41. ---
  42. > #define Z_MAX 90.0 //140.0
  43. 103c103
  44. < // #define E_ABSOLUTE
  45. ---
  46. > #define E_ABSOLUTE
  47. 121c121
  48. < // #define ACCELERATION_REPRAP
  49. ---
  50. > //#define ACCELERATION_REPRAP
  51. 131c131
  52. < #define ACCELERATION 10.
  53. ---
  54. > #define ACCELERATION 50.
  55. 167c167
  56. < //#define USE_INTERNAL_PULLUPS
  57. ---
  58. > #define USE_INTERNAL_PULLUPS
  59. 175,177c175,177
  60. < #define X_STEP_PIN AIO0
  61. < #define X_DIR_PIN AIO1
  62. < #define X_MIN_PIN AIO2
  63. ---
  64. > #define X_STEP_PIN DIO3 //AIO0
  65. > #define X_DIR_PIN DIO2 //AIO1
  66. > #define X_MIN_PIN AIO1 //AIO2
  67. 185,187c185,187
  68. < #define Y_STEP_PIN AIO3
  69. < #define Y_DIR_PIN AIO4
  70. < #define Y_MIN_PIN AIO5
  71. ---
  72. > #define Y_STEP_PIN DIO5 //AIO3
  73. > #define Y_DIR_PIN DIO4 //AIO4
  74. > #define Y_MIN_PIN AIO2 //AIO5
  75. 195,197c195,197
  76. < #define Z_STEP_PIN DIO2
  77. < #define Z_DIR_PIN DIO3
  78. < #define Z_MIN_PIN DIO4
  79. ---
  80. > #define Z_STEP_PIN AIO4 //DIO2
  81. > #define Z_DIR_PIN DIO7 //DIO3
  82. > #define Z_MIN_PIN AIO3 //DIO4
  83. 200c200
  84. < //#define Z_INVERT_DIR
  85. ---
  86. > #define Z_INVERT_DIR
  87. 205,206c205,206
  88. < #define E_STEP_PIN DIO7
  89. < #define E_DIR_PIN DIO8
  90. ---
  91. > #define E_STEP_PIN DIO11 //DIO7
  92. > #define E_DIR_PIN DIO8 //DIO8
  93. 210c210
  94. < #define PS_ON_PIN DIO9
  95. ---
  96. > //#define PS_ON_PIN DIO9
  97. 254,256c254,256
  98. < // name type pin additional
  99. < DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, 0, THERMISTOR_EXTRUDER)
  100. < // DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, 1, THERMISTOR_EXTRUDER)
  101. ---
  102. > // name type pin additional
  103. > DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO0_PIN, THERMISTOR_EXTRUDER)
  104. > DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO5_PIN, THERMISTOR_EXTRUDER)
  105. 299,300c299,300
  106. < DEFINE_HEATER(extruder, PB3)
  107. < DEFINE_HEATER(bed, PB4)
  108. ---
  109. > DEFINE_HEATER(extruder, PD6)
  110. > DEFINE_HEATER(bed, DIO13)
  111. 329c329
  112. < // #define REPRAP_HOST_COMPATIBILITY 19750101
  113. ---
  114. > //#define REPRAP_HOST_COMPATIBILITY 19750101
  115. Only in /Users/jeremy/Desktop/Teacup_Firmware/: config.ramps.h
  116. Common subdirectories: /Users/jeremy/Desktop/Teacup_Firmware/extruder and /Volumes/Home/Desktop/Teacup_Firmware/extruder
  117. diff /Users/jeremy/Desktop/Teacup_Firmware/home.c /Volumes/Home/Desktop/Teacup_Firmware/home.c
  118. 45c45
  119. < x_direction(0);
  120. ---
  121. > x_direction(1);
  122. 57c57
  123. < delay((uint32_t) (60.0 * 1000000.0 / STEPS_PER_MM_X / ((float) MAXIMUM_FEEDRATE_X)));
  124. ---
  125. > delay((uint32_t) (60.0 * 1000000.0 / STEPS_PER_MM_X / ((float) SEARCH_FEEDRATE_X)));
  126. 62c62
  127. < x_direction(1);
  128. ---
  129. > x_direction(0);
  130. 93c93
  131. < x_direction(1);
  132. ---
  133. > x_direction(0);
  134. 105c105
  135. < delay((uint32_t) (60.0 * 1000000.0 / STEPS_PER_MM_X / ((float) MAXIMUM_FEEDRATE_X)));
  136. ---
  137. > delay((uint32_t) (60.0 * 1000000.0 / STEPS_PER_MM_X / ((float) SEARCH_FEEDRATE_X)));
  138. 110c110
  139. < x_direction(0);
  140. ---
  141. > x_direction(1);
  142. 141c141
  143. < y_direction(0);
  144. ---
  145. > y_direction(1);
  146. 152,153c152,153
  147. < // wait until neyt step time
  148. < delay((uint32_t) (60.0 * 1000000.0 / STEPS_PER_MM_Y / ((float) MAXIMUM_FEEDRATE_Y)));
  149. ---
  150. > // wait until next step time
  151. > delay((uint32_t) (60.0 * 1000000.0 / STEPS_PER_MM_Y / ((float) SEARCH_FEEDRATE_Y)));
  152. 158c158
  153. < y_direction(1);
  154. ---
  155. > y_direction(0);
  156. 189c189
  157. < y_direction(1);
  158. ---
  159. > y_direction(0);
  160. 201c201
  161. < delay((uint32_t) (60.0 * 1000000.0 / STEPS_PER_MM_Y / ((float) MAXIMUM_FEEDRATE_Y)));
  162. ---
  163. > delay((uint32_t) (60.0 * 1000000.0 / STEPS_PER_MM_Y / ((float) SEARCH_FEEDRATE_Y)));
  164. 206c206
  165. < y_direction(0);
  166. ---
  167. > y_direction(1);
  168. 237c237
  169. < z_direction(0);
  170. ---
  171. > z_direction(1);
  172. 254c254
  173. < z_direction(1);
  174. ---
  175. > z_direction(0);
  176. 286c286
  177. < z_direction(1);
  178. ---
  179. > z_direction(0);
  180. 303c303
  181. < z_direction(0);
  182. ---
  183. > z_direction(1);
  184. Common subdirectories: /Users/jeremy/Desktop/Teacup_Firmware/lufa_serial and /Volumes/Home/Desktop/Teacup_Firmware/lufa_serial
  185. diff /Users/jeremy/Desktop/Teacup_Firmware/temp.c /Volumes/Home/Desktop/Teacup_Firmware/temp.c
  186. 352c352
  187. < sersendf_P(PSTR("\nT:%u.%u"), temp_sensors_runtime[index].last_read_temp >> 2, c);
  188. ---
  189. > sersendf_P(PSTR("T:%u.%u"), temp_sensors_runtime[index].last_read_temp >> 2, c);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement