diff --git a/VERSION b/VERSION index 8975754bad1..34055dfa6c5 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1 @@ 2.10.0~pre0 - diff --git a/debian/changelog b/debian/changelog index f199b8a1e78..efc9bd92474 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,26 @@ linuxcnc (1:2.10.0~pre0) UNRELEASED; urgency=medium -- Andy Pugh Mon, 7 Nov 2022 23:31:00 +0000 +linuxcnc (1:2.9.0~pre1) UNRELEASED; urgency=medium + + * githelper.sh: New master glob + * qtplasmac: add event logging + * qtplasmac: update sim configs + * qtvcp -docs: add update versaprobe details + * qtdragon -docs: update versaprobe image + * qtvcp -versaprobe: improve help dialog layout/use + * qtvcp -panels: fix details of cam_align controls + * qtvcp -docs: cam_align controls, loading options + * qtvcp -axis embeded cam_align: add size and rotation increment + * qtvcp -cam_align panel: add ability to set rotation increment + * qtvcp -camview_widget: add the rotation increment display + * qtvcp -cam_align panel: add window size setting option + * docs: qtplasmac fix image, add deprication notice + * docs: add div2 to .gitignore + * Merge pull request #2119 from Roguish000/component-div2 + + -- andypugh Sun, 13 Nov 2022 17:36:52 +0000 + linuxcnc (1:2.9.0~pre1) UNRELEASED; urgency=medium * First 2.9 pre-release preparatory to release. diff --git a/src/emc/tooldata/tooldata_common.cc b/src/emc/tooldata/tooldata_common.cc index bf5cbfb509c..3ff3c6e891e 100644 --- a/src/emc/tooldata/tooldata_common.cc +++ b/src/emc/tooldata/tooldata_common.cc @@ -1,3 +1,4 @@ +#include /* ** This file is part of a refactor of internal tool data management ** and incorporates work from removed files: @@ -193,6 +194,16 @@ int tooldata_read_entry(const char *input_line, if (valid) { CANON_TOOL_TABLE tdata = tooldata_entry_init(); + // verify no prior tool in pocket + toolidx_t ans; + ans = tooldata_get(&tdata,idx); + if (ans != IDX_OK) { UNEXPECTED_MSG; } + if (is_random_toolchanger && tdata.pocketno != 0) { + fprintf(stderr,"WARNING: Attempt to assign multiple toolno.s to pocket %d\n",realpocket); + fprintf(stderr," %s %s()\n",__FILE__,__FUNCTION__); + fprintf(stderr," WAS: pocket=%3d toolno=%3d\n",tdata.pocketno,tdata.toolno); + fprintf(stderr," IS: pocket=%3d toolno=%3d\n",realpocket,toolno); + } tdata.toolno = toolno; tdata.pocketno = realpocket; tdata.offset = offset; @@ -236,7 +247,7 @@ void tooldata_format_toolline (int idx, #define I_ITEM(item,letter) if (!ignore_zero_values || tdata.item) { \ snprintf(tmp,sizeof(tmp)," " letter "%d",tdata.item); \ strncat(formatted_line,tmp,CANON_TOOL_ENTRY_LEN-1); \ - } + } F_ITEM(diameter, "D"); F_ITEM(offset.tran.x, "X");