Browse Source

Merge pull request #2 from MarlinFirmware/development

Dev-Pull
Wurstnase 10 years ago
parent
commit
5de8cce7bf

+ 8
- 0
.gitignore View File

@@ -0,0 +1,8 @@
1
+*.o
2
+applet/
3
+*~
4
+*.orig
5
+*.rej
6
+*.bak
7
+*.DS_Store
8
+*.idea

+ 160
- 0
.travis.yml View File

@@ -0,0 +1,160 @@
1
+---
2
+language: c
3
+
4
+before_install:
5
+  - pwd
6
+  - wget https://bootstrap.pypa.io/get-pip.py
7
+  - wget https://bintray.com/artifact/download/olikraus/u8glib/u8glib_arduino_v1.17.zip
8
+install:
9
+  - sudo python get-pip.py
10
+  - sudo pip install ino
11
+  # add ppa for newer version of Arduino than available in ubuntu 12.04
12
+  - sudo add-apt-repository ppa:michael-gruz/elektronik -y
13
+  - sudo apt-get update -q 
14
+  - sudo apt-get install arduino
15
+before_script:
16
+ # add U8glib, LiquidCrystal_I2C & LiquidTWI2 libraries 
17
+  - sudo unzip u8glib_arduino_v1.17.zip -d /usr/share/arduino/libraries/
18
+  - cd /usr/share/arduino/libraries/
19
+  - sudo git clone https://github.com/kiyoshigawa/LiquidCrystal_I2C.git
20
+  - ls -la
21
+  - ls -la LiquidCrystal_I2C/
22
+  - sudo git clone https://github.com/lincomatic/LiquidTWI2.git
23
+  # remove Robot_Control library to stop compile error!
24
+  - sudo rm -rf /usr/share/arduino/libraries/Robot_Control
25
+  # change back to home directory for compiling
26
+  - cd $TRAVIS_BUILD_DIR
27
+  # ino needs files in src directory
28
+  - ln -s Marlin src
29
+  # remove Marlin.pde as it confuses ino after it finds Marlin.ino
30
+  - rm Marlin/Marlin.pde
31
+script:
32
+  # build default config
33
+  - ino build -m mega2560
34
+  # backup configuration.h
35
+  - cp Marlin/Configuration.h Marlin/Configuration.h.backup
36
+  - cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup
37
+  # change extruder numbers from 1 to 2
38
+  # commented out for the moment fails build but compiles fine in Arduino
39
+  #- sed -i 's/#define EXTRUDERS 1/#define EXTRUDERS 2/g' Marlin/Configuration.h
40
+  #- rm -rf .build/
41
+  #- ino build -m mega2560
42
+  # change extruder numbers from 2 to 3, needs to be a board with 3 extruders defined in pins.h 
43
+  #- sed -i 's/#define MOTHERBOARD BOARD_ULTIMAKER/#define MOTHERBOARD BOARD_AZTEEG_X3_PRO/g' Marlin/Configuration.h
44
+  #- sed -i 's/#define EXTRUDERS 2/#define EXTRUDERS 3/g' Marlin/Configuration.h
45
+  #- rm -rf .build/
46
+  #- ino build -m mega2560
47
+  # enable PIDTEMPBED 
48
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
49
+  - sed -i 's/\/\/#define PIDTEMPBED/#define PIDTEMPBED/g' Marlin/Configuration.h
50
+  - rm -rf .build/
51
+  - ino build -m mega2560
52
+  # enable THERMAL RUNAWAY PROTECTION for extruders & bed
53
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
54
+  - sed -i 's/\/\/#define THERMAL_RUNAWAY_PROTECTION_PERIOD/#define THERMAL_RUNAWAY_PROTECTION_PERIOD/g' Marlin/Configuration.h
55
+  - sed -i 's/\/\/#define THERMAL_RUNAWAY_PROTECTION_HYSTERESIS/#define THERMAL_RUNAWAY_PROTECTION_HYSTERESIS/g' Marlin/Configuration.h
56
+  - sed -i 's/\/\/#define THERMAL_RUNAWAY_PROTECTION_BED_PERIOD/#define THERMAL_RUNAWAY_PROTECTION_BED_PERIOD/g' Marlin/Configuration.h
57
+  - sed -i 's/\/\/#define THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS/#define THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS/g' Marlin/Configuration.h
58
+  - rm -rf .build/
59
+  - ino build -m mega2560
60
+  # enable AUTO_BED_LEVELING
61
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
62
+  - sed -i 's/\/\/#define ENABLE_AUTO_BED_LEVELING/#define ENABLE_AUTO_BED_LEVELING/g' Marlin/Configuration.h
63
+  - rm -rf .build/
64
+  - ino build -m mega2560
65
+  # enable EEPROM_SETTINGS & EEPROM_CHITCHAT
66
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
67
+  - sed -i 's/\/\/#define EEPROM_SETTINGS/#define EEPROM_SETTINGS/g' Marlin/Configuration.h
68
+  - sed -i 's/\/\/#define EEPROM_CHITCHAT/#define EEPROM_CHITCHAT/g' Marlin/Configuration.h
69
+  - rm -rf .build/
70
+  - ino build -m mega2560
71
+  ### LCDS ###
72
+  # ULTIMAKERCONTROLLER
73
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
74
+  - sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h
75
+  - rm -rf .build/
76
+  - ino build -m mega2560
77
+  # MAKRPANEL
78
+  # Needs to use melzi and sanguino hardware
79
+  #- cp Marlin/Configuration.h.backup Marlin/Configuration.h
80
+  #- sed -i 's/\/\/#define MAKRPANEL/#define MAKRPANEL/g' Marlin/Configuration.h
81
+  #- rm -rf .build/
82
+  #- ino build -m mega2560
83
+  # REPRAP_DISCOUNT_SMART_CONTROLLER
84
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
85
+  - sed -i 's/\/\/#define REPRAP_DISCOUNT_SMART_CONTROLLER/#define REPRAP_DISCOUNT_SMART_CONTROLLER/g' Marlin/Configuration.h
86
+  - rm -rf .build/
87
+  - ino build -m mega2560
88
+  # G3D_PANE
89
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
90
+  - sed -i 's/\/\/#define G3D_PANEL/#define G3D_PANEL/g' Marlin/Configuration.h
91
+  - rm -rf .build/
92
+  - ino build -m mega2560
93
+  # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
94
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
95
+  - sed -i 's/\/\/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER/g' Marlin/Configuration.h
96
+  - rm -rf .build/
97
+  - ino build -m mega2560
98
+  # REPRAPWORLD_KEYPAD 
99
+  # Cant find configuration details to get it to compile
100
+  #- cp Marlin/Configuration.h.backup Marlin/Configuration.h
101
+  #- sed -i 's/\/\/#define ULTRA_LCD/#define ULTRA_LCD/g' Marlin/Configuration.h
102
+  #- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD/#define REPRAPWORLD_KEYPAD/g' Marlin/Configuration.h
103
+  #- sed -i 's/\/\/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0/g' Marlin/Configuration.h
104
+  #- rm -rf .build/
105
+  #- ino build -m mega2560
106
+  # RA_CONTROL_PANEL
107
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
108
+  - sed -i 's/\/\/#define RA_CONTROL_PANEL/#define RA_CONTROL_PANEL/g' Marlin/Configuration.h
109
+  - rm -rf .build/
110
+  - ino build -m mega2560
111
+  ### I2C PANELS ###
112
+  # LCD_I2C_SAINSMART_YWROBOT
113
+  # Failing at the moment needs different library 
114
+  #- cp Marlin/Configuration.h.backup Marlin/Configuration.h
115
+  #- sed -i 's/\/\/#define LCD_I2C_SAINSMART_YWROBOT/#define LCD_I2C_SAINSMART_YWROBOT/g' Marlin/Configuration.h
116
+  #- rm -rf .build/
117
+  #- ino build -m mega2560
118
+  # LCD_I2C_PANELOLU2
119
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
120
+  - sed -i 's/\/\/#define LCD_I2C_PANELOLU2/#define LCD_I2C_PANELOLU2/g' Marlin/Configuration.h
121
+  - rm -rf .build/
122
+  - ino build -m mega2560
123
+  # LCD_I2C_VIKI
124
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
125
+  - sed -i 's/\/\/#define LCD_I2C_VIKI/#define LCD_I2C_VIKI/g' Marlin/Configuration.h
126
+  - rm -rf .build/
127
+  - ino build -m mega2560
128
+  # Enable filament sensor
129
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
130
+  - sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h
131
+  - rm -rf .build/
132
+  - ino build -m mega2560
133
+   # Enable filament sensor with LCD display
134
+  - cp Marlin/Configuration.h.backup Marlin/Configuration.h
135
+  - sed -i 's/\/\/#define ULTIMAKERCONTROLLER/#define ULTIMAKERCONTROLLER/g' Marlin/Configuration.h
136
+  - sed -i 's/\/\/#define FILAMENT_SENSOR/#define FILAMENT_SENSOR/g' Marlin/Configuration.h
137
+  - sed -i 's/\/\/#define FILAMENT_LCD_DISPLAY/#define FILAMENT_LCD_DISPLAY/g' Marlin/Configuration.h
138
+  - rm -rf .build/
139
+  - ino build -m mega2560
140
+  ######## Example Configurations ##############
141
+  # Delta Config
142
+  - cp Marlin/example_configurations/delta/Configuration* Marlin/
143
+  - rm -rf .build/
144
+  - ino build -m mega2560
145
+  # Makibox Config  need to check board type for Teensy++ 2.0
146
+  #- cp Marlin/example_configurations/makibox/Configuration* Marlin/
147
+  #- rm -rf .build/
148
+  #- ino build -m mega2560
149
+  # SCARA Config
150
+  - cp Marlin/example_configurations/SCARA/Configuration* Marlin/
151
+  - rm -rf .build/
152
+  - ino build -m mega2560
153
+  # tvrrug Config need to check board type for sanguino atmega644p
154
+  #- cp Marlin/example_configurations/tvrrug/Round2/Configuration* Marlin/
155
+  #- rm -rf .build/
156
+  #- ino build -m mega2560
157
+  ######## Board Types #############
158
+  - sed -i 's/#define MOTHERBOARD BOARD_RAMPS_13_EFB/#define MOTHERBOARD BOARD_DUEMILANOVE_328P/g' Marlin/Configuration.h
159
+  - rm -rf .build/
160
+  - ino build -m atmega328

+ 596
- 0
COPYING.md View File

@@ -0,0 +1,596 @@
1
+GNU GENERAL PUBLIC LICENSE
2
+==========================
3
+
4
+Version 3, 29 June 2007
5
+
6
+Copyright &copy; 2007 Free Software Foundation, Inc. &lt;<http://fsf.org/>&gt;
7
+
8
+Everyone is permitted to copy and distribute verbatim copies of this license
9
+document, but changing it is not allowed.
10
+
11
+## Preamble
12
+
13
+The GNU General Public License is a free, copyleft license for software and other
14
+kinds of works.
15
+
16
+The licenses for most software and other practical works are designed to take away
17
+your freedom to share and change the works. By contrast, the GNU General Public
18
+License is intended to guarantee your freedom to share and change all versions of a
19
+program--to make sure it remains free software for all its users. We, the Free
20
+Software Foundation, use the GNU General Public License for most of our software; it
21
+applies also to any other work released this way by its authors. You can apply it to
22
+your programs, too.
23
+
24
+When we speak of free software, we are referring to freedom, not price. Our General
25
+Public Licenses are designed to make sure that you have the freedom to distribute
26
+copies of free software (and charge for them if you wish), that you receive source
27
+code or can get it if you want it, that you can change the software or use pieces of
28
+it in new free programs, and that you know you can do these things.
29
+
30
+To protect your rights, we need to prevent others from denying you these rights or
31
+asking you to surrender the rights. Therefore, you have certain responsibilities if
32
+you distribute copies of the software, or if you modify it: responsibilities to
33
+respect the freedom of others.
34
+
35
+For example, if you distribute copies of such a program, whether gratis or for a fee,
36
+you must pass on to the recipients the same freedoms that you received. You must make
37
+sure that they, too, receive or can get the source code. And you must show them these
38
+terms so they know their rights.
39
+
40
+Developers that use the GNU GPL protect your rights with two steps: (1) assert
41
+copyright on the software, and (2) offer you this License giving you legal permission
42
+to copy, distribute and/or modify it.
43
+
44
+For the developers' and authors' protection, the GPL clearly explains that there is
45
+no warranty for this free software. For both users' and authors' sake, the GPL
46
+requires that modified versions be marked as changed, so that their problems will not
47
+be attributed erroneously to authors of previous versions.
48
+
49
+Some devices are designed to deny users access to install or run modified versions of
50
+the software inside them, although the manufacturer can do so. This is fundamentally
51
+incompatible with the aim of protecting users' freedom to change the software. The
52
+systematic pattern of such abuse occurs in the area of products for individuals to
53
+use, which is precisely where it is most unacceptable. Therefore, we have designed
54
+this version of the GPL to prohibit the practice for those products. If such problems
55
+arise substantially in other domains, we stand ready to extend this provision to
56
+those domains in future versions of the GPL, as needed to protect the freedom of
57
+users.
58
+
59
+Finally, every program is threatened constantly by software patents. States should
60
+not allow patents to restrict development and use of software on general-purpose
61
+computers, but in those that do, we wish to avoid the special danger that patents
62
+applied to a free program could make it effectively proprietary. To prevent this, the
63
+GPL assures that patents cannot be used to render the program non-free.
64
+
65
+The precise terms and conditions for copying, distribution and modification follow.
66
+
67
+## TERMS AND CONDITIONS
68
+
69
+### 0. Definitions.
70
+
71
+&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.
72
+
73
+&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
74
+works, such as semiconductor masks.
75
+
76
+&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
77
+License. Each licensee is addressed as &ldquo;you&rdquo;. &ldquo;Licensees&rdquo; and
78
+&ldquo;recipients&rdquo; may be individuals or organizations.
79
+
80
+To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work in
81
+a fashion requiring copyright permission, other than the making of an exact copy. The
82
+resulting work is called a &ldquo;modified version&rdquo; of the earlier work or a
83
+work &ldquo;based on&rdquo; the earlier work.
84
+
85
+A &ldquo;covered work&rdquo; means either the unmodified Program or a work based on
86
+the Program.
87
+
88
+To &ldquo;propagate&rdquo; a work means to do anything with it that, without
89
+permission, would make you directly or secondarily liable for infringement under
90
+applicable copyright law, except executing it on a computer or modifying a private
91
+copy. Propagation includes copying, distribution (with or without modification),
92
+making available to the public, and in some countries other activities as well.
93
+
94
+To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
95
+parties to make or receive copies. Mere interaction with a user through a computer
96
+network, with no transfer of a copy, is not conveying.
97
+
98
+An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo; to the
99
+extent that it includes a convenient and prominently visible feature that (1)
100
+displays an appropriate copyright notice, and (2) tells the user that there is no
101
+warranty for the work (except to the extent that warranties are provided), that
102
+licensees may convey the work under this License, and how to view a copy of this
103
+License. If the interface presents a list of user commands or options, such as a
104
+menu, a prominent item in the list meets this criterion.
105
+
106
+### 1. Source Code.
107
+
108
+The &ldquo;source code&rdquo; for a work means the preferred form of the work for
109
+making modifications to it. &ldquo;Object code&rdquo; means any non-source form of a
110
+work.
111
+
112
+A &ldquo;Standard Interface&rdquo; means an interface that either is an official
113
+standard defined by a recognized standards body, or, in the case of interfaces
114
+specified for a particular programming language, one that is widely used among
115
+developers working in that language.
116
+
117
+The &ldquo;System Libraries&rdquo; of an executable work include anything, other than
118
+the work as a whole, that (a) is included in the normal form of packaging a Major
119
+Component, but which is not part of that Major Component, and (b) serves only to
120
+enable use of the work with that Major Component, or to implement a Standard
121
+Interface for which an implementation is available to the public in source code form.
122
+A &ldquo;Major Component&rdquo;, in this context, means a major essential component
123
+(kernel, window system, and so on) of the specific operating system (if any) on which
124
+the executable work runs, or a compiler used to produce the work, or an object code
125
+interpreter used to run it.
126
+
127
+The &ldquo;Corresponding Source&rdquo; for a work in object code form means all the
128
+source code needed to generate, install, and (for an executable work) run the object
129
+code and to modify the work, including scripts to control those activities. However,
130
+it does not include the work's System Libraries, or general-purpose tools or
131
+generally available free programs which are used unmodified in performing those
132
+activities but which are not part of the work. For example, Corresponding Source
133
+includes interface definition files associated with source files for the work, and
134
+the source code for shared libraries and dynamically linked subprograms that the work
135
+is specifically designed to require, such as by intimate data communication or
136
+control flow between those subprograms and other parts of the work.
137
+
138
+The Corresponding Source need not include anything that users can regenerate
139
+automatically from other parts of the Corresponding Source.
140
+
141
+The Corresponding Source for a work in source code form is that same work.
142
+
143
+### 2. Basic Permissions.
144
+
145
+All rights granted under this License are granted for the term of copyright on the
146
+Program, and are irrevocable provided the stated conditions are met. This License
147
+explicitly affirms your unlimited permission to run the unmodified Program. The
148
+output from running a covered work is covered by this License only if the output,
149
+given its content, constitutes a covered work. This License acknowledges your rights
150
+of fair use or other equivalent, as provided by copyright law.
151
+
152
+You may make, run and propagate covered works that you do not convey, without
153
+conditions so long as your license otherwise remains in force. You may convey covered
154
+works to others for the sole purpose of having them make modifications exclusively
155
+for you, or provide you with facilities for running those works, provided that you
156
+comply with the terms of this License in conveying all material for which you do not
157
+control copyright. Those thus making or running the covered works for you must do so
158
+exclusively on your behalf, under your direction and control, on terms that prohibit
159
+them from making any copies of your copyrighted material outside their relationship
160
+with you.
161
+
162
+Conveying under any other circumstances is permitted solely under the conditions
163
+stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
164
+
165
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
166
+
167
+No covered work shall be deemed part of an effective technological measure under any
168
+applicable law fulfilling obligations under article 11 of the WIPO copyright treaty
169
+adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention
170
+of such measures.
171
+
172
+When you convey a covered work, you waive any legal power to forbid circumvention of
173
+technological measures to the extent such circumvention is effected by exercising
174
+rights under this License with respect to the covered work, and you disclaim any
175
+intention to limit operation or modification of the work as a means of enforcing,
176
+against the work's users, your or third parties' legal rights to forbid circumvention
177
+of technological measures.
178
+
179
+### 4. Conveying Verbatim Copies.
180
+
181
+You may convey verbatim copies of the Program's source code as you receive it, in any
182
+medium, provided that you conspicuously and appropriately publish on each copy an
183
+appropriate copyright notice; keep intact all notices stating that this License and
184
+any non-permissive terms added in accord with section 7 apply to the code; keep
185
+intact all notices of the absence of any warranty; and give all recipients a copy of
186
+this License along with the Program.
187
+
188
+You may charge any price or no price for each copy that you convey, and you may offer
189
+support or warranty protection for a fee.
190
+
191
+### 5. Conveying Modified Source Versions.
192
+
193
+You may convey a work based on the Program, or the modifications to produce it from
194
+the Program, in the form of source code under the terms of section 4, provided that
195
+you also meet all of these conditions:
196
+
197
+* **a)** The work must carry prominent notices stating that you modified it, and giving a
198
+relevant date.
199
+* **b)** The work must carry prominent notices stating that it is released under this
200
+License and any conditions added under section 7. This requirement modifies the
201
+requirement in section 4 to &ldquo;keep intact all notices&rdquo;.
202
+* **c)** You must license the entire work, as a whole, under this License to anyone who
203
+comes into possession of a copy. This License will therefore apply, along with any
204
+applicable section 7 additional terms, to the whole of the work, and all its parts,
205
+regardless of how they are packaged. This License gives no permission to license the
206
+work in any other way, but it does not invalidate such permission if you have
207
+separately received it.
208
+* **d)** If the work has interactive user interfaces, each must display Appropriate Legal
209
+Notices; however, if the Program has interactive interfaces that do not display
210
+Appropriate Legal Notices, your work need not make them do so.
211
+
212
+A compilation of a covered work with other separate and independent works, which are
213
+not by their nature extensions of the covered work, and which are not combined with
214
+it such as to form a larger program, in or on a volume of a storage or distribution
215
+medium, is called an &ldquo;aggregate&rdquo; if the compilation and its resulting
216
+copyright are not used to limit the access or legal rights of the compilation's users
217
+beyond what the individual works permit. Inclusion of a covered work in an aggregate
218
+does not cause this License to apply to the other parts of the aggregate.
219
+
220
+### 6. Conveying Non-Source Forms.
221
+
222
+You may convey a covered work in object code form under the terms of sections 4 and
223
+5, provided that you also convey the machine-readable Corresponding Source under the
224
+terms of this License, in one of these ways:
225
+
226
+* **a)** Convey the object code in, or embodied in, a physical product (including a
227
+physical distribution medium), accompanied by the Corresponding Source fixed on a
228
+durable physical medium customarily used for software interchange.
229
+* **b)** Convey the object code in, or embodied in, a physical product (including a
230
+physical distribution medium), accompanied by a written offer, valid for at least
231
+three years and valid for as long as you offer spare parts or customer support for
232
+that product model, to give anyone who possesses the object code either (1) a copy of
233
+the Corresponding Source for all the software in the product that is covered by this
234
+License, on a durable physical medium customarily used for software interchange, for
235
+a price no more than your reasonable cost of physically performing this conveying of
236
+source, or (2) access to copy the Corresponding Source from a network server at no
237
+charge.
238
+* **c)** Convey individual copies of the object code with a copy of the written offer to
239
+provide the Corresponding Source. This alternative is allowed only occasionally and
240
+noncommercially, and only if you received the object code with such an offer, in
241
+accord with subsection 6b.
242
+* **d)** Convey the object code by offering access from a designated place (gratis or for
243
+a charge), and offer equivalent access to the Corresponding Source in the same way
244
+through the same place at no further charge. You need not require recipients to copy
245
+the Corresponding Source along with the object code. If the place to copy the object
246
+code is a network server, the Corresponding Source may be on a different server
247
+(operated by you or a third party) that supports equivalent copying facilities,
248
+provided you maintain clear directions next to the object code saying where to find
249
+the Corresponding Source. Regardless of what server hosts the Corresponding Source,
250
+you remain obligated to ensure that it is available for as long as needed to satisfy
251
+these requirements.
252
+* **e)** Convey the object code using peer-to-peer transmission, provided you inform
253
+other peers where the object code and Corresponding Source of the work are being
254
+offered to the general public at no charge under subsection 6d.
255
+
256
+A separable portion of the object code, whose source code is excluded from the
257
+Corresponding Source as a System Library, need not be included in conveying the
258
+object code work.
259
+
260
+A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which
261
+means any tangible personal property which is normally used for personal, family, or
262
+household purposes, or (2) anything designed or sold for incorporation into a
263
+dwelling. In determining whether a product is a consumer product, doubtful cases
264
+shall be resolved in favor of coverage. For a particular product received by a
265
+particular user, &ldquo;normally used&rdquo; refers to a typical or common use of
266
+that class of product, regardless of the status of the particular user or of the way
267
+in which the particular user actually uses, or expects or is expected to use, the
268
+product. A product is a consumer product regardless of whether the product has
269
+substantial commercial, industrial or non-consumer uses, unless such uses represent
270
+the only significant mode of use of the product.
271
+
272
+&ldquo;Installation Information&rdquo; for a User Product means any methods,
273
+procedures, authorization keys, or other information required to install and execute
274
+modified versions of a covered work in that User Product from a modified version of
275
+its Corresponding Source. The information must suffice to ensure that the continued
276
+functioning of the modified object code is in no case prevented or interfered with
277
+solely because modification has been made.
278
+
279
+If you convey an object code work under this section in, or with, or specifically for
280
+use in, a User Product, and the conveying occurs as part of a transaction in which
281
+the right of possession and use of the User Product is transferred to the recipient
282
+in perpetuity or for a fixed term (regardless of how the transaction is
283
+characterized), the Corresponding Source conveyed under this section must be
284
+accompanied by the Installation Information. But this requirement does not apply if
285
+neither you nor any third party retains the ability to install modified object code
286
+on the User Product (for example, the work has been installed in ROM).
287
+
288
+The requirement to provide Installation Information does not include a requirement to
289
+continue to provide support service, warranty, or updates for a work that has been
290
+modified or installed by the recipient, or for the User Product in which it has been
291
+modified or installed. Access to a network may be denied when the modification itself
292
+materially and adversely affects the operation of the network or violates the rules
293
+and protocols for communication across the network.
294
+
295
+Corresponding Source conveyed, and Installation Information provided, in accord with
296
+this section must be in a format that is publicly documented (and with an
297
+implementation available to the public in source code form), and must require no
298
+special password or key for unpacking, reading or copying.
299
+
300
+### 7. Additional Terms.
301
+
302
+&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
303
+License by making exceptions from one or more of its conditions. Additional
304
+permissions that are applicable to the entire Program shall be treated as though they
305
+were included in this License, to the extent that they are valid under applicable
306
+law. If additional permissions apply only to part of the Program, that part may be
307
+used separately under those permissions, but the entire Program remains governed by
308
+this License without regard to the additional permissions.
309
+
310
+When you convey a copy of a covered work, you may at your option remove any
311
+additional permissions from that copy, or from any part of it. (Additional
312
+permissions may be written to require their own removal in certain cases when you
313
+modify the work.) You may place additional permissions on material, added by you to a
314
+covered work, for which you have or can give appropriate copyright permission.
315
+
316
+Notwithstanding any other provision of this License, for material you add to a
317
+covered work, you may (if authorized by the copyright holders of that material)
318
+supplement the terms of this License with terms:
319
+
320
+* **a)** Disclaiming warranty or limiting liability differently from the terms of
321
+sections 15 and 16 of this License; or
322
+* **b)** Requiring preservation of specified reasonable legal notices or author
323
+attributions in that material or in the Appropriate Legal Notices displayed by works
324
+containing it; or
325
+* **c)** Prohibiting misrepresentation of the origin of that material, or requiring that
326
+modified versions of such material be marked in reasonable ways as different from the
327
+original version; or
328
+* **d)** Limiting the use for publicity purposes of names of licensors or authors of the
329
+material; or
330
+* **e)** Declining to grant rights under trademark law for use of some trade names,
331
+trademarks, or service marks; or
332
+* **f)** Requiring indemnification of licensors and authors of that material by anyone
333
+who conveys the material (or modified versions of it) with contractual assumptions of
334
+liability to the recipient, for any liability that these contractual assumptions
335
+directly impose on those licensors and authors.
336
+
337
+All other non-permissive additional terms are considered &ldquo;further
338
+restrictions&rdquo; within the meaning of section 10. If the Program as you received
339
+it, or any part of it, contains a notice stating that it is governed by this License
340
+along with a term that is a further restriction, you may remove that term. If a
341
+license document contains a further restriction but permits relicensing or conveying
342
+under this License, you may add to a covered work material governed by the terms of
343
+that license document, provided that the further restriction does not survive such
344
+relicensing or conveying.
345
+
346
+If you add terms to a covered work in accord with this section, you must place, in
347
+the relevant source files, a statement of the additional terms that apply to those
348
+files, or a notice indicating where to find the applicable terms.
349
+
350
+Additional terms, permissive or non-permissive, may be stated in the form of a
351
+separately written license, or stated as exceptions; the above requirements apply
352
+either way.
353
+
354
+### 8. Termination.
355
+
356
+You may not propagate or modify a covered work except as expressly provided under
357
+this License. Any attempt otherwise to propagate or modify it is void, and will
358
+automatically terminate your rights under this License (including any patent licenses
359
+granted under the third paragraph of section 11).
360
+
361
+However, if you cease all violation of this License, then your license from a
362
+particular copyright holder is reinstated (a) provisionally, unless and until the
363
+copyright holder explicitly and finally terminates your license, and (b) permanently,
364
+if the copyright holder fails to notify you of the violation by some reasonable means
365
+prior to 60 days after the cessation.
366
+
367
+Moreover, your license from a particular copyright holder is reinstated permanently
368
+if the copyright holder notifies you of the violation by some reasonable means, this
369
+is the first time you have received notice of violation of this License (for any
370
+work) from that copyright holder, and you cure the violation prior to 30 days after
371
+your receipt of the notice.
372
+
373
+Termination of your rights under this section does not terminate the licenses of
374
+parties who have received copies or rights from you under this License. If your
375
+rights have been terminated and not permanently reinstated, you do not qualify to
376
+receive new licenses for the same material under section 10.
377
+
378
+### 9. Acceptance Not Required for Having Copies.
379
+
380
+You are not required to accept this License in order to receive or run a copy of the
381
+Program. Ancillary propagation of a covered work occurring solely as a consequence of
382
+using peer-to-peer transmission to receive a copy likewise does not require
383
+acceptance. However, nothing other than this License grants you permission to
384
+propagate or modify any covered work. These actions infringe copyright if you do not
385
+accept this License. Therefore, by modifying or propagating a covered work, you
386
+indicate your acceptance of this License to do so.
387
+
388
+### 10. Automatic Licensing of Downstream Recipients.
389
+
390
+Each time you convey a covered work, the recipient automatically receives a license
391
+from the original licensors, to run, modify and propagate that work, subject to this
392
+License. You are not responsible for enforcing compliance by third parties with this
393
+License.
394
+
395
+An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
396
+organization, or substantially all assets of one, or subdividing an organization, or
397
+merging organizations. If propagation of a covered work results from an entity
398
+transaction, each party to that transaction who receives a copy of the work also
399
+receives whatever licenses to the work the party's predecessor in interest had or
400
+could give under the previous paragraph, plus a right to possession of the
401
+Corresponding Source of the work from the predecessor in interest, if the predecessor
402
+has it or can get it with reasonable efforts.
403
+
404
+You may not impose any further restrictions on the exercise of the rights granted or
405
+affirmed under this License. For example, you may not impose a license fee, royalty,
406
+or other charge for exercise of rights granted under this License, and you may not
407
+initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging
408
+that any patent claim is infringed by making, using, selling, offering for sale, or
409
+importing the Program or any portion of it.
410
+
411
+### 11. Patents.
412
+
413
+A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
414
+License of the Program or a work on which the Program is based. The work thus
415
+licensed is called the contributor's &ldquo;contributor version&rdquo;.
416
+
417
+A contributor's &ldquo;essential patent claims&rdquo; are all patent claims owned or
418
+controlled by the contributor, whether already acquired or hereafter acquired, that
419
+would be infringed by some manner, permitted by this License, of making, using, or
420
+selling its contributor version, but do not include claims that would be infringed
421
+only as a consequence of further modification of the contributor version. For
422
+purposes of this definition, &ldquo;control&rdquo; includes the right to grant patent
423
+sublicenses in a manner consistent with the requirements of this License.
424
+
425
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent license
426
+under the contributor's essential patent claims, to make, use, sell, offer for sale,
427
+import and otherwise run, modify and propagate the contents of its contributor
428
+version.
429
+
430
+In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
431
+agreement or commitment, however denominated, not to enforce a patent (such as an
432
+express permission to practice a patent or covenant not to sue for patent
433
+infringement). To &ldquo;grant&rdquo; such a patent license to a party means to make
434
+such an agreement or commitment not to enforce a patent against the party.
435
+
436
+If you convey a covered work, knowingly relying on a patent license, and the
437
+Corresponding Source of the work is not available for anyone to copy, free of charge
438
+and under the terms of this License, through a publicly available network server or
439
+other readily accessible means, then you must either (1) cause the Corresponding
440
+Source to be so available, or (2) arrange to deprive yourself of the benefit of the
441
+patent license for this particular work, or (3) arrange, in a manner consistent with
442
+the requirements of this License, to extend the patent license to downstream
443
+recipients. &ldquo;Knowingly relying&rdquo; means you have actual knowledge that, but
444
+for the patent license, your conveying the covered work in a country, or your
445
+recipient's use of the covered work in a country, would infringe one or more
446
+identifiable patents in that country that you have reason to believe are valid.
447
+
448
+If, pursuant to or in connection with a single transaction or arrangement, you
449
+convey, or propagate by procuring conveyance of, a covered work, and grant a patent
450
+license to some of the parties receiving the covered work authorizing them to use,
451
+propagate, modify or convey a specific copy of the covered work, then the patent
452
+license you grant is automatically extended to all recipients of the covered work and
453
+works based on it.
454
+
455
+A patent license is &ldquo;discriminatory&rdquo; if it does not include within the
456
+scope of its coverage, prohibits the exercise of, or is conditioned on the
457
+non-exercise of one or more of the rights that are specifically granted under this
458
+License. You may not convey a covered work if you are a party to an arrangement with
459
+a third party that is in the business of distributing software, under which you make
460
+payment to the third party based on the extent of your activity of conveying the
461
+work, and under which the third party grants, to any of the parties who would receive
462
+the covered work from you, a discriminatory patent license (a) in connection with
463
+copies of the covered work conveyed by you (or copies made from those copies), or (b)
464
+primarily for and in connection with specific products or compilations that contain
465
+the covered work, unless you entered into that arrangement, or that patent license
466
+was granted, prior to 28 March 2007.
467
+
468
+Nothing in this License shall be construed as excluding or limiting any implied
469
+license or other defenses to infringement that may otherwise be available to you
470
+under applicable patent law.
471
+
472
+### 12. No Surrender of Others' Freedom.
473
+
474
+If conditions are imposed on you (whether by court order, agreement or otherwise)
475
+that contradict the conditions of this License, they do not excuse you from the
476
+conditions of this License. If you cannot convey a covered work so as to satisfy
477
+simultaneously your obligations under this License and any other pertinent
478
+obligations, then as a consequence you may not convey it at all. For example, if you
479
+agree to terms that obligate you to collect a royalty for further conveying from
480
+those to whom you convey the Program, the only way you could satisfy both those terms
481
+and this License would be to refrain entirely from conveying the Program.
482
+
483
+### 13. Use with the GNU Affero General Public License.
484
+
485
+Notwithstanding any other provision of this License, you have permission to link or
486
+combine any covered work with a work licensed under version 3 of the GNU Affero
487
+General Public License into a single combined work, and to convey the resulting work.
488
+The terms of this License will continue to apply to the part which is the covered
489
+work, but the special requirements of the GNU Affero General Public License, section
490
+13, concerning interaction through a network will apply to the combination as such.
491
+
492
+### 14. Revised Versions of this License.
493
+
494
+The Free Software Foundation may publish revised and/or new versions of the GNU
495
+General Public License from time to time. Such new versions will be similar in spirit
496
+to the present version, but may differ in detail to address new problems or concerns.
497
+
498
+Each version is given a distinguishing version number. If the Program specifies that
499
+a certain numbered version of the GNU General Public License &ldquo;or any later
500
+version&rdquo; applies to it, you have the option of following the terms and
501
+conditions either of that numbered version or of any later version published by the
502
+Free Software Foundation. If the Program does not specify a version number of the GNU
503
+General Public License, you may choose any version ever published by the Free
504
+Software Foundation.
505
+
506
+If the Program specifies that a proxy can decide which future versions of the GNU
507
+General Public License can be used, that proxy's public statement of acceptance of a
508
+version permanently authorizes you to choose that version for the Program.
509
+
510
+Later license versions may give you additional or different permissions. However, no
511
+additional obligations are imposed on any author or copyright holder as a result of
512
+your choosing to follow a later version.
513
+
514
+### 15. Disclaimer of Warranty.
515
+
516
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
517
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
518
+PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY OF ANY KIND, EITHER
519
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
520
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE
521
+QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
522
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
523
+
524
+### 16. Limitation of Liability.
525
+
526
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY
527
+COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS
528
+PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
529
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
530
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE
531
+OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE
532
+WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
533
+POSSIBILITY OF SUCH DAMAGES.
534
+
535
+### 17. Interpretation of Sections 15 and 16.
536
+
537
+If the disclaimer of warranty and limitation of liability provided above cannot be
538
+given local legal effect according to their terms, reviewing courts shall apply local
539
+law that most closely approximates an absolute waiver of all civil liability in
540
+connection with the Program, unless a warranty or assumption of liability accompanies
541
+a copy of the Program in return for a fee.
542
+
543
+END OF TERMS AND CONDITIONS
544
+
545
+## How to Apply These Terms to Your New Programs
546
+
547
+If you develop a new program, and you want it to be of the greatest possible use to
548
+the public, the best way to achieve this is to make it free software which everyone
549
+can redistribute and change under these terms.
550
+
551
+To do so, attach the following notices to the program. It is safest to attach them
552
+to the start of each source file to most effectively state the exclusion of warranty;
553
+and each file should have at least the &ldquo;copyright&rdquo; line and a pointer to
554
+where the full notice is found.
555
+
556
+    <one line to give the program's name and a brief idea of what it does.>
557
+    Copyright (C) <year>  <name of author>
558
+
559
+    This program is free software: you can redistribute it and/or modify
560
+    it under the terms of the GNU General Public License as published by
561
+    the Free Software Foundation, either version 3 of the License, or
562
+    (at your option) any later version.
563
+
564
+    This program is distributed in the hope that it will be useful,
565
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
566
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
567
+    GNU General Public License for more details.
568
+
569
+    You should have received a copy of the GNU General Public License
570
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
571
+
572
+Also add information on how to contact you by electronic and paper mail.
573
+
574
+If the program does terminal interaction, make it output a short notice like this
575
+when it starts in an interactive mode:
576
+
577
+    <program>  Copyright (C) <year>  <name of author>
578
+    This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'.
579
+    This is free software, and you are welcome to redistribute it
580
+    under certain conditions; type 'show c' for details.
581
+
582
+The hypothetical commands 'show w' and 'show c' should show the appropriate parts of
583
+the General Public License. Of course, your program's commands might be different;
584
+for a GUI interface, you would use an &ldquo;about box&rdquo;.
585
+
586
+You should also get your employer (if you work as a programmer) or school, if any, to
587
+sign a &ldquo;copyright disclaimer&rdquo; for the program, if necessary. For more
588
+information on this, and how to apply and follow the GNU GPL, see
589
+&lt;<http://www.gnu.org/licenses/>&gt;.
590
+
591
+The GNU General Public License does not permit incorporating your program into
592
+proprietary programs. If your program is a subroutine library, you may consider it
593
+more useful to permit linking proprietary applications with the library. If this is
594
+what you want to do, use the GNU Lesser General Public License instead of this
595
+License. But first, please read
596
+&lt;<http://www.gnu.org/philosophy/why-not-lgpl.html>&gt;.

+ 0
- 188
Marlin/COPYING View File

@@ -1,188 +0,0 @@
1
-GNU GENERAL PUBLIC LICENSE
2
-
3
-Version 3, 29 June 2007
4
-
5
-Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
6
-
7
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
8
-Preamble
9
-
10
-The GNU General Public License is a free, copyleft license for software and other kinds of works.
11
-
12
-The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
13
-
14
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
15
-
16
-To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
17
-
18
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
19
-
20
-Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
21
-
22
-For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
23
-
24
-Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
25
-
26
-Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
27
-
28
-The precise terms and conditions for copying, distribution and modification follow.
29
-TERMS AND CONDITIONS
30
-0. Definitions.
31
-
32
-“This License” refers to version 3 of the GNU General Public License.
33
-
34
-“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
35
-
36
-“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
37
-
38
-To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
39
-
40
-A “covered work” means either the unmodified Program or a work based on the Program.
41
-
42
-To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
43
-
44
-To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
45
-
46
-An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
47
-1. Source Code.
48
-
49
-The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
50
-
51
-A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
52
-
53
-The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
54
-
55
-The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
56
-
57
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
58
-
59
-The Corresponding Source for a work in source code form is that same work.
60
-2. Basic Permissions.
61
-
62
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
63
-
64
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
65
-
66
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
67
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
68
-
69
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
70
-
71
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
72
-4. Conveying Verbatim Copies.
73
-
74
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
75
-
76
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
77
-5. Conveying Modified Source Versions.
78
-
79
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
80
-
81
-    a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
82
-    b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
83
-    c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
84
-    d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
85
-
86
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
87
-6. Conveying Non-Source Forms.
88
-
89
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
90
-
91
-    a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
92
-    b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
93
-    c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
94
-    d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
95
-    e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
96
-
97
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
98
-
99
-A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
100
-
101
-“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
102
-
103
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
104
-
105
-The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
106
-
107
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
108
-7. Additional Terms.
109
-
110
-“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
111
-
112
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
113
-
114
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
115
-
116
-    a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
117
-    b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
118
-    c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
119
-    d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
120
-    e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
121
-    f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
122
-
123
-All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
124
-
125
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
126
-
127
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
128
-8. Termination.
129
-
130
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
131
-
132
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
133
-
134
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
135
-
136
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
137
-9. Acceptance Not Required for Having Copies.
138
-
139
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
140
-10. Automatic Licensing of Downstream Recipients.
141
-
142
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
143
-
144
-An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
145
-
146
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
147
-11. Patents.
148
-
149
-A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
150
-
151
-A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
152
-
153
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
154
-
155
-In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
156
-
157
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
158
-
159
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
160
-
161
-A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
162
-
163
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
164
-12. No Surrender of Others' Freedom.
165
-
166
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
167
-13. Use with the GNU Affero General Public License.
168
-
169
-Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
170
-14. Revised Versions of this License.
171
-
172
-The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
173
-
174
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
175
-
176
-If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
177
-
178
-Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
179
-15. Disclaimer of Warranty.
180
-
181
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
182
-16. Limitation of Liability.
183
-
184
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
185
-17. Interpretation of Sections 15 and 16.
186
-
187
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
188
-

+ 1
- 0
Marlin/Configuration.h View File

@@ -392,6 +392,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
392 392
 
393 393
 
394 394
   // these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
395
+  // X and Y offsets must be integers
395 396
   #define X_PROBE_OFFSET_FROM_EXTRUDER -25
396 397
   #define Y_PROBE_OFFSET_FROM_EXTRUDER -29
397 398
   #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35

+ 113
- 13
Marlin/ConfigurationStore.cpp View File

@@ -38,15 +38,7 @@ void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size)
38 38
 // wrong data being written to the variables.
39 39
 // ALSO:  always make sure the variables in the Store and retrieve sections are in the same order.
40 40
 
41
-#define EEPROM_VERSION "V10"
42
-#ifdef DELTA
43
-	#undef EEPROM_VERSION
44
-	#define EEPROM_VERSION "V11"
45
-#endif
46
-#ifdef SCARA
47
-	#undef EEPROM_VERSION
48
-	#define EEPROM_VERSION "V12"
49
-#endif
41
+#define EEPROM_VERSION "V13"
50 42
 
51 43
 #ifdef EEPROM_SETTINGS
52 44
 void Config_StoreSettings() 
@@ -101,6 +93,31 @@ void Config_StoreSettings()
101 93
   #ifdef SCARA
102 94
   EEPROM_WRITE_VAR(i,axis_scaling);        // Add scaling for SCARA
103 95
   #endif
96
+  #ifdef FWRETRACT
97
+  EEPROM_WRITE_VAR(i,autoretract_enabled);
98
+  EEPROM_WRITE_VAR(i,retract_length);
99
+  #if EXTRUDERS > 1
100
+  EEPROM_WRITE_VAR(i,retract_length_swap);
101
+  #endif
102
+  EEPROM_WRITE_VAR(i,retract_feedrate);
103
+  EEPROM_WRITE_VAR(i,retract_zlift);
104
+  EEPROM_WRITE_VAR(i,retract_recover_length);
105
+  #if EXTRUDERS > 1
106
+  EEPROM_WRITE_VAR(i,retract_recover_length_swap);
107
+  #endif
108
+  EEPROM_WRITE_VAR(i,retract_recover_feedrate);
109
+  #endif
110
+
111
+  // Save filament sizes
112
+  EEPROM_WRITE_VAR(i, volumetric_enabled);
113
+  EEPROM_WRITE_VAR(i, filament_size[0]);
114
+  #if EXTRUDERS > 1
115
+  EEPROM_WRITE_VAR(i, filament_size[1]);
116
+  #if EXTRUDERS > 2
117
+  EEPROM_WRITE_VAR(i, filament_size[2]);
118
+  #endif
119
+  #endif
120
+  
104 121
   char ver2[4]=EEPROM_VERSION;
105 122
   i=EEPROM_OFFSET;
106 123
   EEPROM_WRITE_VAR(i,ver2); // validate data
@@ -210,11 +227,45 @@ SERIAL_ECHOLNPGM("Scaling factors:");
210 227
     SERIAL_ECHO_START;
211 228
     SERIAL_ECHOLNPGM("Recover: S=Extra length (mm) F:Speed (mm/m)");
212 229
     SERIAL_ECHO_START;
213
-    SERIAL_ECHOPAIR("   M208 S",retract_recover_length); 
214
-    SERIAL_ECHOPAIR(" F" ,retract_recover_feedrate*60); 
215
-    SERIAL_ECHOLN(""); 
230
+    SERIAL_ECHOPAIR("   M208 S",retract_recover_length);
231
+    SERIAL_ECHOPAIR(" F", retract_recover_feedrate*60);
232
+	SERIAL_ECHOLN("");
233
+    SERIAL_ECHO_START;
234
+    SERIAL_ECHOLNPGM("Auto-Retract: S=0 to disable, 1 to interpret extrude-only moves as retracts or recoveries");
235
+    SERIAL_ECHO_START;
236
+    SERIAL_ECHOPAIR("   M209 S", (unsigned long)(autoretract_enabled ? 1 : 0));
237
+    SERIAL_ECHOLN("");
238
+#if EXTRUDERS > 1
239
+    SERIAL_ECHO_START;
240
+    SERIAL_ECHOLNPGM("Multi-extruder settings:");
241
+    SERIAL_ECHO_START;
242
+    SERIAL_ECHOPAIR("   Swap retract length (mm):    ", retract_length_swap);
243
+    SERIAL_ECHOLN("");
244
+    SERIAL_ECHO_START;
245
+    SERIAL_ECHOPAIR("   Swap rec. addl. length (mm): ", retract_recover_length_swap);
246
+    SERIAL_ECHOLN("");
216 247
 #endif
217
-} 
248
+    SERIAL_ECHO_START;
249
+    if (volumetric_enabled) {
250
+        SERIAL_ECHOLNPGM("Filament settings:");
251
+        SERIAL_ECHO_START;
252
+        SERIAL_ECHOPAIR("   M200 D", filament_size[0]);
253
+        SERIAL_ECHOLN(""); 
254
+#if EXTRUDERS > 1
255
+		SERIAL_ECHO_START;
256
+        SERIAL_ECHOPAIR("   M200 T1 D", filament_size[1]);
257
+        SERIAL_ECHOLN(""); 
258
+#if EXTRUDERS > 2
259
+		SERIAL_ECHO_START;
260
+        SERIAL_ECHOPAIR("   M200 T2 D", filament_size[2]);
261
+		SERIAL_ECHOLN("");
262
+#endif
263
+#endif
264
+    } else {
265
+        SERIAL_ECHOLNPGM("Filament settings: Disabled");
266
+    }
267
+#endif
268
+}
218 269
 #endif
219 270
 
220 271
 
@@ -277,6 +328,30 @@ void Config_RetrieveSettings()
277 328
 		EEPROM_READ_VAR(i,axis_scaling);
278 329
 		#endif
279 330
 
331
+		#ifdef FWRETRACT
332
+		EEPROM_READ_VAR(i,autoretract_enabled);
333
+		EEPROM_READ_VAR(i,retract_length);
334
+		#if EXTRUDERS > 1
335
+		EEPROM_READ_VAR(i,retract_length_swap);
336
+		#endif
337
+		EEPROM_READ_VAR(i,retract_feedrate);
338
+		EEPROM_READ_VAR(i,retract_zlift);
339
+		EEPROM_READ_VAR(i,retract_recover_length);
340
+		#if EXTRUDERS > 1
341
+		EEPROM_READ_VAR(i,retract_recover_length_swap);
342
+		#endif
343
+		EEPROM_READ_VAR(i,retract_recover_feedrate);
344
+		#endif
345
+
346
+		EEPROM_READ_VAR(i, volumetric_enabled);
347
+		EEPROM_READ_VAR(i, filament_size[0]);
348
+#if EXTRUDERS > 1
349
+		EEPROM_READ_VAR(i, filament_size[1]);
350
+#if EXTRUDERS > 2
351
+		EEPROM_READ_VAR(i, filament_size[2]);
352
+#endif
353
+#endif
354
+		calculate_volumetric_multipliers();
280 355
 		// Call updatePID (similar to when we have processed M301)
281 356
 		updatePID();
282 357
         SERIAL_ECHO_START;
@@ -353,6 +428,31 @@ void Config_ResetDefault()
353 428
 #endif//PID_ADD_EXTRUSION_RATE
354 429
 #endif//PIDTEMP
355 430
 
431
+#ifdef FWRETRACT
432
+	autoretract_enabled = false;
433
+	retract_length = RETRACT_LENGTH;
434
+#if EXTRUDERS > 1
435
+	retract_length_swap = RETRACT_LENGTH_SWAP;
436
+#endif
437
+	retract_feedrate = RETRACT_FEEDRATE;
438
+	retract_zlift = RETRACT_ZLIFT;
439
+	retract_recover_length = RETRACT_RECOVER_LENGTH;
440
+#if EXTRUDERS > 1
441
+	retract_recover_length_swap = RETRACT_RECOVER_LENGTH_SWAP;
442
+#endif
443
+	retract_recover_feedrate = RETRACT_RECOVER_FEEDRATE;
444
+#endif
445
+
446
+	volumetric_enabled = false;
447
+	filament_size[0] = DEFAULT_NOMINAL_FILAMENT_DIA;
448
+#if EXTRUDERS > 1
449
+	filament_size[1] = DEFAULT_NOMINAL_FILAMENT_DIA;
450
+#if EXTRUDERS > 2
451
+	filament_size[2] = DEFAULT_NOMINAL_FILAMENT_DIA;
452
+#endif
453
+#endif
454
+	calculate_volumetric_multipliers();
455
+
356 456
 SERIAL_ECHO_START;
357 457
 SERIAL_ECHOLNPGM("Hardcoded Default Settings Loaded");
358 458
 

+ 13
- 5
Marlin/Marlin.h View File

@@ -30,7 +30,10 @@
30 30
 # include "Arduino.h"
31 31
 #else
32 32
 # include "WProgram.h"
33
-  //Arduino < 1.0.0 does not define this, so we need to do it ourselves
33
+#endif
34
+
35
+// Arduino < 1.0.0 does not define this, so we need to do it ourselves
36
+#ifndef analogInputToDigitalPin
34 37
 # define analogInputToDigitalPin(p) ((p) + A0)
35 38
 #endif
36 39
 
@@ -168,7 +171,7 @@ void manage_inactivity(bool ignore_stepper_queue=false);
168 171
 #endif
169 172
 
170 173
 
171
-enum AxisEnum {X_AXIS=0, Y_AXIS=1, Z_AXIS=2, E_AXIS=3};
174
+enum AxisEnum {X_AXIS=0, Y_AXIS=1, Z_AXIS=2, E_AXIS=3, X_HEAD=4, Y_HEAD=5};
172 175
 
173 176
 
174 177
 void FlushSerialRequestResend();
@@ -209,7 +212,9 @@ extern float homing_feedrate[];
209 212
 extern bool axis_relative_modes[];
210 213
 extern int feedmultiply;
211 214
 extern int extrudemultiply; // Sets extrude multiply factor (in percent) for all extruders
215
+extern bool volumetric_enabled;
212 216
 extern int extruder_multiply[EXTRUDERS]; // sets extrude multiply factor (in percent) for each extruder individually
217
+extern float filament_size[EXTRUDERS]; // cross-sectional area of filament (in millimeters), typically around 1.75 or 2.85, 0 disables the volumetric calculations for the extruder.
213 218
 extern float volumetric_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner
214 219
 extern float current_position[NUM_AXIS] ;
215 220
 extern float add_homing[3];
@@ -238,9 +243,9 @@ extern unsigned char fanSpeedSoftPwm;
238 243
 #endif
239 244
 
240 245
 #ifdef FILAMENT_SENSOR
241
-  extern float filament_width_nominal;  //holds the theoretical filament diameter ie., 3.00 or 1.75 
242
-  extern bool filament_sensor;  //indicates that filament sensor readings should control extrusion  
243
-  extern float filament_width_meas; //holds the filament diameter as accurately measured 
246
+  extern float filament_width_nominal;  //holds the theoretical filament diameter ie., 3.00 or 1.75
247
+  extern bool filament_sensor;  //indicates that filament sensor readings should control extrusion
248
+  extern float filament_width_meas; //holds the filament diameter as accurately measured
244 249
   extern signed char measurement_delay[];  //ring buffer to delay measurement
245 250
   extern int delay_index1, delay_index2;  //index into ring buffer
246 251
   extern float delay_dist; //delay distance counter
@@ -266,3 +271,6 @@ extern void digipot_i2c_init();
266 271
 #endif
267 272
 
268 273
 #endif
274
+
275
+extern void calculate_volumetric_multipliers();
276
+

+ 78
- 17
Marlin/Marlin_main.cpp View File

@@ -215,6 +215,15 @@ int extruder_multiply[EXTRUDERS] = {100
215 215
     #endif
216 216
   #endif
217 217
 };
218
+bool volumetric_enabled = false;
219
+float filament_size[EXTRUDERS] = { DEFAULT_NOMINAL_FILAMENT_DIA
220
+  #if EXTRUDERS > 1
221
+      , DEFAULT_NOMINAL_FILAMENT_DIA
222
+    #if EXTRUDERS > 2
223
+       , DEFAULT_NOMINAL_FILAMENT_DIA
224
+    #endif
225
+  #endif
226
+};
218 227
 float volumetric_multiplier[EXTRUDERS] = {1.0
219 228
   #if EXTRUDERS > 1
220 229
     , 1.0
@@ -367,6 +376,7 @@ const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42
367 376
 
368 377
 //Inactivity shutdown variables
369 378
 static unsigned long previous_millis_cmd = 0;
379
+static unsigned long previous_millis_ok = 0;
370 380
 static unsigned long max_inactive_time = 0;
371 381
 static unsigned long stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME*1000l;
372 382
 
@@ -636,6 +646,7 @@ void loop()
636 646
           else
637 647
           {
638 648
             SERIAL_PROTOCOLLNPGM(MSG_OK);
649
+						previous_millis_ok = millis();
639 650
           }
640 651
         }
641 652
         else
@@ -2823,21 +2834,7 @@ Sigma_Exit:
2823 2834
     #endif //BLINKM
2824 2835
     case 200: // M200 D<millimeters> set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).
2825 2836
       {
2826
-        float area = .0;
2827
-        float radius = .0;
2828
-        if(code_seen('D')) {
2829
-          radius = (float)code_value() * .5;
2830
-          if(radius == 0) {
2831
-            area = 1;
2832
-          } else {
2833
-            area = M_PI * pow(radius, 2);
2834
-          }
2835
-        } else {
2836
-          //reserved for setting filament diameter via UFID or filament measuring device
2837
-          break;
2838
-        
2839
-          
2840
-        }
2837
+
2841 2838
         tmp_extruder = active_extruder;
2842 2839
         if(code_seen('T')) {
2843 2840
           tmp_extruder = code_value();
@@ -2847,7 +2844,32 @@ Sigma_Exit:
2847 2844
             break;
2848 2845
           }
2849 2846
         }
2850
-        volumetric_multiplier[tmp_extruder] = 1 / area;
2847
+
2848
+        float area = .0;
2849
+        if(code_seen('D')) {
2850
+		  float diameter = (float)code_value();
2851
+		  if (diameter == 0.0) {
2852
+			// setting any extruder filament size disables volumetric on the assumption that
2853
+			// slicers either generate in extruder values as cubic mm or as as filament feeds
2854
+			// for all extruders
2855
+		    volumetric_enabled = false;
2856
+		  } else {
2857
+            filament_size[tmp_extruder] = (float)code_value();
2858
+			// make sure all extruders have some sane value for the filament size
2859
+			filament_size[0] = (filament_size[0] == 0.0 ? DEFAULT_NOMINAL_FILAMENT_DIA : filament_size[0]);
2860
+            #if EXTRUDERS > 1
2861
+			filament_size[1] = (filament_size[1] == 0.0 ? DEFAULT_NOMINAL_FILAMENT_DIA : filament_size[1]);
2862
+            #if EXTRUDERS > 2
2863
+			filament_size[2] = (filament_size[2] == 0.0 ? DEFAULT_NOMINAL_FILAMENT_DIA : filament_size[2]);
2864
+            #endif
2865
+            #endif
2866
+			volumetric_enabled = true;
2867
+		  }
2868
+        } else {
2869
+          //reserved for setting filament diameter via UFID or filament measuring device
2870
+          break;
2871
+        }
2872
+		calculate_volumetric_multipliers();
2851 2873
       }
2852 2874
       break;
2853 2875
     case 201: // M201
@@ -3135,12 +3157,13 @@ Sigma_Exit:
3135 3157
           }
3136 3158
         }
3137 3159
         else if (servo_index >= 0) {
3138
-          SERIAL_PROTOCOL(MSG_OK);
3160
+					SERIAL_PROTOCOL(MSG_OK);
3139 3161
           SERIAL_PROTOCOL(" Servo ");
3140 3162
           SERIAL_PROTOCOL(servo_index);
3141 3163
           SERIAL_PROTOCOL(": ");
3142 3164
           SERIAL_PROTOCOL(servos[servo_index].read());
3143 3165
           SERIAL_PROTOCOLLN("");
3166
+					previous_millis_ok = millis();
3144 3167
         }
3145 3168
       }
3146 3169
       break;
@@ -3215,6 +3238,7 @@ Sigma_Exit:
3215 3238
         SERIAL_PROTOCOL(" d:");
3216 3239
         SERIAL_PROTOCOL(unscalePID_d(bedKd));
3217 3240
         SERIAL_PROTOCOLLN("");
3241
+				previous_millis_ok = millis();
3218 3242
       }
3219 3243
       break;
3220 3244
     #endif //PIDTEMP
@@ -3505,6 +3529,7 @@ case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
3505 3529
           SERIAL_ECHO_START;
3506 3530
           SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK);
3507 3531
           SERIAL_PROTOCOLLN("");
3532
+					previous_millis_ok = millis();
3508 3533
         }
3509 3534
         else
3510 3535
         {
@@ -3891,6 +3916,7 @@ case 404:  //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
3891 3916
   ClearToSend();
3892 3917
 }
3893 3918
 
3919
+
3894 3920
 void FlushSerialRequestResend()
3895 3921
 {
3896 3922
   //char cmdbuffer[bufindr][100]="Resend:";
@@ -3908,6 +3934,7 @@ void ClearToSend()
3908 3934
     return;
3909 3935
   #endif //SDSUPPORT
3910 3936
   SERIAL_PROTOCOLLNPGM(MSG_OK);
3937
+	previous_millis_ok = millis();
3911 3938
 }
3912 3939
 
3913 3940
 void get_coordinates()
@@ -4332,6 +4359,14 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
4332 4359
   if( (millis() - previous_millis_cmd) >  max_inactive_time )
4333 4360
     if(max_inactive_time)
4334 4361
       kill();
4362
+
4363
+	// If 'OK' is garbled on sending PC won't receive it.  Both machines will wait on each other forever.
4364
+	// This resends OK if nothing is heard from PC for a while to avoid this bad case.
4365
+  if( (millis() - previous_millis_ok) >  max_inactive_time/4 ) {
4366
+		SERIAL_PROTOCOL(MSG_OK);
4367
+		previous_millis_ok=millis();
4368
+  }
4369
+
4335 4370
   if(stepper_inactive_time)  {
4336 4371
     if( (millis() - previous_millis_cmd) >  stepper_inactive_time )
4337 4372
     {
@@ -4580,3 +4615,29 @@ bool setTargetedHotend(int code){
4580 4615
   return false;
4581 4616
 }
4582 4617
 
4618
+
4619
+float calculate_volumetric_multiplier(float diameter) {
4620
+	float area = .0;
4621
+	float radius = .0;
4622
+
4623
+	radius = diameter * .5;
4624
+	if (! volumetric_enabled || radius == 0) {
4625
+		area = 1;
4626
+	}
4627
+	else {
4628
+		area = M_PI * pow(radius, 2);
4629
+	}
4630
+
4631
+	return 1.0 / area;
4632
+}
4633
+
4634
+void calculate_volumetric_multipliers() {
4635
+	volumetric_multiplier[0] = calculate_volumetric_multiplier(filament_size[0]);
4636
+#if EXTRUDERS > 1
4637
+	volumetric_multiplier[1] = calculate_volumetric_multiplier(filament_size[1]);
4638
+#if EXTRUDERS > 2
4639
+	volumetric_multiplier[2] = calculate_volumetric_multiplier(filament_size[2]);
4640
+#endif
4641
+#endif
4642
+}
4643
+

+ 0
- 156
Marlin/createTemperatureLookupMarlin.py View File

@@ -1,156 +0,0 @@
1
-#!/usr/bin/python
2
-#
3
-# Creates a C code lookup table for doing ADC to temperature conversion
4
-# on a microcontroller
5
-# based on: http://hydraraptor.blogspot.com/2007/10/measuring-temperature-easy-way.html
6
-"""Thermistor Value Lookup Table Generator
7
-
8
-Generates lookup to temperature values for use in a microcontroller in C format based on: 
9
-http://hydraraptor.blogspot.com/2007/10/measuring-temperature-easy-way.html
10
-
11
-The main use is for Arduino programs that read data from the circuit board described here:
12
-http://make.rrrf.org/ts-1.0
13
-
14
-Usage: python createTemperatureLookup.py [options]
15
-
16
-Options:
17
-  -h, --help        show this help
18
-  --rp=...          pull-up resistor
19
-  --t1=ttt:rrr      low temperature temperature:resistance point (around 25C)
20
-  --t2=ttt:rrr      middle temperature temperature:resistance point (around 150C)
21
-  --t3=ttt:rrr      high temperature temperature:resistance point (around 250C)
22
-  --num-temps=...   the number of temperature points to calculate (default: 20)
23
-"""
24
-
25
-from math import *
26
-import sys
27
-import getopt
28
-
29
-class Thermistor:
30
-    "Class to do the thermistor maths"
31
-    def __init__(self, rp, t1, r1, t2, r2, t3, r3):
32
-        t1 = t1 + 273.15               # low temperature (25C)
33
-        r1 = r1                        # resistance at low temperature
34
-        t2 = t2 + 273.15               # middle temperature (150C)
35
-        r2 = r2                        # resistance at middle temperature
36
-        t3 = t3 + 273.15               # high temperature (250C)
37
-        r3 = r3                        # resistance at high temperature
38
-        self.rp = rp                   # pull-up resistance
39
-        self.vadc = 5.0                # ADC reference
40
-        self.vcc = 5.0                 # supply voltage to potential divider
41
-        a1 = log(r1)
42
-        a2 = log(r2)
43
-        a3 = log(r3)
44
-        z = a1 - a2
45
-        y = a1 - a3
46
-        x = 1/t1 - 1/t2
47
-        w = 1/t1 - 1/t3
48
-        v = pow(a1,3) - pow(a2,3)
49
-        u = pow(a1,3) - pow(a3,3)
50
-        c3 = (x-z*w/y)/(v-z*u/y)
51
-        c2 = (x-c3*v)/z
52
-        c1 = 1/t1-c3*pow(a1,3)-c2*a1
53
-        self.c1 = c1
54
-        self.c2 = c2
55
-        self.c3 = c3
56
-
57
-    def res(self,adc):
58
-        "Convert ADC reading into a resolution"
59
-        res = self.temp(adc)-self.temp(adc+1)
60
-        return res
61
-
62
-    def v(self,adc):
63
-        "Convert ADC reading into a Voltage"
64
-        v = adc * self.vadc / (1024 )   # convert the 10 bit ADC value to a voltage
65
-        return v
66
-
67
-    def r(self,adc):
68
-        "Convert ADC reading into a resistance in Ohms"
69
-        v = adc * self.vadc / (1024 )   # convert the 10 bit ADC value to a voltage
70
-        r = self.rp * v / (self.vcc - v)    # resistance of thermistor
71
-        return r
72
-
73
-    def temp(self,adc):
74
-        "Convert ADC reading into a temperature in Celcius"
75
-        v = adc * self.vadc / (1024 )   # convert the 10 bit ADC value to a voltage
76
-        r = self.rp * v / (self.vcc - v)    # resistance of thermistor
77
-        lnr = log(r)
78
-        Tinv = self.c1 + (self.c2*lnr) + (self.c3*pow(lnr,3))
79
-        return (1/Tinv) - 273.15        # temperature
80
-
81
-    def adc(self,temp):
82
-        "Convert temperature into a ADC reading"
83
-        y = (self.c1 - (1/(temp+273.15))) / (2*self.c3)
84
-	x = sqrt(pow(self.c2 / (3*self.c3),3) + pow(y,2))
85
-        r = exp(pow(x-y,1.0/3) - pow(x+y,1.0/3)) # resistance of thermistor
86
-        return (r / (self.rp + r)) * (1024)
87
-
88
-def main(argv):
89
-
90
-    rp = 4700;
91
-    t1 = 25;
92
-    r1 = 100000;
93
-    t2 = 150;
94
-    r2 = 1641.9;
95
-    t3 = 250;
96
-    r3 = 226.15;
97
-    num_temps = int(36);
98
-    
99
-    try:
100
-        opts, args = getopt.getopt(argv, "h", ["help", "rp=", "t1=", "t2=", "t3=", "num-temps="])
101
-    except getopt.GetoptError as err:
102
-        print  str(err)
103
-        usage()
104
-        sys.exit(2)
105
-        
106
-    for opt, arg in opts:
107
-        if opt in ("-h", "--help"):
108
-            usage()
109
-            sys.exit()
110
-        elif opt == "--rp":
111
-            rp = int(arg)
112
-        elif opt == "--t1":
113
-            arg =  arg.split(':')
114
-            t1 = float( arg[0])
115
-            r1 = float( arg[1])
116
-        elif opt == "--t2":
117
-            arg =  arg.split(':')
118
-            t2 = float( arg[0])
119
-            r2 = float( arg[1])
120
-        elif opt == "--t3":
121
-            arg =  arg.split(':')
122
-            t3 = float( arg[0])
123
-            r3 = float( arg[1])
124
-        elif opt == "--num-temps":
125
-            num_temps =  int(arg)
126
-
127
-    max_adc = (1024 ) - 1
128
-    min_temp = 0
129
-    max_temp = 350
130
-    increment = int(max_adc/(num_temps-1));
131
-            
132
-    t = Thermistor(rp, t1, r1, t2, r2, t3, r3)
133
-    tmp = (min_temp - max_temp) / (num_temps-1)
134
-    print tmp
135
-    temps = range(max_temp, min_temp + tmp, tmp);
136
-
137
-    print "// Thermistor lookup table for Marlin"
138
-    print "// ./createTemperatureLookupMarlin.py --rp=%s --t1=%s:%s --t2=%s:%s --t3=%s:%s --num-temps=%s" % (rp, t1, r1, t2, r2, t3, r3, num_temps)
139
-    print "// Steinhart-Hart Coefficients: %.15g, %.15g,  %.15g " % (t.c1, t.c2, t.c3)
140
-    print "//#define NUMTEMPS %s" % (len(temps))
141
-    print "const short temptable[NUMTEMPS][2] PROGMEM = {"
142
-
143
-    counter = 0
144
-    for temp in temps:
145
-        counter = counter +1
146
-        if counter == len(temps):
147
-            print "   {(short)(%.2f*OVERSAMPLENR), %s}  // v=%s r=%s res=%s C/count" % ((t.adc(temp)), temp, t.v(t.adc(temp)), t.r(t.adc(temp)),t.res(t.adc(temp)))
148
-        else:
149
-            print "   {(short)(%.2f*OVERSAMPLENR), %s}, // v=%s r=%s res=%s C/count" % ((t.adc(temp)), temp, t.v(t.adc(temp)), t.r(t.adc(temp)),t.res(t.adc(temp)))
150
-    print "};"
151
-    
152
-def usage():
153
-    print __doc__
154
-
155
-if __name__ == "__main__":
156
-    main(sys.argv[1:])

Marlin/LCD Menu Tree.pdf → Marlin/documentation/LCD Menu Tree.pdf View File


Marlin/Menu Plans.xlsx → Marlin/documentation/Menu Plans.xlsx View File


+ 4
- 0
Marlin/dogm_lcd_implementation.h View File

@@ -366,6 +366,8 @@ static void _drawmenu_setting_edit_generic(uint8_t row, const char* pstr, char p
366 366
 #define lcd_implementation_drawmenu_setting_edit_float3(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr3(*(data)))
367 367
 #define lcd_implementation_drawmenu_setting_edit_float32_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr32(*(data)))
368 368
 #define lcd_implementation_drawmenu_setting_edit_float32(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr32(*(data)))
369
+#define lcd_implementation_drawmenu_setting_edit_float43_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr43(*(data)))
370
+#define lcd_implementation_drawmenu_setting_edit_float43(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr43(*(data)))
369 371
 #define lcd_implementation_drawmenu_setting_edit_float5_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr5(*(data)))
370 372
 #define lcd_implementation_drawmenu_setting_edit_float5(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr5(*(data)))
371 373
 #define lcd_implementation_drawmenu_setting_edit_float52_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr52(*(data)))
@@ -384,6 +386,8 @@ static void _drawmenu_setting_edit_generic(uint8_t row, const char* pstr, char p
384 386
 #define lcd_implementation_drawmenu_setting_edit_callback_float3(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr3(*(data)))
385 387
 #define lcd_implementation_drawmenu_setting_edit_callback_float32_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr32(*(data)))
386 388
 #define lcd_implementation_drawmenu_setting_edit_callback_float32(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr32(*(data)))
389
+#define lcd_implementation_drawmenu_setting_edit_callback_float43_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr43(*(data)))
390
+#define lcd_implementation_drawmenu_setting_edit_callback_float43(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr43(*(data)))
387 391
 #define lcd_implementation_drawmenu_setting_edit_callback_float5_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr5(*(data)))
388 392
 #define lcd_implementation_drawmenu_setting_edit_callback_float5(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr5(*(data)))
389 393
 #define lcd_implementation_drawmenu_setting_edit_callback_float52_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr52(*(data)))

+ 5
- 0
Marlin/language_an.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "E trangos/mm"
87 87
 #define MSG_TEMPERATURE                     "Temperatura"
88 88
 #define MSG_MOTION                          "Movimiento"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "Contrast"
90 95
 #define MSG_STORE_EPROM                     "Alzar Memoria"
91 96
 #define MSG_LOAD_EPROM                      "Cargar Memoria"

+ 5
- 0
Marlin/language_ca.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "Epassos/mm"
87 87
 #define MSG_TEMPERATURE                     "Temperatura"
88 88
 #define MSG_MOTION                          "Moviment"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "Contrast de LCD"
90 95
 #define MSG_STORE_EPROM                     "Desar a memoria"
91 96
 #define MSG_LOAD_EPROM                      "Carregar de mem."

+ 5
- 0
Marlin/language_de.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "Esteps/mm"
87 87
 #define MSG_TEMPERATURE                     "Temperatur"
88 88
 #define MSG_MOTION                          "Bewegung"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "LCD contrast"
90 95
 #define MSG_STORE_EPROM                     "EPROM speichern"
91 96
 #define MSG_LOAD_EPROM                      "EPROM laden"

+ 5
- 0
Marlin/language_en.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "Esteps/mm"
87 87
 #define MSG_TEMPERATURE                     "Temperature"
88 88
 #define MSG_MOTION                          "Motion"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "LCD contrast"
90 95
 #define MSG_STORE_EPROM                     "Store memory"
91 96
 #define MSG_LOAD_EPROM                      "Load memory"

+ 5
- 0
Marlin/language_es.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "E pasos/mm"
87 87
 #define MSG_TEMPERATURE                     "Temperatura"
88 88
 #define MSG_MOTION                          "Movimiento"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "Contraste"
90 95
 #define MSG_STORE_EPROM                     "Guardar memoria"
91 96
 #define MSG_LOAD_EPROM                      "Cargar memoria"

+ 5
- 0
Marlin/language_eu.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "E pausoak/mm"
87 87
 #define MSG_TEMPERATURE                     "Tenperatura"
88 88
 #define MSG_MOTION                          "Mugimendua"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "LCD kontrastea"
90 95
 #define MSG_STORE_EPROM                     "Gorde memoria"
91 96
 #define MSG_LOAD_EPROM                      "Kargatu memoria"

+ 5
- 0
Marlin/language_fi.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "Esteps/mm"
87 87
 #define MSG_TEMPERATURE                     "Lampotila"
88 88
 #define MSG_MOTION                          "Liike"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "LCD contrast"
90 95
 #define MSG_STORE_EPROM                     "Tallenna muistiin"
91 96
 #define MSG_LOAD_EPROM                      "Lataa muistista"

+ 5
- 0
Marlin/language_fr.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "Epas/mm"
87 87
 #define MSG_TEMPERATURE                     "Temperature"
88 88
 #define MSG_MOTION                          "Mouvement"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "Contraste LCD"
90 95
 #define MSG_STORE_EPROM                     "Sauver config"
91 96
 #define MSG_LOAD_EPROM                      "Lire config"

+ 5
- 0
Marlin/language_it.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "Epassi/mm"
87 87
 #define MSG_TEMPERATURE                     "Temperatura"
88 88
 #define MSG_MOTION                          "Movimento"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "LCD contrast"
90 95
 #define MSG_STORE_EPROM                     "Salva in EEPROM"
91 96
 #define MSG_LOAD_EPROM                      "Carica da EEPROM"

+ 5
- 0
Marlin/language_nl.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "Esteps/mm"
87 87
 #define MSG_TEMPERATURE                     "Temperatuur"
88 88
 #define MSG_MOTION                          "Beweging"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "LCD contrast"
90 95
 #define MSG_STORE_EPROM                     "Geheugen opslaan"
91 96
 #define MSG_LOAD_EPROM                      "Geheugen laden"

+ 5
- 0
Marlin/language_pl.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "krokiE/mm"
87 87
 #define MSG_TEMPERATURE                     "Temperatura"
88 88
 #define MSG_MOTION                          "Ruch"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "Kontrast LCD"
90 95
 #define MSG_STORE_EPROM                     "Zapisz w pamieci"
91 96
 #define MSG_LOAD_EPROM                      "Wczytaj z pamieci"

+ 5
- 0
Marlin/language_pt.h View File

@@ -86,6 +86,11 @@
86 86
 #define MSG_ESTEPS                          "Epasso/mm:"
87 87
 #define MSG_TEMPERATURE                     "Temperatura"
88 88
 #define MSG_MOTION                          "Movimento"
89
+#define MSG_VOLUMETRIC                      "Filament"
90
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
91
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
89 94
 #define MSG_CONTRAST                        "Contrast"
90 95
 #define MSG_STORE_EPROM                     "Guardar memoria"
91 96
 #define MSG_LOAD_EPROM                      "Carregar memoria"

+ 5
- 0
Marlin/language_ru.h View File

@@ -88,6 +88,11 @@
88 88
 #define MSG_ESTEPS                          "E шаг/mm:"
89 89
 #define MSG_TEMPERATURE                     "Температура     \x7E"
90 90
 #define MSG_MOTION                          "Скорости        \x7E"
91
+#define MSG_VOLUMETRIC                      "Filament"
92
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
93
+#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
94
+#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
95
+#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
91 96
 #define MSG_CONTRAST                        "LCD contrast"
92 97
 #define MSG_STORE_EPROM                     "Сохранить в EPROM"
93 98
 #define MSG_LOAD_EPROM                      "Загруз. из EPROM"

+ 2
- 2
Marlin/pins.h View File

@@ -904,9 +904,9 @@
904 904
   #define SCK_PIN          52
905 905
   #define MISO_PIN         50
906 906
   #define MOSI_PIN         51
907
-  #define MAX6675_SS       53
907
+  #define MAX6675_SS       66// Do not use pin 53 if there is even the remote possibility of using Dsplay/SD card
908 908
 #else
909
-  #define MAX6675_SS       49
909
+  #define MAX6675_SS       66// Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
910 910
 #endif
911 911
 
912 912
 #endif // RAMPS_OLD || RAMPS_13_EFB || RAMPS_13_EEB || RAMPS_13_EFF || 3DRAG

+ 16
- 2
Marlin/planner.cpp View File

@@ -715,11 +715,21 @@ block->steps_y = labs((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-positi
715 715
     if(feed_rate<minimumfeedrate) feed_rate=minimumfeedrate;
716 716
   } 
717 717
 
718
-  float delta_mm[4];
718
+/* This part of the code calculates the total length of the movement. 
719
+For cartesian bots, the X_AXIS is the real X movement and same for Y_AXIS.
720
+But for corexy bots, that is not true. The "X_AXIS" and "Y_AXIS" motors (that should be named to A_AXIS
721
+and B_AXIS) cannot be used for X and Y length, because A=X+Y and B=X-Y.
722
+So we need to create other 2 "AXIS", named X_HEAD and Y_HEAD, meaning the real displacement of the Head. 
723
+Having the real displacement of the head, we can calculate the total movement length and apply the desired speed.
724
+*/ 
719 725
   #ifndef COREXY
726
+    float delta_mm[4];
720 727
     delta_mm[X_AXIS] = (target[X_AXIS]-position[X_AXIS])/axis_steps_per_unit[X_AXIS];
721 728
     delta_mm[Y_AXIS] = (target[Y_AXIS]-position[Y_AXIS])/axis_steps_per_unit[Y_AXIS];
722 729
   #else
730
+    float delta_mm[6];
731
+    delta_mm[X_HEAD] = (target[X_AXIS]-position[X_AXIS])/axis_steps_per_unit[X_AXIS];
732
+    delta_mm[Y_HEAD] = (target[Y_AXIS]-position[Y_AXIS])/axis_steps_per_unit[Y_AXIS];
723 733
     delta_mm[X_AXIS] = ((target[X_AXIS]-position[X_AXIS]) + (target[Y_AXIS]-position[Y_AXIS]))/axis_steps_per_unit[X_AXIS];
724 734
     delta_mm[Y_AXIS] = ((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-position[Y_AXIS]))/axis_steps_per_unit[Y_AXIS];
725 735
   #endif
@@ -731,7 +741,11 @@ block->steps_y = labs((target[X_AXIS]-position[X_AXIS]) - (target[Y_AXIS]-positi
731 741
   } 
732 742
   else
733 743
   {
734
-    block->millimeters = sqrt(square(delta_mm[X_AXIS]) + square(delta_mm[Y_AXIS]) + square(delta_mm[Z_AXIS]));
744
+    #ifndef COREXY
745
+      block->millimeters = sqrt(square(delta_mm[X_AXIS]) + square(delta_mm[Y_AXIS]) + square(delta_mm[Z_AXIS]));
746
+	#else
747
+	  block->millimeters = sqrt(square(delta_mm[X_HEAD]) + square(delta_mm[Y_HEAD]) + square(delta_mm[Z_AXIS]));
748
+    #endif	
735 749
   }
736 750
   float inverse_millimeters = 1.0/block->millimeters;  // Inverse millimeters to remove multiple divides 
737 751
 

Marlin/create_speed_lookuptable.py → Marlin/scripts/createSpeedLookupTable.py View File


+ 156
- 0
Marlin/scripts/createTemperatureLookupMarlin.py View File

@@ -0,0 +1,156 @@
1
+#!/usr/bin/python
2
+"""Thermistor Value Lookup Table Generator
3
+
4
+Generates lookup to temperature values for use in a microcontroller in C format based on: 
5
+http://en.wikipedia.org/wiki/Steinhart-Hart_equation
6
+
7
+The main use is for Arduino programs that read data from the circuit board described here:
8
+http://make.rrrf.org/ts-1.0
9
+
10
+Usage: python createTemperatureLookup.py [options]
11
+
12
+Options:
13
+  -h, --help        show this help
14
+  --rp=...          pull-up resistor
15
+  --t1=ttt:rrr      low temperature temperature:resistance point (around 25 degC)
16
+  --t2=ttt:rrr      middle temperature temperature:resistance point (around 150 degC)
17
+  --t3=ttt:rrr      high temperature temperature:resistance point (around 250 degC)
18
+  --num-temps=...   the number of temperature points to calculate (default: 36)
19
+"""
20
+
21
+from math import *
22
+import sys
23
+import getopt
24
+
25
+"Constants"
26
+ZERO   = 273.15                             # zero point of Kelvin scale
27
+VADC   = 5                                  # ADC voltage
28
+VCC    = 5                                  # supply voltage
29
+ARES   = 2**10                              # 10 Bit ADC resolution
30
+VSTEP  = VADC / ARES                        # ADC voltage resolution
31
+TMIN   = 0                                  # lowest temperature in table
32
+TMAX   = 350                                # highest temperature in table
33
+
34
+class Thermistor:
35
+    "Class to do the thermistor maths"
36
+    def __init__(self, rp, t1, r1, t2, r2, t3, r3):
37
+        l1 = log(r1)
38
+        l2 = log(r2)
39
+        l3 = log(r3)
40
+        y1 = 1.0 / (t1 + ZERO)              # adjust scale
41
+        y2 = 1.0 / (t2 + ZERO)
42
+        y3 = 1.0 / (t3 + ZERO)
43
+        x = (y2 - y1) / (l2 - l1)
44
+        y = (y3 - y1) / (l3 - l1)
45
+        c = (y - x) / ((l3 - l2) * (l1 + l2 + l3))
46
+        b = x - c * (l1**2 + l2**2 + l1*l2)
47
+        a = y1 - (b + l1**2 *c)*l1
48
+        
49
+        if c < 0:
50
+            print "//////////////////////////////////////////////////////////////////////////////////////"
51
+            print "// WARNING: negative coefficient 'c'! Something may be wrong with the measurements! //"
52
+            print "//////////////////////////////////////////////////////////////////////////////////////"
53
+            c = -c
54
+        self.c1 = a                         # Steinhart-Hart coefficients
55
+        self.c2 = b
56
+        self.c3 = c
57
+        self.rp = rp                        # pull-up resistance
58
+
59
+    def resol(self, adc):
60
+        "Convert ADC reading into a resolution"
61
+        res = self.temp(adc)-self.temp(adc+1)
62
+        return res
63
+
64
+    def voltage(self, adc):
65
+        "Convert ADC reading into a Voltage"
66
+        return adc * VSTEP                     # convert the 10 bit ADC value to a voltage
67
+
68
+    def resist(self, adc):
69
+        "Convert ADC reading into a resistance in Ohms"
70
+        r = self.rp * self.voltage(adc) / (VCC - self.voltage(adc)) # resistance of thermistor
71
+        return r
72
+
73
+    def temp(self, adc):
74
+        "Convert ADC reading into a temperature in Celcius"
75
+        l = log(self.resist(adc))
76
+        Tinv = self.c1 + self.c2*l + self.c3* l**3) # inverse temperature
77
+        return (1/Tinv) - ZERO              # temperature
78
+
79
+    def adc(self, temp):
80
+        "Convert temperature into a ADC reading"
81
+        x = (self.c1 - (1.0 / (temp+ZERO))) / (2*self.c3)
82
+        y = sqrt((self.c2 / (3*self.c3)**3 + x**2)
83
+        r = exp((y-x)**(1.0/3) - (y+x)**(1.0/3))
84
+        return (r / (self.rp + r)) * ARES
85
+
86
+def main(argv):
87
+    "Default values"
88
+    t1 = 25                                 # low temperature in Kelvin (25 degC)
89
+    r1 = 100000                             # resistance at low temperature (10 kOhm)
90
+    t2 = 150                                # middle temperature in Kelvin (150 degC)
91
+    r2 = 1641.9                             # resistance at middle temperature (1.6 KOhm)
92
+    t3 = 250                                # high temperature in Kelvin (250 degC)
93
+    r3 = 226.15                             # resistance at high temperature (226.15 Ohm)
94
+    rp = 4700;                              # pull-up resistor (4.7 kOhm)
95
+    num_temps = 36;                         # number of entries for look-up table
96
+    
97
+    try:
98
+        opts, args = getopt.getopt(argv, "h", ["help", "rp=", "t1=", "t2=", "t3=", "num-temps="])
99
+    except getopt.GetoptError as err:
100
+        print  str(err)
101
+        usage()
102
+        sys.exit(2)
103
+
104
+    for opt, arg in opts:
105
+        if opt in ("-h", "--help"):
106
+            usage()
107
+            sys.exit()
108
+        elif opt == "--rp":
109
+            rp = int(arg)
110
+        elif opt == "--t1":
111
+            arg =  arg.split(':')
112
+            t1 = float(arg[0])
113
+            r1 = float(arg[1])
114
+        elif opt == "--t2":
115
+            arg =  arg.split(':')
116
+            t2 = float(arg[0])
117
+            r2 = float(arg[1])
118
+        elif opt == "--t3":
119
+            arg =  arg.split(':')
120
+            t3 = float(arg[0])
121
+            r3 = float(arg[1])
122
+        elif opt == "--num-temps":
123
+            num_temps = int(arg)
124
+
125
+    t = Thermistor(rp, t1, r1, t2, r2, t3, r3)
126
+    increment = int((ARES-1)/(num_temps-1));
127
+    step = (TMIN-TMAX) / (num_temps-1)
128
+    low_bound = t.temp(ARES-1);
129
+    up_bound = t.temp(1);
130
+    min_temp = int(TMIN if TMIN > low_bound else low_bound)
131
+    max_temp = int(TMAX if TMAX < up_bound else up_bound)
132
+    temps = range(max_temp, TMIN+step, step);
133
+
134
+    print "// Thermistor lookup table for Marlin"
135
+    print "// ./createTemperatureLookupMarlin.py --rp=%s --t1=%s:%s --t2=%s:%s --t3=%s:%s --num-temps=%s" % (rp, t1, r1, t2, r2, t3, r3, num_temps)
136
+    print "// Steinhart-Hart Coefficients: a=%.15g, b=%.15g, c=%.15g " % (t.c1, t.c2, t.c3)
137
+    print "// Theoretical limits of termistor: %.2f to %.2f degC" % (low_bound, up_bound)
138
+    print
139
+    print "#define NUMTEMPS %s" % (len(temps))
140
+    print "const short temptable[NUMTEMPS][2] PROGMEM = {"
141
+
142
+    for temp in temps:
143
+        adc = t.adc(temp)
144
+        print "    { (short) (%7.2f * OVERSAMPLENR ), %4s }%s // v=%.3f\tr=%.3f\tres=%.3f degC/count" % (adc , temp, \
145
+                        ',' if temp != temps[-1] else ' ', \
146
+                        t.voltage(adc), \
147
+                        t.resist( adc), \
148
+                        t.resol(  adc) \
149
+                    )
150
+    print "};"
151
+
152
+def usage():
153
+    print __doc__
154
+
155
+if __name__ == "__main__":
156
+    main(sys.argv[1:])

+ 3
- 3
Marlin/temperature.cpp View File

@@ -582,9 +582,9 @@ void manage_heater()
582 582
 		  temp_dState_bed = pid_input;
583 583
 
584 584
 		  pid_output = pTerm_bed + iTerm_bed - dTerm_bed;
585
-          	  if (pid_output > MAX_BED_PID) {
585
+          	  if (pid_output > MAX_BED_POWER) {
586 586
             	    if (pid_error_bed > 0 )  temp_iState_bed -= pid_error_bed; // conditional un-integration
587
-                    pid_output=PID_MAX;
587
+                    pid_output=MAX_BED_POWER;
588 588
           	  } else if (pid_output < 0){
589 589
             	    if (pid_error_bed < 0 )  temp_iState_bed -= pid_error_bed; // conditional un-integration
590 590
                     pid_output=0;
@@ -1049,7 +1049,7 @@ void thermal_runaway_protection(int *state, unsigned long *timer, float temperat
1049 1049
       {
1050 1050
         *timer = millis();
1051 1051
       } 
1052
-      else if ( (millis() - *timer) > period_seconds*1000)
1052
+      else if ( (millis() - *timer) > ((unsigned long) period_seconds) * 1000)
1053 1053
       {
1054 1054
         SERIAL_ERROR_START;
1055 1055
         SERIAL_ERRORLNPGM("Thermal Runaway, system stopped! Heater_ID: ");

+ 49
- 1
Marlin/ultralcd.cpp View File

@@ -59,6 +59,7 @@ static void lcd_control_temperature_menu();
59 59
 static void lcd_control_temperature_preheat_pla_settings_menu();
60 60
 static void lcd_control_temperature_preheat_abs_settings_menu();
61 61
 static void lcd_control_motion_menu();
62
+static void lcd_control_volumetric_menu();
62 63
 #ifdef DOGLCD
63 64
 static void lcd_set_contrast();
64 65
 #endif
@@ -82,6 +83,7 @@ static void menu_action_setting_edit_bool(const char* pstr, bool* ptr);
82 83
 static void menu_action_setting_edit_int3(const char* pstr, int* ptr, int minValue, int maxValue);
83 84
 static void menu_action_setting_edit_float3(const char* pstr, float* ptr, float minValue, float maxValue);
84 85
 static void menu_action_setting_edit_float32(const char* pstr, float* ptr, float minValue, float maxValue);
86
+static void menu_action_setting_edit_float43(const char* pstr, float* ptr, float minValue, float maxValue);
85 87
 static void menu_action_setting_edit_float5(const char* pstr, float* ptr, float minValue, float maxValue);
86 88
 static void menu_action_setting_edit_float51(const char* pstr, float* ptr, float minValue, float maxValue);
87 89
 static void menu_action_setting_edit_float52(const char* pstr, float* ptr, float minValue, float maxValue);
@@ -90,6 +92,7 @@ static void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr,
90 92
 static void menu_action_setting_edit_callback_int3(const char* pstr, int* ptr, int minValue, int maxValue, menuFunc_t callbackFunc);
91 93
 static void menu_action_setting_edit_callback_float3(const char* pstr, float* ptr, float minValue, float maxValue, menuFunc_t callbackFunc);
92 94
 static void menu_action_setting_edit_callback_float32(const char* pstr, float* ptr, float minValue, float maxValue, menuFunc_t callbackFunc);
95
+static void menu_action_setting_edit_callback_float43(const char* pstr, float* ptr, float minValue, float maxValue, menuFunc_t callbackFunc);
93 96
 static void menu_action_setting_edit_callback_float5(const char* pstr, float* ptr, float minValue, float maxValue, menuFunc_t callbackFunc);
94 97
 static void menu_action_setting_edit_callback_float51(const char* pstr, float* ptr, float minValue, float maxValue, menuFunc_t callbackFunc);
95 98
 static void menu_action_setting_edit_callback_float52(const char* pstr, float* ptr, float minValue, float maxValue, menuFunc_t callbackFunc);
@@ -742,6 +745,8 @@ static void lcd_control_menu()
742 745
     MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
743 746
     MENU_ITEM(submenu, MSG_TEMPERATURE, lcd_control_temperature_menu);
744 747
     MENU_ITEM(submenu, MSG_MOTION, lcd_control_motion_menu);
748
+	MENU_ITEM(submenu, MSG_VOLUMETRIC, lcd_control_volumetric_menu);
749
+
745 750
 #ifdef DOGLCD
746 751
 //    MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63);
747 752
     MENU_ITEM(submenu, MSG_CONTRAST, lcd_set_contrast);
@@ -870,6 +875,26 @@ static void lcd_control_motion_menu()
870 875
     END_MENU();
871 876
 }
872 877
 
878
+static void lcd_control_volumetric_menu()
879
+{
880
+	START_MENU();
881
+	MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
882
+
883
+	MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled, calculate_volumetric_multipliers);
884
+
885
+	if (volumetric_enabled) {
886
+		MENU_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_0, &filament_size[0], DEFAULT_NOMINAL_FILAMENT_DIA - .5, DEFAULT_NOMINAL_FILAMENT_DIA + .5, calculate_volumetric_multipliers);
887
+#if EXTRUDERS > 1
888
+		MENU_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_1, &filament_size[1], DEFAULT_NOMINAL_FILAMENT_DIA - .5, DEFAULT_NOMINAL_FILAMENT_DIA + .5, calculate_volumetric_multipliers);
889
+#if EXTRUDERS > 2
890
+		MENU_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_2, &filament_size[2], DEFAULT_NOMINAL_FILAMENT_DIA - .5, DEFAULT_NOMINAL_FILAMENT_DIA + .5, calculate_volumetric_multipliers);
891
+#endif
892
+#endif
893
+	}
894
+
895
+	END_MENU();
896
+}
897
+
873 898
 #ifdef DOGLCD
874 899
 static void lcd_set_contrast()
875 900
 {
@@ -1013,6 +1038,7 @@ void lcd_sdcard_menu()
1013 1038
 menu_edit_type(int, int3, itostr3, 1)
1014 1039
 menu_edit_type(float, float3, ftostr3, 1)
1015 1040
 menu_edit_type(float, float32, ftostr32, 100)
1041
+menu_edit_type(float, float43, ftostr43, 1000)
1016 1042
 menu_edit_type(float, float5, ftostr5, 0.01)
1017 1043
 menu_edit_type(float, float51, ftostr51, 10)
1018 1044
 menu_edit_type(float, float52, ftostr52, 100)
@@ -1088,6 +1114,11 @@ static void menu_action_setting_edit_bool(const char* pstr, bool* ptr)
1088 1114
 {
1089 1115
     *ptr = !(*ptr);
1090 1116
 }
1117
+static void menu_action_setting_edit_callback_bool(const char* pstr, bool* ptr, menuFunc_t callback)
1118
+{
1119
+	menu_action_setting_edit_bool(pstr, ptr);
1120
+	(*callback)();
1121
+}
1091 1122
 #endif//ULTIPANEL
1092 1123
 
1093 1124
 /** LCD API **/
@@ -1482,7 +1513,24 @@ char *ftostr32(const float &x)
1482 1513
   return conv;
1483 1514
 }
1484 1515
 
1485
-// Convert float to string with 1.23 format
1516
+// Convert float to string with 1.234 format
1517
+char *ftostr43(const float &x)
1518
+{
1519
+	long xx = x * 1000;
1520
+    if (xx >= 0)
1521
+		conv[0] = (xx / 1000) % 10 + '0';
1522
+	else
1523
+		conv[0] = '-';
1524
+	xx = abs(xx);
1525
+	conv[1] = '.';
1526
+	conv[2] = (xx / 100) % 10 + '0';
1527
+	conv[3] = (xx / 10) % 10 + '0';
1528
+	conv[4] = (xx) % 10 + '0';
1529
+	conv[5] = 0;
1530
+	return conv;
1531
+}
1532
+
1533
+//Float to string with 1.23 format
1486 1534
 char *ftostr12ns(const float &x)
1487 1535
 {
1488 1536
   long xx=x*100;

+ 1
- 0
Marlin/ultralcd.h View File

@@ -118,6 +118,7 @@ char *ftostr3(const float &x);
118 118
 char *ftostr31ns(const float &x); // float to string without sign character
119 119
 char *ftostr31(const float &x);
120 120
 char *ftostr32(const float &x);
121
+char *ftostr43(const float &x);
121 122
 char *ftostr12ns(const float &x); 
122 123
 char *ftostr32sp(const float &x); // remove zero-padding from ftostr32
123 124
 char *ftostr5(const float &x);

+ 4
- 0
Marlin/ultralcd_implementation_hitachi_HD44780.h View File

@@ -693,6 +693,8 @@ static void lcd_implementation_drawmenu_setting_edit_generic_P(uint8_t row, cons
693 693
 #define lcd_implementation_drawmenu_setting_edit_float3(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr3(*(data)))
694 694
 #define lcd_implementation_drawmenu_setting_edit_float32_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr32(*(data)))
695 695
 #define lcd_implementation_drawmenu_setting_edit_float32(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr32(*(data)))
696
+#define lcd_implementation_drawmenu_setting_edit_float43_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr43(*(data)))
697
+#define lcd_implementation_drawmenu_setting_edit_float43(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr43(*(data)))
696 698
 #define lcd_implementation_drawmenu_setting_edit_float5_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr5(*(data)))
697 699
 #define lcd_implementation_drawmenu_setting_edit_float5(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr5(*(data)))
698 700
 #define lcd_implementation_drawmenu_setting_edit_float52_selected(row, pstr, pstr2, data, minValue, maxValue) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr52(*(data)))
@@ -711,6 +713,8 @@ static void lcd_implementation_drawmenu_setting_edit_generic_P(uint8_t row, cons
711 713
 #define lcd_implementation_drawmenu_setting_edit_callback_float3(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr3(*(data)))
712 714
 #define lcd_implementation_drawmenu_setting_edit_callback_float32_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr32(*(data)))
713 715
 #define lcd_implementation_drawmenu_setting_edit_callback_float32(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr32(*(data)))
716
+#define lcd_implementation_drawmenu_setting_edit_callback_float43_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr43(*(data)))
717
+#define lcd_implementation_drawmenu_setting_edit_callback_float43(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr43(*(data)))
714 718
 #define lcd_implementation_drawmenu_setting_edit_callback_float5_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr5(*(data)))
715 719
 #define lcd_implementation_drawmenu_setting_edit_callback_float5(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, ' ', ftostr5(*(data)))
716 720
 #define lcd_implementation_drawmenu_setting_edit_callback_float52_selected(row, pstr, pstr2, data, minValue, maxValue, callback) lcd_implementation_drawmenu_setting_edit_generic(row, pstr, '>', ftostr52(*(data)))

+ 6
- 2
README.md View File

@@ -1,14 +1,18 @@
1 1
 Current Status: Bug Fixing
2 2
 ===================
3 3
 
4
-What bugs are we working on: https://github.com/ErikZalm/Marlin/milestones
4
+What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201
5
+
6
+IRC channel on freenode: #marlin-firmware
7
+
8
+(baaaah, #marlin was taken)
5 9
 
6 10
 Developer Notes
7 11
 ===================
8 12
 
9 13
 - There are now 2 branches: The __development__ branch is where new features and code changes will be sorted out. This branch may have untested code in it, so please let us know if you find any bugs. When the __development__ branch has reached a state where it is stable, it will be moved to the __stable__ branch.
10 14
 
11
-- We are doing a kind of cleanup in the list of Issues and Pull Requests, the aim is to get to a state where we can certify the code as stable. To get the code tested as widely as possible we require several volunteers with a wide variety of hardware configurations willing to test the firmware and help us to certify it as stable. If you want to help out testing go to this issue and let us know: https://github.com/ErikZalm/Marlin/issues/1209
15
+- We are doing a kind of cleanup in the list of Issues and Pull Requests, the aim is to get to a state where we can certify the code as stable. To get the code tested as widely as possible we require several volunteers with a wide variety of hardware configurations willing to test the firmware and help us to certify it as stable. If you want to help out testing go to this issue and let us know: https://github.com/MarlinFirmware/Marlin/issues/1209
12 16
 
13 17
 - Before you submit any pull request, we ask that you _PLEASE_ test your code before submission, even if the change seems innocuous. When creating the pull request, please include the hardware you used for testing and a short synopsis of your testing procedure. Untested pull requests are less likely to be merged, as even slight changes create the risk of breaking the main branch.
14 18
 

Loading…
Cancel
Save