Conflicts: Marlin/Configuration.h Marlin/Marlin.pde
|
|
||
58 |
|
58 |
|
59 |
|
59 |
|
60 |
|
60 |
|
61 |
|
|
|
62 |
|
61 |
|
63 |
|
62 |
|
64 |
|
63 |
|
|
|
||
243 |
|
242 |
|
244 |
|
243 |
|
245 |
|
244 |
|
246 |
|
|
|
|
245 |
|
|
|
246 |
|
|
247 |
|
247 |
|
248 |
|
248 |
|
249 |
|
249 |
|
|
250 |
|
|
250 |
|
251 |
|
251 |
|
252 |
|
252 |
|
253 |
|
|
|
||
100 |
|
100 |
|
101 |
|
101 |
|
102 |
|
102 |
|
103 |
|
|
|
|
103 |
|
|
104 |
|
104 |
|
105 |
|
105 |
|
106 |
|
106 |
|
|
|
||
37 |
|
37 |
|
38 |
|
38 |
|
39 |
|
39 |
|
|
40 |
|
|
40 |
|
41 |
|
41 |
|
42 |
|
42 |
|
43 |
|
|
|
||
193 |
|
194 |
|
194 |
|
195 |
|
195 |
|
196 |
|
|
197 |
|
|
|
198 |
|
|
|
199 |
|
|
|
200 |
|
|
|
201 |
|
|
|
202 |
|
|
196 |
|
203 |
|
197 |
|
204 |
|
198 |
|
205 |
|
|
|
||
235 |
|
242 |
|
236 |
|
243 |
|
237 |
|
244 |
|
|
245 |
|
|
238 |
|
246 |
|
239 |
|
247 |
|
240 |
|
248 |
|
|
|
||
659 |
|
667 |
|
660 |
|
668 |
|
661 |
|
669 |
|
662 |
|
|
|
|
670 |
|
|
|
671 |
|
|
663 |
|
672 |
|
664 |
|
673 |
|
665 |
|
674 |
|
|
|
||
33 |
|
33 |
|
34 |
|
34 |
|
35 |
|
35 |
|
|
36 |
|
|
36 |
|
37 |
|
37 |
|
38 |
|
38 |
|
39 |
|
|
|
||
97 |
|
97 |
|
98 |
|
98 |
|
99 |
|
99 |
|
100 |
|
|
|
|
100 |
|
|
101 |
|
101 |
|
102 |
|
102 |
|
103 |
|
|
|
|
103 |
|
|
|
||
374 |
|
374 |
|
375 |
|
375 |
|
376 |
|
376 |
|
|
377 |
|
|
|
378 |
|
|
|
379 |
|
|
|
380 |
|
|
|
381 |
|
|
|
382 |
|
|
|
383 |
|
|
|
384 |
|
|
|
385 |
|
|
|
386 |
|
|
|
387 |
|
|
377 |
|
388 |
|
378 |
|
389 |
|
379 |
|
390 |
|
|
|
||
686 |
|
697 |
|
687 |
|
698 |
|
688 |
|
699 |
|
689 |
|
|
|
|
700 |
|
|
690 |
|
701 |
|
691 |
|
702 |
|
692 |
|
703 |
|
|
|
||
696 |
|
707 |
|
697 |
|
708 |
|
698 |
|
709 |
|
699 |
|
|
|
|
710 |
|
|
700 |
|
711 |
|
701 |
|
712 |
|
702 |
|
713 |
|
703 |
|
|
|
|
714 |
|
|
704 |
|
715 |
|
705 |
|
716 |
|
706 |
|
717 |
|
|
|
||
866 |
|
877 |
|
867 |
|
878 |
|
868 |
|
879 |
|
869 |
|
|
|
|
880 |
|
|
870 |
|
881 |
|
871 |
|
882 |
|
872 |
|
883 |
|
|
|
||
876 |
|
887 |
|
877 |
|
888 |
|
878 |
|
889 |
|
879 |
|
|
|
|
890 |
|
|
880 |
|
891 |
|
881 |
|
892 |
|
882 |
|
893 |
|
883 |
|
|
|
|
894 |
|
|
884 |
|
895 |
|
885 |
|
896 |
|
886 |
|
897 |
|
|
|
||
901 |
|
912 |
|
902 |
|
913 |
|
903 |
|
914 |
|
904 |
|
|
|
|
915 |
|
|
905 |
|
916 |
|
906 |
|
917 |
|
907 |
|
918 |
|
|
|
||
911 |
|
922 |
|
912 |
|
923 |
|
913 |
|
924 |
|
914 |
|
|
|
|
925 |
|
|
915 |
|
926 |
|
916 |
|
927 |
|
917 |
|
928 |
|
918 |
|
|
|
|
929 |
|
|
919 |
|
930 |
|
920 |
|
931 |
|
921 |
|
932 |
|
|
|
||
935 |
|
946 |
|
936 |
|
947 |
|
937 |
|
948 |
|
938 |
|
|
|
|
949 |
|
|
939 |
|
950 |
|
940 |
|
951 |
|
941 |
|
952 |
|
|
|
||
945 |
|
956 |
|
946 |
|
957 |
|
947 |
|
958 |
|
948 |
|
|
|
|
959 |
|
|
949 |
|
960 |
|
950 |
|
961 |
|
951 |
|
962 |
|
952 |
|
|
|
|
963 |
|
|
953 |
|
964 |
|
954 |
|
965 |
|
955 |
|
966 |
|
|
|
||
42 |
|
42 |
|
43 |
|
43 |
|
44 |
|
44 |
|
|
45 |
|
|
45 |
|
46 |
|
46 |
|
47 |
|
47 |
|
48 |
|
48 |
|
49 |
|
|
50 |
|
|
49 |
|
51 |
|
50 |
|
52 |
|
51 |
|
53 |
|