Commit Graph

130 Commits

Author SHA1 Message Date
cprezzi
73cdb2f722 Corrected stepper invert mask for K40 2017-05-18 14:47:53 +02:00
cprezzi
b28fd39e7d Merge branch 'master' into more-axis 2017-05-18 12:51:28 +02:00
cprezzi
1f0ab33787 Merged new $ params 2017-05-18 12:47:37 +02:00
cprezzi
d85bfa8c83 Added default settings for PWM_OFF_VALUE, PWM_MIN_VALUE and PMW_MAX_VALUE 2017-05-18 11:51:16 +02:00
cprezzi
da946353c8 Merge remote-tracking branch 'upstream/master' 2017-05-16 15:03:18 +02:00
Todd Fleming
b1ecb47bec #4: PWM $ settings 2017-05-13 13:54:50 -04:00
cprezzi
f7083b9491 Added 4.axes (A) and moved default settings to defaults.h and cpu-map.h 2017-05-11 19:58:41 +02:00
cprezzi
b48c3c7c51 Error corrected in config.h (missing ")" on LIMIT_MASK) 2017-05-10 18:11:28 +02:00
cprezzi
0471485259 Added $33 for PWM frequency and defaults for K40 2017-05-10 18:01:55 +02:00
cprezzi
063b1f6748 Config for K40 2017-05-10 17:16:17 +02:00
Todd Fleming
5a862a5e30 Fix #3: wrong port for limit switches 2017-04-08 14:57:31 -04:00
Todd Fleming
ee65b9a7e2 Merge tag 'v1.1f.20170131' 2017-03-11 10:09:48 -05:00
Todd Fleming
ed82dd90b6 Merge tag 'v1.1e.20170114' 2017-03-11 09:33:28 -05:00
Sonny Jeon
f51268e855 Additional build info in the $I printout.
- [new] Added total available planner buffer blocks (15 shown, but
there are 16. one is used by the ring buffer and to execute system
motions) and serial RX buffer bytes. This information is useful for
GUIs to setup and optimize their streaming protocols easily.

[doc] Updated the interface document to reflect the change.
2017-01-31 18:46:20 -07:00
Sonny Jeon
beaa40583c Tidying up parking override control implementation
[new] Added a default configuration for the parking override control
upon a reset or power-up. By default, parking is enabled, but this may
be disabled via a config.h option.

[fix] Parking override control should be checking if the command word
is passed, rather than the value.
2017-01-29 11:35:51 -07:00
chamnit
e455764079 v1.1f. Parking override control. Spindle enable pin option.
[ver] v1.1f update due to tweaks to interface from new parking override
control.

[new] Parking motion override control via new `M56 P0` and `M56 P1`
command, which disables and enables the parking motion, respectively.
Requires ENABLE_PARKING_OVERRIDE_CONTROL and PARKING_ENABLE enabled in
config.h. Primarily for OEMs.

[new] `M56` appears in the $G report when enabled.

[new] Five new build info identification letters. Some were missing and
a couple are new. Updated the CSV and documentation to reflect these
new items.

[new] Spindle enable pin configuration option to alter its behavior
based on how certain lasers work. By default, Grbl treats the enable
pin separately and leaves it on when S is 0. The new option turns the
enable pin on and off with S>0 and S=0. This only is in effect when a
user enables the USE_SPINDLE_DIR_AS_ENABLE_PIN option.

[fix] M4 is now allowed to work when USE_SPINDLE_DIR_AS_ENABLE_PIN is
enabled. Previously this was blocked and was problematic for laser
folks using M4.

[fix] Properly declared system variables as extern. Not sure how that
went unnoticed or why it worked up until now but it has.

[fix] EXTREMELY RARE. When AMASS is intentionally disabled and sent a
motion command that is _one step_ in length, Grbl would not actuate the
step due to numerical round-off. Applied a fix to prevent the round-off
issue.

[fix] Added a compile-time check for AMASS settings to make sure that
the numerical round-off issue doesn’t effect it. This would only happen
if someone set AMASS max levels to zero. It does not effect AMASS with
its current defaults.

[fix] Wrapped the mc_parking_motion() function in an ifdef for porting
purposes.

[fix] Fixed an issue when in inverse time mode and G0’s would require a
F word. This was not correct.

[fix] Added a note in the defaults.h file that MAX_TRAVEL values must
be positive. Some users were setting this negative and it was causing
issues.
2017-01-28 17:13:06 -07:00
Todd Fleming
31a83558ad comment error: PWM1_CH6 secondary is P2.5. 2017-01-18 22:13:10 -05:00
Todd Fleming
b1d83c2892 Clean up dummy regs 2017-01-17 14:46:12 -05:00
Todd Fleming
3ebbfa4dd3 Soft reset on DTR change 2017-01-16 14:20:52 -05:00
Todd Fleming
6b1e180e66 $140, $141, $142 current control 2017-01-15 17:09:59 -05:00
Todd Fleming
2b5d6a9871 Flash memory 2017-01-14 23:54:36 -05:00
Sonny Jeon
67ab9280d9 Tool number bug fix. Updated documentation.
- [fix] Tool numbers were not being tracked and reported correctly. Now
shows tool number values in $G when programmed.

- [fix] Added a max tool number value check to the g-code parser.

- [doc] Added a new error code for invalid tool number. Updated CSV and
interface documents.

- [doc] Added a implementation note for buffer state in status reports.
Don’t rely on this data for streaming.
2017-01-14 13:54:14 -07:00
Todd Fleming
f67c21a431 tuning 2017-01-14 15:12:07 -05:00
Todd Fleming
4e9d5f78b4 spindle pwm 2017-01-12 19:28:38 -05:00
Todd Fleming
6f13d0d18b Tuning 2017-01-11 15:25:19 -05:00
Todd Fleming
9c312eef84 debugging 2017-01-11 11:41:47 -05:00
Todd Fleming
c7a4b77e47 rx buffer size = 1024 2017-01-10 17:03:14 -05:00
Todd Fleming
408d820b9f usb serial 2017-01-09 19:58:14 -05:00
Todd Fleming
a27feeab51 Oops. need part of settings_init(). 2017-01-09 06:38:22 -05:00
Todd Fleming
3ab9e6bd6e Don't error from missing eeprom 2017-01-09 06:26:29 -05:00
Todd Fleming
5eb4fdacdd Fix interrupt enable restore bug 2017-01-09 06:25:52 -05:00
Todd Fleming
5bd05fbe14 stepper bug 2017-01-09 04:06:46 -05:00
Todd Fleming
53ebacb6e4 Set ISR priorities 2017-01-08 20:48:25 -05:00
Todd Fleming
8a28b4d098 Fix stepper cycles calc 2017-01-08 18:46:58 -05:00
Todd Fleming
d4cbac2a5c Port stepper 2017-01-08 16:12:24 -05:00
Todd Fleming
fdf6e31218 delay_us, delay_ms 2017-01-07 23:30:48 -05:00
Todd Fleming
4ec14b6ec6 Current control 2017-01-07 18:31:12 -05:00
Unknown
34a4c93ccc Whoops 2017-01-07 15:55:23 -05:00
Unknown
eabf9d2cfd Made easier to switch uart channels. 2017-01-07 15:51:42 -05:00
Unknown
da6227c27d First cut at serial modification for ARM. Uses a CMSIS driver for now. 2017-01-07 15:47:45 -05:00
Todd Fleming
35aef077c6 motion_control.c: add PARKING_ENABLE condition 2017-01-06 14:46:39 -05:00
Todd Fleming
c00263c5f3 Revert changes to serial.c 2017-01-06 13:32:17 -05:00
Todd Fleming
72dc1c3f9b system.c: preserve interrupt enable 2017-01-05 20:03:54 -05:00
Unknown
c93491fb64 Started serial replacement 2017-01-04 22:07:31 -05:00
Todd Fleming
fb5ba4cfb9 limit pins 2017-01-04 20:48:59 -05:00
Todd Fleming
bbbdb60076 step, dir, enable ports 2017-01-04 19:04:38 -05:00
Todd Fleming
f5a117d0ba Copy DEFAULTS_GENERIC and CPU_MAP_ATMEGA328P 2017-01-04 18:03:07 -05:00
Todd Fleming
c8c76e0e85 Move hacks from smoother/main to grbl/main 2017-01-04 13:50:50 -05:00
Todd Fleming
4ba78b416f Brett's changes 2017-01-04 13:43:06 -05:00
Sonny Jeon
30c0f79afd Spindle enable pin with variable spindle option fix.
- [fix] When USE_SPINDLE_DIR_AS_ENABLE_PIN is enabled in config.h, the
enable pin was not being set when spindle speed is zero. This behavior
should now be fixed.
2017-01-03 10:10:35 -07:00