Skip to content

Conversation

@machinekoder
Copy link

Adds the Python fdm.config library and sample configurations.

ArcEye and others added 13 commits August 21, 2016 10:55
hm2_soc_ol.c: speed up hm2_soc_read/hm2_soc_write
This workaround is a temporary measure to keep the xhc-hb04 pendant working.
xhc-hb04.tcl uses commandline halcmd outputs against tests which are fixed
in expectation of a particular return. (ie from linuxcnc circa 2014)

Changes to halcmd print routines broke xhc-hb04.

This will tell the tcl code if a pin exists, removing the need for the
previous convoluted parsing of the stdout output.

Signed-off-by: Mick <arceye@mgware.co.uk>
…ommand for joints

Fixes issue machinekit#1048

Signed-off-by: Mick <arceye@mgware.co.uk>
Provide workaround to keep xhc-hb04 pendants working
2362ac8 Merge pull request mhaberler#69 from strahlex/launcher-priority
0177ee3 config: added priority to launcher
98bc9ca Merge pull request mhaberler#68 from strahlex/previewmodule
fc01acb machinetalk-protobuf: add new preview message types
987fd0d Merge pull request mhaberler#67 from strahlex/tool-types-fix

git-subtree-dir: src/machinetalk/proto
git-subtree-split: 2362ac826e47ca0c1259cab99b549da7079f093c
Conflicts:
	src/machinetalk/mklauncher/mklauncher.py
The extra warnings now generated by gcc4.9 and higher, mean that hal_priv.h produces multiple warnings of 
`hal_priv.h :514    warning: type qualifiers ignored on function return type ...`

This is because hal_priv.h:514 has a declared `const int` return type and actually returns `int` , which is what `hal_funct_args_t->argc` is.
Amend hal_priv.h to remove compiler warnings
@machinekoder
Copy link
Author

Sorry, wrong repo.

machinekoder added a commit to machinekoder/machinekit that referenced this pull request Jun 30, 2017
f4481f561 Merge pull request machinekit#81 from machinekoder/machinekit-updates
17178e54f add jplan and ros proto definitions
6a2762863 fix gitignore
98f68e22b rtapi_message: fix whitespace
cfc23327e specify proto2 syntax
50d5b91a7 merging updates from upstream Machinekit
30cb027e3 Merge pull request mhaberler#80 from machinekit/ArcEye-patch-1
394d3d897 Amend asciidoc.mustache
a328a2478 Merge pull request mhaberler#79 from machinekoder/js-bundle-update
60f39299a Merge pull request mhaberler#78 from machinekoder/python-build-fix
95f6c564e update js bundles
2179c974f reorder Makefile commands correctly
5531e8cf1 Merge pull request mhaberler#77 from machinekoder/java-support
6c428b26f adding Java build
add0bf491 Merge pull request mhaberler#75 from machinekoder/doc-build-fix
4b58961c0 fix docs build
8cb5b75ce Merge pull request mhaberler#74 from machinekoder/pypi2
dc0d32268 PyPI: update dependencies
6211ed296 Merge pull request mhaberler#73 from machinekoder/pypi
9b16d1f9e preparing for PyPi

git-subtree-dir: src/machinetalk/proto
git-subtree-split: f4481f561ac76a6976afad03f13c7b8e0f7af318
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants