bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
3,745 Commits 1 Branch 4 Tags
e2d69f66b29aa0957ff4610ab1a6644fe8393fca
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Wackerbarth 9d8cc24abf Continue from the line following the M999 (PR#60) 
If the printer is going to accept the M999,
then it should continue from that line number.
 2015-08-08 08:08:02 -05:00
Richard Wackerbarth 35afea1c0e Restore test 
PR#2572 Changed this because of faulty Boolean Logic

NOT(A OR (NOT B) OR (NOT C)) !=

(NOT A) AND ((NOT B) OR C))


Besides, the compiler should be smart enough to
optimize this without help from the programmer
 2015-08-04 15:22:56 -05:00
Richard Wackerbarth 3c7470dbc3 Windows doesn’t have AUTOMATIC VERSIONING yet 2015-08-03 19:34:47 -05:00
Richard Wackerbarth c54076456b Merge Overridable Options - Part 12 (PR#39) 2015-08-03 16:05:23 -05:00
Richard Wackerbarth 4a72d2ba9c Merge Support PlatformIO (PR#34) 
**** NOTE ****
This code is very EXPERIMENTAL and UNSUPPORTED
 2015-08-03 15:55:23 -05:00
Richard Wackerbarth 8afd94ed3a Version Generator for PlatformIO Builds 2015-08-03 10:33:26 -05:00
Richard Wackerbarth 4c2948a8e6 PlatformIO Build Configurations 
See http://platformio.org/
 2015-08-03 10:33:26 -05:00
Richard Wackerbarth b227d8c128 Supply a VERSION in a short form for displays 
The long descriptor will still be available in M115
 2015-08-03 08:21:09 -05:00
Richard Wackerbarth cd7828a928 This will be the 1.1.0 Release rather than 1.0.3 2015-08-03 08:08:38 -05:00
Richard Wackerbarth 4e2f5618c1 Pick up Default_version when needed 2015-08-03 08:08:37 -05:00
Richard Wackerbarth 329acc852e Canonize Option flag USE_AUTOMATIC_VERSION 2015-08-03 08:08:37 -05:00
Richard Wackerbarth a8db0aac32 Automatic Versioning was introduced in 1.6.3 2015-08-03 08:08:37 -05:00
Richard Wackerbarth 5a11d32a85 Move deprecation test to SanityCheck.h 2015-08-03 08:08:37 -05:00
Richard Wackerbarth 7bb7a52940 Bring config up-to-date 2015-08-03 07:35:33 -05:00
Richard Wackerbarth e66ab97a3c Merge Bootscreen Text (PR#24) 2015-08-03 07:15:32 -05:00
Richard Wackerbarth 866efc14fe Add Danish translations 2015-08-03 07:06:17 -05:00
Richard Wackerbarth 4b9d5cd352 Use lowercase names for serial instances 2015-08-02 23:01:39 -05:00
Richard Wackerbarth 3cfe1dce1f Merge Rigidbot Configuration (PR#2579) 2015-08-02 22:14:36 -05:00
Richard Wackerbarth eb65c57496 Merge SD_DETECT_PIN (PR#2569) 2015-08-02 22:11:47 -05:00
Richard Wackerbarth aa1d38613a Update README to reflect new repository 2015-08-01 19:34:33 -05:00
Richard Wackerbarth e309fb4bcb Merge BEEPER_PIN (PR#2564) 2015-07-31 17:14:40 -05:00
Richard Wackerbarth f32048b8f5 In for a penny, in for a pound 2015-07-31 17:13:53 -05:00
Richard Wackerbarth b217474eab Compiler Complaints about concatenated tokens (PR#2566) 2015-07-31 17:08:44 -05:00
Richard Wackerbarth d3532bd2a6 Merge Part 5 (PR#2557) 2015-07-31 01:26:09 -05:00
Richard Wackerbarth abe9905ef8 Merge Overridable Options (PR#2496) 2015-07-31 00:04:43 -05:00
Richard Wackerbarth 819fa7216e Merge Redo Servo angles (PR#2554) 2015-07-30 23:36:38 -05:00
Richard Wackerbarth 47ae96ce15 Merge Complete M200 output with M503 (PR#2506) 2015-07-30 23:33:36 -05:00
Richard Wackerbarth f9195d114b Merge Servo Endstops (PR#2543) 2015-07-30 16:39:55 -05:00
Richard Wackerbarth 525d0dc239 Configurator is out-of-date AGAIN (PR#2550) 2015-07-30 16:36:01 -05:00
Richard Wackerbarth 67c4d22984 Update Developer References 2015-07-30 07:57:11 -05:00
Richard Wackerbarth 3c1653207c Merge Memory Watcher (PR#2398) 2015-07-27 20:33:20 -05:00
Richard Wackerbarth ae00fad75b Rename as M100 2015-07-27 20:31:59 -05:00
Richard Wackerbarth a401d738df There is an echo in here 2015-07-27 20:31:59 -05:00
Richard Wackerbarth ed7d45e8f5 Memory watcher 2015-07-27 20:31:59 -05:00
Richard Wackerbarth 78b7c486fd Merge Translate additional Displays (PR#2529) 2015-07-26 20:42:11 -05:00
Richard Wackerbarth 096046c09f Merge Improve Makefile use of avrdude (PR#2477) 2015-07-26 20:32:10 -05:00
Richard Wackerbarth 960de3411b Merge Temp Sanity Checks (PR#2514) 2015-07-25 21:18:32 -05:00
Richard Wackerbarth 53d9c9ff23 Merge G29 Ending Position (PR#2498) 2015-07-24 22:08:30 -05:00
Richard Wackerbarth d233976737 Merge Servo Corrections (PR#2510) 2015-07-24 22:05:53 -05:00
Richard Wackerbarth 0a7f2a8be7 Merge MegaController & MINIPANEL (PR#2508) 2015-07-23 22:52:51 -05:00
Richard Wackerbarth a0120a533c Merge CORE_XZ (PR#2503) 2015-07-23 19:53:33 -05:00
Richard Wackerbarth 72b9e3a6ac Merge Configuration Macros (PR#2495) 2015-07-22 18:17:27 -05:00
Richard Wackerbarth b80a6a8d31 Correct Kossel Pro Configuration_adv (PR#2473) 2015-07-22 16:32:08 -05:00
Richard Wackerbarth adfcfcba95 Merge G2/G3 for Delta (PR#2469) 2015-07-19 16:19:37 -05:00
Richard Wackerbarth 39092efe88 Merge CORE_XZ (PR#2300) 2015-07-19 16:17:55 -05:00
Richard Wackerbarth 54ddc1d417 Simplify DRY RUN (PR#2358) 
Elsewhere DRYRUN turns off the heating elements
and ignores constraints on them.

Here, whenever motion is entered into the planner,
if DRY RUN is set, we instantly act as if the E_AXIS
is in the desired final position.
 2015-07-19 10:15:53 -05:00
Richard Wackerbarth c2760c3cac Merge Reduce IsDive memory usage (PR#2455) 2015-07-19 10:14:42 -05:00
Richard Wackerbarth a91263f79e Merge Clean up code_seen (PR#2395) 2015-07-16 16:41:38 -05:00
Richard Wackerbarth e0f4fc2033 Merge Cleanup (PR#2445) 2015-07-16 16:37:33 -05:00
Richard Wackerbarth ee71845d60 Merge Servo pin (PR#2425) 2015-07-15 20:53:21 -05:00
Richard Wackerbarth 2cbb85fe88 Merge Bed leveling residuals (PR#2444) 2015-07-15 19:52:42 -05:00
Richard Wackerbarth f7659f02bb Merge Config cleanup (PR#2448) 2015-07-15 19:14:29 -05:00
Richard Wackerbarth 63715aba4f Merge Anti-jitter for all servo moves (PR#2427) 2015-07-15 17:40:59 -05:00
Richard Wackerbarth e83575537a Compiler defines USBCON for USB devices (PR#2433) 2015-07-15 10:32:11 -05:00
Richard Wackerbarth 85b7cca4d0 Merge Stepper reset for RigidBot (PR#2417) 2015-07-11 16:04:56 -05:00
Richard Wackerbarth 0fd814e4f1 Merge RigidBot (PR#2401) 2015-07-09 11:37:26 -05:00
Richard Wackerbarth 3b769753eb Merge M11 fixes (PR#2394) 2015-07-07 07:04:30 -05:00
Richard Wackerbarth 316469e76a Clean up comments and spacing 2015-06-28 08:22:29 -05:00
Richard Wackerbarth 8c760f1c31 Modify Travis build to use IDE 1.6.4 2015-06-27 16:51:42 -05:00
Richard Wackerbarth cfb416fda9 Merge branch 'PrepareForIDE1.6' (PR#2306) 2015-06-27 15:49:12 -05:00
Richard Wackerbarth 9643e6c744 Make the platform.local a bit more generic 2015-06-27 15:45:25 -05:00
Richard Wackerbarth 4683645036 Vendor (Marlin) files 2015-06-27 15:45:25 -05:00
Richard Wackerbarth efd5658e32 library - SPI 2015-06-27 15:45:25 -05:00
Richard Wackerbarth 9b13e60e38 core - AT90USB… 2015-06-27 15:45:25 -05:00
Richard Wackerbarth 907032616e core - arduino 2015-06-27 15:45:25 -05:00
Richard Wackerbarth e2f2458928 library - Liquid Crystal 2015-06-27 15:45:24 -05:00
Richard Wackerbarth d8785ffc6f library - TMC26x Stepper 2015-06-27 15:45:24 -05:00
Richard Wackerbarth ae9de515b8 library - L6470 2015-06-27 15:45:24 -05:00
Richard Wackerbarth 363d7c505f library - Wire 2015-06-27 15:45:24 -05:00
Richard Wackerbarth 7592bb1f2f library - U8glib upgrade to v1.17 2015-06-27 15:45:24 -05:00
Richard Wackerbarth deea00dde3 library - U8glib 2015-06-27 15:45:23 -05:00
Richard Wackerbarth 1fd335b702 Bootloaders 2015-06-27 15:45:22 -05:00
Richard Wackerbarth bf629cf7b1 Have Travis Get additional information from the git repository 
Travis builds from a detached head.
We need to use the current branch so that versioning works properly
 2015-06-27 15:45:22 -05:00
Richard Wackerbarth 47b78ed1af Merge Implement M110 (PR#2327) 2015-06-26 18:15:09 -05:00
Richard Wackerbarth e09abb1b31 Merge Fix M600 (PR#2301) 2015-06-25 20:45:55 -05:00
Richard Wackerbarth a1e8714d5f Merge 'Ultimaker' (PR#2331) 2015-06-25 09:13:50 -05:00
Richard Wackerbarth c2cef42f8e Merge (PR#2285) 2015-06-15 20:21:01 -05:00
Richard Wackerbarth 06906bc1c8 Merge (PR#2295) 2015-06-15 20:18:21 -05:00
Richard Wackerbarth 1418470ae9 Merge PR(#2271) 2015-06-14 20:01:40 -05:00
Richard Wackerbarth 4061279218 Merge pull request #2260 from Wackerbarth/DropArduino0.x.x 
Deprecate Support for Arduino IDE < 1.0.5
 2015-06-08 17:16:25 -05:00
Richard Wackerbarth 06ae832276 Deprecate Support for Arduino IDE < 1.0.5 
Note that newer versions of the IDE can still
be made to support compilation for the older boards.
 2015-06-08 17:15:28 -05:00
Richard Wackerbarth 4c3ca0b5b6 Deprecate Support for Arduino IDE < 1.0.5 
Note that newer versions of the IDE can still
be made to support compilation for the older boards.
 2015-06-08 17:15:28 -05:00
Richard Wackerbarth d8e2f5d333 Merge pull request #2167 from thinkyhead/reverse_zoffset_sign 
Reverse the sign of zprobe_zoffset
 2015-06-08 05:10:05 -05:00
Richard Wackerbarth 1ad2c5bfc0 Merge pull request #2257 from fmalpartida/bugFixing 
Updated SAV MkI extension module header connector.
 2015-06-08 05:07:48 -05:00
Richard Wackerbarth 58941e543e ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED removed 
#defining something just to define something else doesn’t
make sense

If you want SDCARDDETECTINVERTED, just define it yourself.

If the previous code was intended to define, undefined and then again define the term, that code is improper.
 2015-06-06 21:44:59 -05:00
Richard Wackerbarth cf5d64d940 Merge PR #2118 2015-06-06 20:14:50 -05:00
Richard Wackerbarth 5239a4e839 Merge bPR #1882 2015-06-06 19:47:07 -05:00
Richard Wackerbarth 3eea5222cf Merge PR #1767 2015-06-06 19:00:27 -05:00
Richard Wackerbarth 0c7bdf569c Merge branch 'ProbeDeployment' into Development 2015-06-06 17:49:20 -05:00
Richard Wackerbarth 303d47228e Define Probe Path in new format 2015-06-06 17:48:27 -05:00
Richard Wackerbarth ad09d6a60f 3 Step Allen Key Probe 2015-06-06 17:48:27 -05:00
Richard Wackerbarth 8359cdf01d Check compatibility for Teensy-based processor 
The instruction say to set a #define in fastio.h
However, that value is not included before this test.
 2015-06-06 17:24:34 -05:00
Richard Wackerbarth 6b095af9b1 Merge branch 'GenerateVersionHeader' into Development 2015-06-06 17:21:35 -05:00
Richard Wackerbarth b3a3080b4b Suppress error when on detached head 2015-06-06 17:20:01 -05:00
Richard Wackerbarth bdf778bec2 Merge SDCARDDETECTINVERTED (#2144) 2015-06-06 16:44:13 -05:00
Richard Wackerbarth ac382cbdaf Automatic versioning for Travis builds 2015-06-02 08:13:43 -05:00
Richard Wackerbarth 2deb5a8ac5 Temporary Hack 
REVERT THIS CHANGE

In proper use, we want to force the vendor to update this file to reflect distribution parameters

However, until most users have converted to automatic versioning,
we “grant them a pass”
 2015-05-25 15:54:08 -05:00
Richard Wackerbarth b5743d6927 Use SOURCE_CODE_URL rather than FIRMWARE_URL 2015-05-25 15:53:34 -05:00
Richard Wackerbarth 5ea139fd79 Revised Versioning mechanism 2015-05-25 15:53:14 -05:00
Richard Wackerbarth b878bc5620 Introducing the Kossel Pro Build Configuration 2015-05-21 11:47:34 -05:00