Commit Graph

Select branches

Hide Pull Requests

axidraw-encoder-testing

canbus-geratech

dev-168-gquintic

dev-212-common-enable

dev-307-spring-comp

dev-omco-issue-2

digital-dro

edge

edge-087

edge-090

edge-100

edge-preview

four-cable-kinematics

gh-pages

master

omc-072.65

pressurizer

#108

#108

#109

#109

#114

#118

#12

#12

#120

#120

#125

#125

#13

#131

#131

#136

#136

#140

#151

#151

#170

#172

#174

#18

#189

#191

#199

#201

#207

#211

#217

#219

#222

#222

#224

#226

#231

#234

#236

#240

#244

#246

#254

#258

#262

#264

#266

#268

#276

#276

#285

#286

#29

#297

#297

#299

#305

#306

#308

#308

#32

#320

#320

#321

#329

#333

#334

#337

#338

#339

#341

#341

#355

#356

#358

#369

#376

#376

#377

#377

#378

#378

#39

#39

#390

#391

#391

#394

#397

#397

#402

#413

#421

#431

#431

#433

#434

#438

#440

#441

#445

#446

#446

#448

#449

#449

#450

#451

#453

#459

#475

#476

#476

#477

#483

#485

#485

#491

#496

#501

#505

#509

#511

#52

#52

#55

#59

#59

#6

#61

#82

#82

#89

#93

#93

072.65

083.08

083.09

086.03

093.00

096.00

097.00

097.02

097.03

097.04

098.22

098.23

098.24

098.25

098.26

098.27

098.28

099.01

099.02

099.03

099.04

099.05

100.00

100.01

100.02

100.03

100.04

100.08

100.10

100.11

100.12

100.13

100.14

100.15

100.16

100.17

100.18

100.19

100.21

100.22

100.23

100.24

100.25

100.26

101.01

101.02

101.03

R001

R002

R003

R004

R005

adjusted-temps

dev-169-motor-enable-polarity-candidate-001

usb-checkpoint

v072.71

z-scream-test

Mono Color

• dd0b0d95a0 Removed params args from actions. Simplified things. Alden Hart 2017-03-14 11:44:03 -04:00
• eed0e5a89a Passes !, ~ and % tests, but still failing combinations Alden Hart 2017-03-14 11:18:51 -04:00
• b58ceba8e3 Testing Alden Hart 2017-03-14 09:53:20 -04:00
• 6811849aa3 Milestone: First time it makes it all the way through a !~ cycle with actions Alden Hart 2017-03-14 07:07:03 -04:00
• c3427cf868 checkpoint Alden Hart 2017-03-13 20:12:08 -04:00
• 375142f66b checkpoint Alden Hart 2017-03-13 15:28:55 -04:00
• b1f7fa8ca6 checkpoint Alden Hart 2017-03-13 15:02:25 -04:00
• 16fc941e0c Checkpoint Alden Hart 2017-03-13 09:20:45 -04:00
• f32b9f1c9d Merge branch 'refs/heads/dev-p24-feedhold-lift' into dev-p24-feedhold-lift-exp2 Alden Hart 2017-03-13 07:16:19 -04:00
• ab92670d6a resolved merge conflicts from edge 100.22 Alden Hart 2017-03-13 06:35:24 -04:00
• ef84834781 Resolved merge conflict with edge fb100.22 Alden Hart 2017-03-12 13:56:00 -04:00
• 55fc20414d Updated build number to 100.22 100.22 Alden Hart 2017-03-12 13:42:23 -04:00
• c985060a5a Merge pull request #254 from synthetos/dev-253-text-mode-compile Alden Hart 2017-03-12 13:37:02 -04:00
• 31f617f7c6 Removed bcr from status report initialization strings (Note: spell check changed bcr to bur in previous commit. Sorry about that) Alden Hart 2017-03-12 13:31:13 -04:00
• afa8342b30 Removed bur from status report initialization string Alden Hart 2017-03-12 13:29:33 -04:00
• f923f4766a Changed device back to SAM3X8E (Due chip) Alden Hart 2017-03-12 13:20:39 -04:00
• 4a92e5a974 Corrected Issue #249 - G2/G3 radius mode resulting in Arc specification error - missing offset(s) Alden Hart 2017-03-12 13:17:15 -04:00
• 40a326a15c Fixed regression for JSON wrapped code where ’n’ is reported (was failing on read-only) Alden Hart 2017-03-12 09:24:16 -04:00
• 2675557b9b Fixed text mode compile; fixed zero length move ends in cycle regression Alden Hart 2017-03-12 08:57:32 -04:00
• 0a466861f6 Converted cm_cycle_start to use operations runner; Stubbed in motion profiles Alden Hart 2017-03-12 07:52:27 -04:00
• 7a5b0f892f Reformatting Alden Hart 2017-03-11 18:43:26 -05:00
• 7855bdb848 The ops runner is finally alive. First breath. Alden Hart 2017-03-11 15:59:31 -05:00
• 6b7f08b74c Reduced motion_state down to MOTION_STOP and MOTION_RUN Alden Hart 2017-03-11 10:12:43 -05:00
• c5a969775c Removed MOTION_HOLD state Alden Hart 2017-03-11 08:55:50 -05:00
• 741014988d Simplified cm_get_combined_state Alden Hart 2017-03-11 08:29:54 -05:00
• 66e57594b5 Checkpoint. Functioning Alden Hart 2017-03-11 07:08:44 -05:00
• 9ac4d7d1c4 unfinished work Alden Hart 2017-03-10 11:41:56 -05:00
• 6f49052679 Work in process Alden Hart 2017-03-10 06:21:42 -05:00
• 9d9ed0e98e Fix a sprint with the wrong tag Rob Giseburt 2017-03-08 22:24:17 -06:00
• ec80cbf587 Updates for new ADC API (cleaner). Rob Giseburt 2017-03-08 22:24:05 -06:00
• 87967e78e6 Update Motate for initial ADC code (broken) Rob Giseburt 2017-03-08 22:23:45 -06:00
• d770cb81d4 Fix non-Marlin compatibility compile Rob Giseburt 2017-03-07 11:20:38 -06:00
• 2ba3549759 Fix of last commit. Correct Motate reference this time. Same reason. Rob Giseburt 2017-03-07 11:09:02 -06:00
• d2c16656a5 Update Motate for the new Sam3x UART handling code. Rob Giseburt 2017-03-07 11:03:39 -06:00
• 27c59c04e9 Fix for PrintrBot Simple1608 probing with the new probing code. Rob Giseburt 2017-03-07 11:03:25 -06:00
• 6e5d073e7e Introducing checksums and sequential-line-number checking. Rob Giseburt 2017-03-07 11:03:02 -06:00
• d87b3a3e4c Removed MOTION_PLANNING from motion state. Not needed anymore. Alden Hart 2017-03-06 11:44:42 -05:00
• c457e50dd4 Changed cycle_state to cycle_type Alden Hart 2017-03-06 11:19:41 -05:00
• f265c57d7d Added Feedhold request enum and some comments about it. Alden Hart 2017-03-06 10:18:51 -05:00
• e7db065c80 Checkpoint job kill code Alden Hart 2017-03-04 14:26:38 -05:00
• b68782a5d1 Renaming and commenting - no functional changes Alden Hart 2017-03-04 10:07:18 -05:00
• 4bd5435a2a Update the display of tool change offsets in the model as they occur Alden Hart 2017-03-04 08:47:16 -05:00
• e92563d16b Fixed G92 offsets not displaying; added traps in plan_exec to see about reminding a redundant statements Alden Hart 2017-03-03 14:38:58 -05:00
• a0710b3aae Fixed position error found in regressions test FI00 Alden Hart 2017-03-03 12:54:21 -05:00
• cdf821dbaa Fixed problem with new move arriving while in feedhold. Alden Hart 2017-03-03 09:25:19 -05:00
• b30f479ff2 Updated planner state names; edited planner diagnostics Alden Hart 2017-03-03 09:06:35 -05:00
• f9dc7e6942 Stubbed in an explicit job kill command - instead of just treating it like an alarm. Alden Hart 2017-03-03 07:17:56 -05:00
• d2b27a014f Checkpoint Alden Hart 2017-03-02 15:43:57 -05:00
• dc28c0006e Checkpoint Alden Hart 2017-03-02 15:20:33 -05:00
• 926d8d3d3d Experimental Alden Hart 2017-03-02 13:24:39 -05:00
• 4228e56065 Experimental Alden Hart 2017-02-27 20:46:05 -05:00
• e0f3f159d2 Added Job Kill (^d) processing to feedholds Alden Hart 2017-02-27 13:35:23 -05:00
• af116e43e4 Added some diagnostics and commenting. Aligned with buffer diagnostics from dev-p32 Alden Hart 2017-02-27 11:02:03 -05:00
• c42846090e Project file only Alden Hart 2017-02-26 10:48:53 -05:00
• 1253d307e2 Probing, homing and feedholds working alden.hart 2017-02-25 15:40:57 -05:00
• 58b4525afc Othermill settings; comments alden.hart 2017-02-25 15:06:10 -05:00
• e5fa7c960f Testing probing code Alden Hart 2017-02-25 13:36:31 -05:00
• a56a09d72e Basic feedhold operations verified with regression tests Alden Hart 2017-02-25 12:33:39 -05:00
• b74aa9613f Minor commit Alden Hart 2017-02-25 09:27:31 -05:00
• fcaad6b524 Mostly comments Alden Hart 2017-02-24 15:53:43 -05:00
• aace4ad6e0 Speedup for gQuintic: DDA freq of 300K, and marked USB object as HOT_DATA. Rob Giseburt 2017-02-24 13:18:56 -06:00
• 73a772b138 Update Makefile and Motate to get TOOLS_VERSION matching. Rob Giseburt 2017-02-24 10:58:05 -06:00
• 166bf26e9a resolved merge conflist with edge fb100.21; compiles, throws zero length exception on probe Alden Hart 2017-02-24 11:41:21 -05:00
• 747cdf02d1 Review and formatting. No code changes other than {} wrappers in some places in bio where they were missing Alden Hart 2017-02-24 10:58:15 -05:00
• 0abc3af2de Moved Code MODAL_GROUP enums to Gcode_parser.cpp from canonical_machine.h Alden Hart 2017-02-24 10:20:52 -05:00
• c8a99ad73f Created Marlin state object (removed variables from cm.gmx); Alden Hart 2017-02-24 10:17:39 -05:00
• 86908cabe5 Code documentation and organization pass Alden Hart 2017-02-24 09:33:56 -05:00
• b97fb544d5 Fix issue where power levels are getting scaled before the per-driver stepper object. They’re now scaled (or not) inside the stepper objects. Rob Giseburt 2017-02-23 23:09:14 -06:00
• c2f5bfdb99 Adjust TMC2130 callbacks, lower processor usage noticeably Rob Giseburt 2017-02-23 22:33:44 -06:00
• c031daa512 Fix for broken Motor_3! Rob Giseburt 2017-02-23 22:33:11 -06:00
• c20684fb45 Updated reference to Motate for make clean and tools won load files on Windows. Rob Giseburt 2017-02-23 20:32:38 -06:00
• 48c4d7d75e Adding gQuadratic and gQuintic on AxiDraw v3 configs to Atmel Studio, and jlink.config. Rob Giseburt 2017-02-23 20:31:57 -06:00
• b9aa5ef493 Merge branch 'refs/heads/edge' into dev-227-marlin-compat Alden Hart 2017-02-23 15:36:23 -05:00
• 8df3aeada6 100.21 // Merged dev-209b-random-pauses to compelte USB changes (only fix travis-ci from 100.20) 100.21 Rob Giseburt 2017-02-23 10:50:11 -06:00
• 106c05a49b Working on #245 - Getting Travis working again (#246) Rob Giseburt 2017-02-23 10:43:13 -06:00
• a42c6a3759 resolved merge conflicts Alden Hart 2017-02-23 11:11:03 -05:00
• 4be0c0b7c7 Minor changes to settings Alden Hart 2017-02-23 11:01:10 -05:00
• 94f055283f Fix typo: DEBUG=0 (or no DEBUG mentioned) should work right now. Rob Giseburt 2017-02-23 09:51:46 -06:00
• d1ef58022b Merge branch 'edge' into dev-227-marlin-compat Rob Giseburt 2017-02-23 09:45:50 -06:00
• ed0f35c5d0 Update Motate to current Master to get the final USB fixes. Rob Giseburt 2017-02-23 09:28:15 -06:00
• 9668422085 Update Makefile to get rid of “missing IN_DEBUGGER” warnings. Rob Giseburt 2017-02-23 09:27:00 -06:00
• f0217205cc Fix for MOTOR_POWERED_IN_CYCLE motors disabling during long M101 waits Rob Giseburt 2017-02-15 09:50:39 -06:00
• 09532eef61 Added marlin_compatibility files to AS7 project Alden Hart 2017-02-23 09:48:15 -05:00
• 6c5359a3a2 Some changes to AS7 project file. Device now set for Arduino Due Alden Hart 2017-02-23 09:07:59 -05:00
• 6549d21e6d resolved merge conflict with edge 110.20 Alden Hart 2017-02-23 09:01:47 -05:00
• aa0adaa8ff Updated firmware build number to 110.20 Alden Hart 2017-02-23 08:38:13 -05:00
• e4a016f108 Merge pull request #236 from synthetos/dev-209b-random-pauses Alden Hart 2017-02-23 08:33:49 -05:00
• ea7586253f Breakout block normalization into a helper; Added handler for mp_get_decel_velocity() failure case; Added normalizer to feedhold block manipulation; Re-wrote the feedhold cases to be clearer; General cleanup. Alden Hart 2017-02-23 08:25:32 -05:00
• 3bbda127c4 Checkpoint - working on planner refit cases Alden Hart 2017-02-23 06:27:23 -05:00
• c04d6932f7 Solves both issues in double-weirdness Alden Hart 2017-02-22 17:15:53 -05:00
• 12c2138103 FIFY Alden Hart 2017-02-22 15:19:25 -05:00
• 9b751888f0 Simplified feedhole cases 1a - 1c prior to remaining work Alden Hart 2017-02-22 14:56:03 -05:00
• 9136aba90b HOT_FUNC and HOT_DATA assignments sprinkled all over. Also removing now-redundant abs definition. Rob Giseburt 2017-02-22 12:41:03 -06:00
• dda233f701 gQuintic: Fix redundant Servo1 pin assignment. Rob Giseburt 2017-02-22 12:40:20 -06:00
• d5c131b870 GDB file changes for ICE/Jlink independence. Rob Giseburt 2017-02-22 12:39:24 -06:00
• 0806ab6e13 Update Motate reference to get new SAMS&0 changes and new compiler. Also now supports JLink/ICE interchangeably (OSX/Linux). Rob Giseburt 2017-02-22 12:38:32 -06:00
• 526fbcc30f Modifications to mp_exec_aline(). Still has tool farts. Working on that. Alden Hart 2017-02-22 13:38:35 -05:00
• b810a01af8 Removed SysTickTimer_getValue() for real this time. Rob Giseburt 2017-02-22 11:14:27 -06:00
• a8a5ab5023 Fix for crash with an FPU: converting a float to a int32, then storing it as a int16. Rob Giseburt 2017-02-22 11:13:54 -06:00
• a22158f9dd Removing all references to SysTickTimer_getValue() … again. Rob Giseburt 2017-02-22 11:13:02 -06:00