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

• 79a5788d14 Remove spring offset code Rob Giseburt 2018-03-26 15:07:43 -05:00
• 5385fe0185 Removed commented code replaced in the merge Alden Hart 2018-03-26 15:41:24 -04:00
• f9ac1c7a6f Remove leftover ifdefs Rob Giseburt 2018-03-26 14:36:19 -05:00
• f41ec45477 Adjust analog inputs: cache computed value, and default to lowest resolution Rob Giseburt 2018-03-26 14:34:46 -05:00
• d03a10e8b8 Updated copyright dates. Tested dev-304-uvw-9axis/edge merge. Passed baseline testing. Fails Spindle test SPIN-02. ToGo - GPIO, Feedhold, Probing, Homing and Planner cases. Alden Hart 2018-03-26 12:18:26 -04:00
• 432a833747 Merged edge into dev-304, leaving old code commented out. SUccessful build, but has not yet been validated against test suite Alden Hart 2018-03-26 10:38:57 -04:00
• c3f1869271 Fixed typo in settings_default.h; fixed bug in B and C axes mapping in plan_line.cpp Alden Hart 2018-03-26 09:21:03 -04:00
• 1ff7f60092 Merge pull request #321 from benlaurie/improve-config master Rob Giseburt 2018-03-04 18:38:15 -06:00
• 29db38007c Updated Motate reference for SamS70 USB fixes Rob Giseburt 2018-03-04 18:26:19 -06:00
• cb7bf178e7 Issue #169 motor enable polarity (#306) Rob Giseburt 2018-03-04 18:18:18 -06:00
• f2f42a3262 Name collision fix with "_handler" and some code rarrangement. Rob Giseburt 2018-03-04 17:49:55 -06:00
• 8a07cee665 Renaming "Listener" to "Handler" Rob Giseburt 2018-03-04 17:39:47 -06:00
• b833230278 Finsihed adding reset, limit, and interlock event handlers Rob Giseburt 2018-03-04 17:35:01 -06:00
• 9b46efbb8a Fix Axidraw settings Rob Giseburt 2018-03-04 17:17:32 -06:00
• 02ef06a0ee Fix default settings. Rob Giseburt 2018-03-04 17:17:08 -06:00
• 23194e9f92 Initial GPIO action refactor (incomplete) Rob Giseburt 2018-03-04 17:16:11 -06:00
• 9817e0b1dd Finishing fixes for gQuadratic rev C Rob Giseburt 2018-03-04 17:13:05 -06:00
• b7ff8a524c Get rid of lots of pointless casts. Ben Laurie 2018-03-04 20:50:41 +00:00
• 1c35c925c2 Update reference to new Motate (fixes to SPI) Rob Giseburt 2018-03-01 10:16:31 -06:00
• 10f69bdc15 Finishing touches on the qQuadratic board files (fixes to pinouts on rev C) Rob Giseburt 2018-03-01 10:16:15 -06:00
• 865dd561ef Add gQuadratic rev C (need to fix motors still) Rob Giseburt 2018-02-26 18:41:31 -06:00
• 4a86b9d660 Fixing gQuintic gpio configuration for new settings Rob Giseburt 2018-02-26 18:40:58 -06:00
• 5ed86f8566 First pass at making outN and inN configured by doutNout and dinNin respectively. Rob Giseburt 2018-02-26 18:40:23 -06:00
• 3e8f4434a0 Adjustments to Ultimaker_2_Plus Rob Giseburt 2018-02-19 10:29:55 -06:00
• c827075eac Adding support for SMW3D R7 and Pendulum v2 Rob Giseburt 2018-02-19 10:29:26 -06:00
• 193493b1dc Finish support for gQuintic rev D Rob Giseburt 2018-02-19 10:18:39 -06:00
• 70a3f309e2 Major GOIO refactor Rob Giseburt 2018-02-19 10:18:13 -06:00
• 7dc5b96eeb Adjusted for latest Motate changes to SamS70 USB Rob Giseburt 2018-02-19 10:16:43 -06:00
• cebdab7eb8 Update reference to Motate for SamS70 fixes Rob Giseburt 2018-02-19 10:09:01 -06:00
• 26f86f59ff Update Jerk canbus-geratech matthew wildoer 2017-12-15 13:55:08 +11:00
• 7ee5850b85 Fixing GPIO bugs from last commit. Rob Giseburt 2017-12-13 17:22:02 -06:00
• 01d3973b93 Reforctor of GPIO in prep of adding ainN and tsN (temperature sensor) objects Rob Giseburt 2017-12-13 16:43:01 -06:00
• 40113fb049 Set USB vendor and product Sam Mellor 2017-12-12 18:01:31 +11:00
• 7329076383 Merge branch 'dev-168-gquintic' into dev-307-spring-comp dev-307-spring-comp Rob Giseburt 2017-12-08 17:52:17 -06:00
• 6006574dd3 Removing square of error in PID to increase PID reliability. Rob Giseburt 2017-12-08 17:35:55 -06:00
• 4f8aa01079 Adjusting the spring factor computation and configuration Rob Giseburt 2017-12-08 17:34:11 -06:00
• 6c67e58484 Removing old comments Rob Giseburt 2017-12-05 11:54:40 -06:00
• d9eed39781 Minor cleanup in gpio.cpp Rob Giseburt 2017-12-05 11:53:50 -06:00
• a68e81b7a3 Initial support for gQuintic rev D Rob Giseburt 2017-12-05 11:53:00 -06:00
• bd8aa14e9d Fixed up the OSX g2core flashing script to not need the Arduino (always changing) app Riley 2017-12-04 23:33:50 -05:00
• cb1e20bc92 Merged edge and updated readme Alden Hart 2017-12-04 11:23:21 -05:00
• 16482dcfc3 More work on the ReadMe Rob Giseburt 2017-12-03 17:02:39 -06:00
• 25932d5913 More work on the ReadMe Rob Giseburt 2017-12-03 17:00:52 -06:00
• d36049f671 More work on the ReadMe Rob Giseburt 2017-12-03 16:54:06 -06:00
• b70abe4067 Switched from fabs to std::abs which is type-aware and safer going forward. Rob Giseburt 2017-12-03 16:10:22 -06:00
• 459f7c5c43 More work on the ReadMe Rob Giseburt 2017-12-02 12:31:53 -06:00
• 187e24734f More work on the ReadMe Rob Giseburt 2017-12-02 12:23:42 -06:00
• ef0839d1e0 More work on the ReadMe Rob Giseburt 2017-12-02 12:15:37 -06:00
• feb5c84aba Readme updates (attempting to use details tag) Rob Giseburt 2017-12-02 12:00:51 -06:00
• 5c85583c95 Readme updates (attempting to use details tag) Rob Giseburt 2017-12-02 11:59:47 -06:00
• abd655c601 Fix disambiguation of outputs to heaters on all board types. Rob Giseburt 2017-12-02 09:57:21 -06:00
• 196791923e Fixes for temperature settings in the various Printrbot settings Rob Giseburt 2017-12-02 08:51:12 -06:00
• 5bafefdf78 Updating README with changelog (in progress) Rob Giseburt 2017-12-02 08:30:13 -06:00
• a0ad3a5c7c Remove old constant-rate stepper and related forward difference code. Rob Giseburt 2017-12-02 08:10:19 -06:00
• 93a0bb1d3e Removing testing code. Rob Giseburt 2017-12-02 07:55:46 -06:00
• 38bb76d370 Fix issue where setting {prbr:t} (or any value) wasn't working. Rob Giseburt 2017-12-01 21:25:42 -06:00
• b44be38d62 Merge branch 'dev-168-gquintic' into dev-xxx-spring-comp Rob Giseburt 2017-12-01 20:44:51 -06:00
• d61f27296f Merge commit '59a00f0d45f1092b28825579e8c6fa96a038d059' into dev-168-gquintic Rob Giseburt 2017-12-01 20:43:18 -06:00
• e6b41a3f12 First pass at spring-compensation Rob Giseburt 2017-12-01 16:39:07 -06:00
• c9b4e4a91a Added TMC2130 settings to settings_default.h Rob Giseburt 2017-12-01 12:42:46 -06:00
• 896b0b619a Refactor how Trinamic TMC2130 JSON controls are inserted in configArray. Added node script to generate the code consistently. Rob Giseburt 2017-11-28 11:15:32 -06:00
• 6f1f27b581 Update Motate reference Rob Giseburt 2017-11-27 13:37:38 -06:00
• 295436b24d Minor changes (comments, etc) Rob Giseburt 2017-11-27 13:34:00 -06:00
• 59a00f0d45 Merge pull request #118 from justinclift/update_duefromosx_pathfinding Riley 2017-11-25 09:41:59 -05:00
• 6d790eaeba Update Motate link Alden Hart 2017-11-23 10:48:13 -05:00
• db13676239 Committing Motate switched to sams70-port Alden Hart 2017-11-22 09:21:35 -05:00
• cb80e7b164 committing anyway Alden Hart 2017-11-22 08:36:56 -05:00
• 92e455e965 Update README.md Rob Giseburt 2017-11-21 14:55:10 -06:00
• ae589a13af Merge pull request #286 from synthetos/edge Rob Giseburt 2017-11-21 14:51:48 -06:00
• d5a1421163 Update README.md Rob Giseburt 2017-11-21 14:47:44 -06:00
• 96ed945ae3 Xcode Project updates Rob Giseburt 2017-11-17 09:41:52 -06:00
• d6ee30f5a8 Fix temperature readings, adjusting Ultimaker2+ settings, and make MAX31865 more fault tolerant. Rob Giseburt 2017-11-17 09:41:01 -06:00
• a868c9cb9e Merge branch 'master' of github.com:geratech/controller matthew wildoer 2017-11-11 18:27:58 +11:00
• 0af9add01d Enable ESTOP matthew wildoer 2017-11-11 18:27:17 +11:00
• df14467b38 Remove merge artefacts Sam Mellor 2017-11-10 14:52:17 +11:00
• e484dcce43 Increase probe and homing reliability matthew wildoer 2017-11-10 13:09:19 +11:00
• e0ee9b2048 CAN Probe configuration matthew wildoer 2017-11-08 17:03:31 +11:00
• f761e065d5 Merge branch 'master' of github.com:geratech/controller matthew wildoer 2017-11-03 10:01:58 +11:00
• 1375299254 Configure status report fields Sam Mellor 2017-11-02 21:38:24 +11:00
• a53da08bb0 CAN fucking works now. woop woop. THS on pin 9 matthew wildoer 2017-11-02 18:52:14 +11:00
• c806fc3ec5 Enabled soft limits and better homing matthew wildoer 2017-10-30 10:11:45 +11:00
• 7802e351e7 Attempted fix for #298 (reading nested JSON fail) Rob Giseburt 2017-10-27 13:52:34 -05:00
• 39035a1eec Attempted fix for #298 (reading nested JSON fail) Rob Giseburt 2017-10-27 13:52:34 -05:00
• 594c74d3d5 Adjust default setings for PrintrBot Play and UM2 (testing) Rob Giseburt 2017-10-27 13:48:32 -05:00
• 554de467b7 Update Motate reference Rob Giseburt 2017-10-27 13:48:09 -05:00
• 4e482baa7f Make temperature reading more tolerant Rob Giseburt 2017-10-27 13:47:59 -05:00
• 10412b345b Better fault handling in max31865 Rob Giseburt 2017-10-27 13:46:59 -05:00
• b95992a9f0 Merge branch 'dev-168-gquintic' of https://github.com/synthetos/g2 into dev-168-gquintic Rob Giseburt 2017-10-27 13:43:46 -05:00
• ee6d6dcb5d Fix in[0] bug matthew wildoer 2017-10-13 20:03:53 +11:00
• d444770ec5 Fixed associtated in[0] failures matthew wildoer 2017-10-13 19:21:09 +11:00
• f03f029336 Fixed X homing direcion and associated pin declaration coming out null matthew wildoer 2017-10-13 19:20:32 +11:00
• 6453fc4b6d ifndef broke accumulate encoder function used by get machine coords matthew wildoer 2017-10-13 18:58:21 +11:00
• ec0e836b2f Merge branch 'master' of github.com:geratech/controller matthew wildoer 2017-10-13 17:20:15 +11:00
• bef43265a8 Working machine code matthew wildoer 2017-10-13 16:56:08 +11:00
• 24ea2495b5 upload job updates matthew wildoer 2017-10-13 15:53:59 +11:00
• 99962236f0 Buggy brnach throwaway matthew wildoer 2017-10-13 15:52:26 +11:00
• 622bdf7669 Major rework matthew wildoer 2017-10-11 14:51:52 +11:00
• 08c6c5590d Automated upload tools matthew wildoer 2017-10-11 14:39:37 +11:00
• fd703bd790 Addes our own development board implimenting CAN matthew wildoer 2017-10-11 14:38:06 +11:00
• d377b16c7e Added some missing setting files Riley 2017-09-16 11:44:06 -04:00