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

• 287182f785 Minor typo fix in AxiDraw settings. Rob Giseburt 2017-04-18 15:24:44 -05:00
• 8ad5211b8a Updates to UM2+ settings, switched to the new ADCDifferentialPair for UM2+ Rob Giseburt 2017-04-18 15:24:27 -05:00
• baf3bbfe79 Moved some code. No changes. Alden Hart 2017-04-17 08:17:06 -04:00
• d1e08745cc Add low level io Ryan Sturmer 2017-04-14 15:55:41 -04:00
• 9df36e25bd Fix M100.1 Ryan Sturmer 2017-04-14 13:49:24 -04:00
• 8f26732989 Motate: update reference for USB fixes Rob Giseburt 2017-04-12 20:26:37 -05:00
• d34a362ed6 Ultimaker2+: More settings adjustments Rob Giseburt 2017-04-12 20:26:19 -05:00
• ac7a7d43f5 Annotate motor power modes in comments Rob Giseburt 2017-04-12 20:26:00 -05:00
• 5b0aa6be8a Adjust dwell to internally be in milliseconds (giving more overhead before overflow) Rob Giseburt 2017-04-12 20:25:38 -05:00
• 7b629124f7 Marlin: fix M4 to be in milliseconds for Marlin flavor gcode Rob Giseburt 2017-04-12 20:24:58 -05:00
• f04256dd2e gQuintic: bump DDA clock to 400khz Rob Giseburt 2017-04-12 20:24:31 -05:00
• fef999b8f1 Cleanup Alden Hart 2017-04-12 19:31:06 -04:00
• f7c65c0f78 Some testing Alden Hart 2017-04-12 19:28:37 -04:00
• 847a2fc69c Fixed a dumb mistake. Still working on the bumps, though. Alden Hart 2017-04-12 17:51:16 -04:00
• 6949cbf44f Small change to feedhold motion stop Alden Hart 2017-04-12 14:32:53 -04:00
• 310311028c Fixed a problem where a “perfect” deceleration causes a zero length move, which cases a planner trap. Alden Hart 2017-04-12 08:44:39 -04:00
• 8e5d0384dc Fixed case where Z movement was not transferred back to p1 planner in event of a job kill. See cycle_feedhold.cpp, line 450; Comments and some cleanup Alden Hart 2017-04-12 07:48:51 -04:00
• 720cd6d415 bandaid Alden Hart 2017-04-11 15:01:34 -04:00
• 78308fca46 Added feedhold state diagram to documentation folder Alden Hart 2017-04-11 14:13:37 -04:00
• bed4f5f9f1 100.25 // Merged fixes for #263 and #265 100.25 Rob Giseburt 2017-04-11 10:14:35 -05:00
• 33cf025893 Merge pull request #266 from synthetos/dev-265-simplepro-heatbed-timeout Rob Giseburt 2017-04-11 10:12:46 -05:00
• 656e78d424 Fix #265 - lower Printrbot Simple 1608 TEMP_MIN_BED_RISE_DEGREES_OVER_TIME to 0.5 Rob Giseburt 2017-04-11 09:04:36 -05:00
• 3b4e9bb960 Ultimaker 2+: Tweaks to speeds and turned on TRAVERSE_AT_HIGH_JERK Rob Giseburt 2017-04-11 08:51:35 -05:00
• ea07e9e43d Made PLANNER_POOL_SIZE adjustable int he hardware files, and bumped it to 96 for the gquintic Rob Giseburt 2017-04-11 08:50:41 -05:00
• 1c6f81f857 Fix case where hold buffer with remainder of move was not being forward planned (plan_exec.cpp line 1045); Added additional checks to prevent feedhold from being initiated during non-motion cycles. Still needs special handling for corner cases - to be described in header comments in cycle_feedhold.cpp Alden Hart 2017-04-11 09:46:59 -04:00
• 8eb99f2513 Found segment fault in hold message preparation Alden Hart 2017-04-10 17:03:45 -04:00
• f3e950c81b stuff Alden Hart 2017-04-10 15:19:43 -04:00
• 1278b0b824 Interim commit - fixes JSON command queuing, sequencing job kill. Still has problems with embedded M30’s in the file. Which perhaps is as it should. Alden Hart 2017-04-10 12:59:57 -04:00
• 48c0eb8d4a Testing embedding a video into a page gh-pages Rob Giseburt 2017-04-10 10:51:48 -05:00
• c46c4c5eb7 Merge pull request #264 from synthetos/dev-263-G10-commands-issue Alden Hart 2017-04-10 09:25:31 -04:00
• 9fe3aac5a1 Fixed issue #263 - G10 L20 commands not working Alden Hart 2017-04-10 08:18:17 -04:00
• 008406f6e8 Minor commit - testing Alden Hart 2017-04-10 07:39:34 -04:00
• c7c8728327 ? Dan211 2017-04-09 17:33:06 -04:00
• fd4f1d7933 Merged dev-261-simple-heat-bed - fixes #261 100.24 Rob Giseburt 2017-04-05 17:06:02 -05:00
• eaac4cefbd Merge branch 'edge' of https://github.com/synthetos/g2 into edge Rob Giseburt 2017-04-05 17:04:02 -05:00
• 0f54711278 Merge pull request #262 from synthetos/dev-261-simple-heat-bed Rob Giseburt 2017-04-05 17:03:49 -05:00
• 928940e79d Adjust the Simple 1608 settings to enable H3, report on he3 changes, and fix a small typo. Rob Giseburt 2017-04-05 14:34:15 -05:00
• 864560339c Adjust temperature.cpp to allow a different timeout for the heat bed, and adjust the thermistor settings for the third heater (the bed). Rob Giseburt 2017-04-05 14:33:25 -05:00
• 099ff5b460 Update motate reference for SPI fixes Rob Giseburt 2017-04-05 08:38:50 -05:00
• ace207608d Minor cleanup, tuning, and notes Rob Giseburt 2017-04-05 08:38:11 -05:00
• f278cb156f No functional changes Alden Hart 2017-04-04 09:53:15 +02:00
• 04f2ee38e8 Working on job kill bug Alden Hart 2017-03-31 14:10:39 -04:00
• 443e6f7e8b Fixed missing interrupt call from max31865 synthetic ADC Rob Giseburt 2017-03-30 19:26:25 -05:00
• 806aa81e68 Ultimaker Interim commit Rob Giseburt 2017-03-30 18:55:31 -05:00
• 7c66159375 Comments Alden Hart 2017-03-30 11:33:10 -04:00
• dd5e15a054 -{me:null} and {md:null} now enable or disable all motors for compatability with chilipeppr -fixed some shapeoko configs, changed shapeoko2 config to single motor Y and added a dual Y config -fixed power management with gshield using the workaround described in issue #212 Dan211 2017-03-27 19:43:22 -04:00
• 4c4ee14466 Notes Alden Hart 2017-03-24 11:11:53 -04:00
• 3c441ff55d Restored overrides to their stubbed settings; some cleanup Alden Hart 2017-03-24 08:34:54 -04:00
• 3439c38072 Testing fix for in-hold job kill Alden Hart 2017-03-23 15:27:10 -04:00
• a609467986 Fix status reporting bug Alden Hart 2017-03-23 13:58:37 -04:00
• 693cb04d1a Cleanup after very messy merge Alden Hart 2017-03-23 11:50:18 -04:00
• c60dc581f7 resolved merge conflicts between edge marlin-compatibility and dev-p24 Alden Hart 2017-03-23 11:07:12 -04:00
• 39c398668d 100.23 // Merged dev-227-marlin-compat - see #227 and #244 100.23 Rob Giseburt 2017-03-21 22:33:14 -05:00
• 806384506d Merge pull request #244 from synthetos/dev-227-marlin-compat Rob Giseburt 2017-03-21 22:30:59 -05:00
• 735b9dcad7 Fix marlin compatibility bed controls not working. Rob Giseburt 2017-03-17 00:13:48 -05:00
• fc674c6d3a Update Motate to pull in support for differential ADC on SamS70 Rob Giseburt 2017-03-21 22:21:40 -05:00
• 54cb9e6534 Configure Ultimaker2+ configs to use a wheatstone config Rob Giseburt 2017-03-21 22:21:17 -05:00
• 1648e96653 Update PT100 to use differential ADC in a wheatstone config. Rob Giseburt 2017-03-21 22:20:54 -05:00
• 5031f4c8c6 Comments and cleanup Alden Hart 2017-03-21 08:04:31 -04:00
• ae0145c28f Some comments and naming changes to offsets for clarity Alden Hart 2017-03-21 06:32:45 -04:00
• 486b118458 A little cleanup. No functional changes Alden Hart 2017-03-20 20:02:20 -04:00
• 647d9e60b3 Job kill ends with END (not alarm) Alden Hart 2017-03-20 19:47:51 -04:00
• 76361a60b3 Removed overloading on get_int; shared some code on set_ints; removed set_flu() Alden Hart 2017-03-20 17:09:18 -04:00
• fc209a4cf2 Gpio changes and updates; removed some unused getters and setters Alden Hart 2017-03-20 16:20:23 -04:00
• 2a7a65efa5 Passes all get/set regressions. Fixed type coercion on GETS (not supposed to happen); Failing digital inputs for some reason; re-organized cm_set_tram() to use the nv->value_int boolean value Alden Hart 2017-03-20 09:23:54 -04:00
• dfbcc3f050 Set max line number to 2,000,000,000; Passes all line number functional tests Alden Hart 2017-03-20 08:22:08 -04:00
• 5c451cfcb4 Fixed Gcode parser to preserve large line numbers Alden Hart 2017-03-20 07:18:26 -04:00
• d7334e8a2d Fixed problem in sr_set_status_report(); fixed some compiler cast warnings Alden Hart 2017-03-20 06:31:38 -04:00
• 5f306e1657 Big commit. Added nv->value_int, and changed nv_value to nv->value_flt. Many many things changed. Passes smoke test. Now on to some real regressions. Alden Hart 2017-03-19 20:27:53 -04:00
• 36f8b9a9cc Checkpoint Alden Hart 2017-03-19 14:33:14 -04:00
• e22f5099c5 Installed union for value Alden Hart 2017-03-19 07:14:33 -04:00
• fc2ed0097d Fixed line numbers, but max reliable line number is ~8.3 million given floating point representation Alden Hart 2017-03-19 05:36:17 -04:00
• e31be2ae0d Line number validation Alden Hart 2017-03-18 20:05:48 -04:00
• d3789652cf Testing Alden Hart 2017-03-18 13:22:20 -04:00
• 94939ee72d Cleanup and comments Alden Hart 2017-03-18 10:51:54 -04:00
• 8c8be02735 Cleanup Alden Hart 2017-03-18 10:18:41 -04:00
• 283b7d65cf Adjustments in testing Alden Hart 2017-03-18 09:49:42 -04:00
• 3dc69f4f02 Got probing working; moved command values from gm.target to the unit vector; some name changes; Alden Hart 2017-03-18 08:38:11 -04:00
• 24d0fdb421 Updated request_feedhold Alden Hart 2017-03-18 06:40:29 -04:00
• 4fbaad1c33 Testing for feedhold type instead if cycle type; corrected bug in gpio edge detection for probe mode; changed feedhold with sync to feedhold with command; Alden Hart 2017-03-18 05:39:16 -04:00
• 76924d8e80 Minor commit Alden Hart 2017-03-17 13:06:18 -04:00
• d29150b50b Better final states from job kill. Tests better Alden Hart 2017-03-17 12:53:57 -04:00
• c09cd8983e Subtle but important changes to where MOTION_RUN and MOTION_STOP are set. Still in testing Alden Hart 2017-03-17 10:32:53 -04:00
• ee805beba2 Enable marlin compatibility for UM2+ Rob Giseburt 2017-03-17 00:14:08 -05:00
• 6e343c1f6d Fix marlin compatibility bed controls not working. Rob Giseburt 2017-03-17 00:13:48 -05:00
• ac3fd4785b Update motate for PWM fixes. Rob Giseburt 2017-03-16 18:11:25 -05:00
• cb4273b2de Adde ability for each heater to have it’s own min temp rise over time. Rob Giseburt 2017-03-16 18:11:17 -05:00
• f1b8d1ffdc Adjustments for quintic pinout and Ultimaker2+ settings Rob Giseburt 2017-03-16 18:10:56 -05:00
• 3e9a3e1f81 Work on job kill Alden Hart 2017-03-16 14:16:51 -04:00
• 56f29baabc Rearranged kADCn pin number to start with 1 (except Due). Made extruder and fan pins set in settings file. Updated current settings. Rob Giseburt 2017-03-16 12:05:17 -05:00
• e956468224 Stubbed in job kill changes Alden Hart 2017-03-16 12:02:33 -04:00
• 957e4fc352 Name changes and comments - no functional changes. Passes all regressions up to job kill Alden Hart 2017-03-16 11:26:08 -04:00
• d3e980d42f Restore cm_set_probe and {"prbs":true} that was broken in the merge. Rob Giseburt 2017-03-14 21:47:04 -05:00
• d2c6effb01 Cleanup configuration of temperature sensors in settings files. Rob Giseburt 2017-03-14 21:18:18 -05:00
• 80542a5831 Merge branch 'refs/heads/dev-227-marlin-compat' into dev-168-gquintic Rob Giseburt 2017-03-14 21:12:31 -05:00
• c96849c76e Added CONFIG=Ultimaker2Plus and settings_Ultimaker_2_Plus.h Rob Giseburt 2017-03-14 20:52:16 -05:00
• 54f3061979 Fix INPUTn_AVAILABLE settings for gquintic-b Rob Giseburt 2017-03-14 20:51:38 -05:00
• 1c3915c1a4 Added “heNtv” to display the sensor’s voltage reading. Added PT100 sensor and settings to choose Thermistor or PT100. Rob Giseburt 2017-03-14 20:51:00 -05:00
• 264f11df4e Update Motate reference for new ADC updates Rob Giseburt 2017-03-14 20:49:06 -05:00
• 6198917a4e Passes all regressions except job kill (still working that one) Alden Hart 2017-03-14 17:12:16 -04:00