Commit Graph

42 Commits

Author SHA1 Message Date
Rob Giseburt
55ef7e18a1 min/max -> std::min/std::max 2020-03-12 13:52:45 -05:00
Rob Giseburt
9a16446fde Removing using namespace Motate; and cleanup or results 2019-10-15 21:40:51 -05:00
Rob Giseburt
5b11fb9cd5 Merge branch 'edge' into 4c-recovery 2019-10-14 20:01:59 -05:00
Rob Giseburt
3687a786e1 Four-cable kinematics 2019-06-17 13:14:42 -05:00
Alden Hart
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. 2018-03-26 12:18:26 -04:00
Rob Giseburt
70a3f309e2 Major GOIO refactor 2018-02-19 10:18:13 -06:00
Rob Giseburt
7329076383 Merge branch 'dev-168-gquintic' into dev-307-spring-comp
# Conflicts:
#	g2core/config_app.cpp
#	g2core/temperature.cpp
2017-12-08 17:52:17 -06:00
Rob Giseburt
6006574dd3 Removing square of error in PID to increase PID reliability. 2017-12-08 17:35:55 -06:00
Rob Giseburt
6c67e58484 Removing old comments 2017-12-05 11:54:40 -06:00
Rob Giseburt
b70abe4067 Switched from fabs to std::abs which is type-aware and safer going forward. 2017-12-03 16:10:22 -06:00
Rob Giseburt
d6ee30f5a8 Fix temperature readings, adjusting Ultimaker2+ settings, and make MAX31865 more fault tolerant. 2017-11-17 09:41:01 -06:00
Rob Giseburt
4e482baa7f Make temperature reading more tolerant 2017-10-27 13:47:59 -05:00
Rob Giseburt
e9328503e8 Refactor Temperature code, pulling the circuits out of the PT100 and Thermistor 2017-08-14 15:50:27 -05:00
Rob Giseburt
5d552e4314 Add differential ADC support to Thermistor object 2017-07-18 09:22:24 -05:00
Rob Giseburt
5609c8740d Fixes for Thermistor not accepting ADCDifferentialPair<...> correctly. 2017-07-15 22:29:10 -05:00
Rob Giseburt
606e38833d Cleanup of temperature code. Utilizing new ADCPin.is_differential 2017-05-16 16:07:00 -05:00
Rob Giseburt
fd95d73433 Uncommenting code commented for debugging 2017-05-01 20:26:32 -05:00
Rob Giseburt
52743a3762 Fixed a few issues with the last commit. 2017-04-27 20:25:34 -04:00
Alden Hart
6d8d925195 merged g2/edge 100.26 2017-04-26 07:33:08 -04:00
Rob Giseburt
f0a0385736 Rework of temperature control, PID, and PWM outputs. 2017-04-21 11:42:58 -05:00
Rob Giseburt
8ad5211b8a Updates to UM2+ settings, switched to the new ADCDifferentialPair for UM2+ 2017-04-18 15:24:27 -05:00
Rob Giseburt
864560339c Adjust temperature.cpp to allow a different timeout for the heat bed, and adjust the thermistor settings for the third heater (the bed). 2017-04-05 14:33:25 -05:00
Rob Giseburt
ace207608d Minor cleanup, tuning, and notes 2017-04-05 08:38:11 -05:00
Rob Giseburt
443e6f7e8b Fixed missing interrupt call from max31865 synthetic ADC 2017-03-30 19:26:25 -05:00
Rob Giseburt
806aa81e68 Ultimaker Interim commit 2017-03-30 18:55:31 -05:00
Alden Hart
c60dc581f7 resolved merge conflicts between edge marlin-compatibility and dev-p24 2017-03-23 11:07:12 -04:00
Rob Giseburt
1648e96653 Update PT100 to use differential ADC in a wheatstone config. 2017-03-21 22:20:54 -05:00
Alden Hart
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. 2017-03-19 20:27:53 -04:00
Rob Giseburt
cb4273b2de Adde ability for each heater to have it’s own min temp rise over time. 2017-03-16 18:11:17 -05:00
Rob Giseburt
56f29baabc Rearranged kADCn pin number to start with 1 (except Due). Made extruder and fan pins set in settings file. Updated current settings. 2017-03-16 12:05:17 -05:00
Rob Giseburt
80542a5831 Merge branch 'refs/heads/dev-227-marlin-compat' into dev-168-gquintic 2017-03-14 21:12:31 -05:00
Rob Giseburt
1c3915c1a4 Added “heNtv” to display the sensor’s voltage reading. Added PT100 sensor and settings to choose Thermistor or PT100. 2017-03-14 20:51:00 -05:00
Alden Hart
b1f7fa8ca6 checkpoint 2017-03-13 15:02:25 -04:00
Rob Giseburt
ec80cbf587 Updates for new ADC API (cleaner). 2017-03-08 22:24:05 -06:00
Rob Giseburt
2a092bf03f Minor adjustments to temperature controls (and a typo fix). 2017-02-01 20:58:29 -06:00
Rob Giseburt
657e68b53a Refactor tool (startup tool is 1 now), speedup marlin temp display, added str_concat utility. 2017-01-24 17:02:08 -06:00
Rob Giseburt
3556a2cbf3 Another pass at Marlin Compatibility mode. Functional enough to test. 2017-01-20 14:36:21 -06:00
Alden Hart
a4330f42cc Intermediate commit - changing canonical machine struct to work by pointer - not absolute. Compiles. Does not run. 2016-12-09 07:41:31 -05:00
Rob Giseburt
59be299bf2 Adjusted temperature curves for issue #154 2016-09-06 20:19:57 -05:00
Rob Giseburt
942be7a9e5 Raised the safe temperature to consider the extruder “off” to 45ºC. 2016-09-02 16:08:38 -05:00
Alden Hart
5ccc6ab696 100.05 // Patch for SR setting 2016-09-01 12:49:03 -04:00
Rob Giseburt
16e91f896a 100.00 // Major feature push - see README.md 2016-08-26 16:36:07 -05:00