bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
3,676 Commits 1 Branch 4 Tags
37d1879386d711502168b333dceb3797593e194d
Commit Graph
91 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Richard Wackerbarth 3004359191 Libraries supporting Marlin platform 2015-05-21 11:47:34 -05:00
Richard Wackerbarth 6c86266fb6 Brainwave Bootloaders 2015-05-21 11:47:34 -05:00
Richard Wackerbarth 3eee09cb6c Brainwave Variants 2015-05-21 11:47:34 -05:00
Richard Wackerbarth 945fd2cf82 Brainwave Core from Arduino 1.0.1 (In 1.5 file structure) 2015-05-21 11:47:34 -05:00
Richard Wackerbarth 1b707a7cf7 Platform and Boards 2015-05-21 11:47:34 -05:00
Richard Wackerbarth 1d8f61ca8a AT90USB is defined in pins.h 2015-05-21 11:46:54 -05:00
Richard Wackerbarth 735bf2d35f Describe Custom M Code 2015-05-21 08:06:33 -05:00
Richard Wackerbarth 46474cf2f2 Incorporate @section headers from configurator 2015-04-05 22:39:40 -05:00
Richard Wackerbarth cf66cb8808 Bring configurator up-to-date 2015-04-05 22:38:15 -05:00
Richard Wackerbarth 4119738e69 Deferring default definition made #undef unnecessary 2015-04-04 05:48:07 -05:00
Richard Wackerbarth 8f620de0ff Actually activate Automatic Versioning 2015-04-02 09:20:24 -05:00
Richard Wackerbarth ccdaea51ba Add KosselPro 2015-04-02 09:20:24 -05:00
Richard Wackerbarth f4599143eb Allow M115 to better reflect the build 2015-04-02 09:20:24 -05:00
Richard Wackerbarth a33e20b27d Adjust per-project .gitignore 
Refer to http://git-scm.com/docs/gitignore
to see why this is appropriate
 2015-04-02 09:20:24 -05:00
Richard Wackerbarth 34c7d45879 Hook for Auto-generated Build Version 
The automatic versioning system extracts a
build version number from the SCM system

That versioning information is written to the file
_Version.h, a file that is NOT preserved in the SCM.

If such a file will be present,
we include it here to utilize the parameters
that are defined therein.
 2015-04-02 09:20:24 -05:00
Richard Wackerbarth fd9beb1672 Minor typos in the README 2015-03-05 22:03:21 -06:00