Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-10-06 22:52:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

083.17 fixed homing startup condition with Otherplan; added settings_othermill_test.h

Browse Source
This commit is contained in:
alden.hart
2015-05-05 21:03:37 -04:00
parent 7cb20ccc0f
commit 07cec50386
7 changed files with 451 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TinyG2/Makefile
+1
View File
@@ -60,6 +60,7 @@ DEBUG ?= 0
SETTINGS_FILE ?= settings_default.h
SETTINGS_FILE="settings_othermill.h"
# SETTINGS_FILE="settings_othermill_test.h"
# SETTINGS_FILE="settings_probotixV90.h"
# SETTINGS_FILE="settings_shapeoko2.h"
# SETTINGS_FILE="settings_shopbot_sbv300.h"
TinyG2/TinyG2.cppproj
+3
View File
@@ -1243,6 +1243,9 @@
<Compile Include="settings\settings_othermill.h">
<SubType>compile</SubType>
</Compile>
<Compile Include="settings\settings_othermill_test.h">
<SubType>compile</SubType>
</Compile>
<Compile Include="settings\settings_probotixV90.h">
<SubType>compile</SubType>
</Compile>
TinyG2/canonical_machine.cpp
+3 -1
View File
@@ -1422,7 +1422,9 @@ void cm_request_feedhold(void) {
void cm_request_end_hold(void)
{
cm.end_hold_requested = true;
if (cm.hold_state != FEEDHOLD_OFF) {
cm.end_hold_requested = true;
}
}
void cm_request_queue_flush()
TinyG2/gcode_parser.cpp
+10 -10
View File
@@ -471,24 +471,24 @@ static stat_t _execute_gcode_block()
case NEXT_ACTION_SET_G30_POSITION: { status = cm_set_g30_position(); break;} // G30.1
case NEXT_ACTION_GOTO_G30_POSITION: { status = cm_goto_g30_position(cm.gn.target, cm.gf.target); break;} // G30
case NEXT_ACTION_SEARCH_HOME: { status = cm_homing_cycle_start(); break;} // G28.2
case NEXT_ACTION_SET_ABSOLUTE_ORIGIN: { status = cm_set_absolute_origin(cm.gn.target, cm.gf.target); break;}// G28.3
case NEXT_ACTION_HOMING_NO_SET: { status = cm_homing_cycle_start_no_set(); break;} // G28.4
case NEXT_ACTION_SEARCH_HOME: { status = cm_homing_cycle_start(); break;} // G28.2
case NEXT_ACTION_SET_ABSOLUTE_ORIGIN: { status = cm_set_absolute_origin(cm.gn.target, cm.gf.target); break;}// G28.3
case NEXT_ACTION_HOMING_NO_SET: { status = cm_homing_cycle_start_no_set(); break;} // G28.4
case NEXT_ACTION_STRAIGHT_PROBE: { status = cm_straight_probe(cm.gn.target, cm.gf.target); break;} // G38.2
case NEXT_ACTION_STRAIGHT_PROBE: { status = cm_straight_probe(cm.gn.target, cm.gf.target); break;} // G38.2
case NEXT_ACTION_SET_COORD_DATA: { status = cm_set_coord_offsets(cm.gn.parameter, cm.gn.L_word, cm.gn.target, cm.gf.target); break;}
case NEXT_ACTION_SET_ORIGIN_OFFSETS: { status = cm_set_origin_offsets(cm.gn.target, cm.gf.target); break;}
case NEXT_ACTION_RESET_ORIGIN_OFFSETS: { status = cm_reset_origin_offsets(); break;}
case NEXT_ACTION_SET_COORD_DATA: { status = cm_set_coord_offsets(cm.gn.parameter, cm.gn.L_word, cm.gn.target, cm.gf.target); break;}
case NEXT_ACTION_SET_ORIGIN_OFFSETS: { status = cm_set_origin_offsets(cm.gn.target, cm.gf.target); break;}
case NEXT_ACTION_RESET_ORIGIN_OFFSETS: { status = cm_reset_origin_offsets(); break;}
case NEXT_ACTION_SUSPEND_ORIGIN_OFFSETS: { status = cm_suspend_origin_offsets(); break;}
case NEXT_ACTION_RESUME_ORIGIN_OFFSETS: { status = cm_resume_origin_offsets(); break;}
case NEXT_ACTION_RESUME_ORIGIN_OFFSETS: { status = cm_resume_origin_offsets(); break;}
case NEXT_ACTION_DEFAULT: {
cm_set_absolute_override(MODEL, cm.gn.absolute_override); // apply override setting to gm struct
switch (cm.gn.motion_mode) {
case MOTION_MODE_CANCEL_MOTION_MODE: { cm.gm.motion_mode = cm.gn.motion_mode; break;}
case MOTION_MODE_STRAIGHT_TRAVERSE: { status = cm_straight_traverse(cm.gn.target, cm.gf.target); break;}
case MOTION_MODE_STRAIGHT_FEED: { status = cm_straight_feed(cm.gn.target, cm.gf.target); break;}
case MOTION_MODE_STRAIGHT_TRAVERSE: { status = cm_straight_traverse(cm.gn.target, cm.gf.target); break;}
case MOTION_MODE_STRAIGHT_FEED: { status = cm_straight_feed(cm.gn.target, cm.gf.target); break;}
case MOTION_MODE_CW_ARC:
case MOTION_MODE_CCW_ARC: { status = cm_arc_feed(cm.gn.target,
cm.gf.target,
TinyG2/planner.cpp
+5 -5
View File
@@ -258,7 +258,7 @@ stat_t mp_runtime_command(mpBuf_t *bf)
bf->cm_func(bf->value_vector, bf->flag_vector); // 2 vectors used by callbacks
if (mp_free_run_buffer()) {
cm_cycle_end(); // free buffer & perform cycle_end if planner is empty
}
}
return (STAT_OK);
}
@@ -290,7 +290,7 @@ static stat_t _exec_dwell(mpBuf_t *bf)
st_prep_dwell((uint32_t)(bf->gm.move_time * 1000000.0));// convert seconds to uSec
if (mp_free_run_buffer()) {
cm_cycle_end(); // free buffer & perform cycle_end if planner is empty
}
}
return (STAT_OK);
}
@@ -458,8 +458,8 @@ mpBuf_t * mp_get_run_buffer()
mb.r->buffer_state = MP_BUFFER_RUNNING;
mb.needs_time_accounting = true;
}
// This is the one point where an accurate accounting of the total time in the
// This is the one point where an accurate accounting of the total time in the
// run and the planner is established. _planner_time_accounting() also performs
// the locking of planner buffers to ensure that sufficient "safe" time is reserved.
_planner_time_accounting();
@@ -605,7 +605,7 @@ bool mp_is_it_phat_city_time() {
return ((time_in_planner <= 0) || (PHAT_CITY_TIME < time_in_planner));
}
static void _planner_time_accounting()
static void _planner_time_accounting()
{
// if (((mb.time_in_run + mb.time_locked) > MIN_PLANNED_TIME) && !mb.needs_time_accounting)
// return;
TinyG2/settings/settings_othermill_test.h
Executable
+428
View File
File diff suppressed because it is too large Load Diff
TinyG2/tinyg2.h
+1 -1
View File
@@ -38,7 +38,7 @@
/****** REVISIONS ******/
#ifndef TINYG_FIRMWARE_BUILD
#define TINYG_FIRMWARE_BUILD 083.16 // fixed message return in a blank Gcode line
#define TINYG_FIRMWARE_BUILD 083.17 // fixed homing startup condition with Otherplan; added settings_othermill_test.h
#endif
#define TINYG_FIRMWARE_VERSION 0.98 // firmware major version