diff options
| author | Jeff Epler <jepler@unpythonic.net> | 2013-10-22 17:57:15 -0500 |
|---|---|---|
| committer | Jeff Epler <jepler@unpythonic.net> | 2013-10-22 17:57:15 -0500 |
| commit | fdf1f567aa99b85b59c5c293eab4260afc502669 (patch) | |
| tree | 7f7cf089ef7ee7957b2006bf744759bf09b91f27 | |
| parent | b8b7d692ea3d62a0f402a969ed90d359d0678908 (diff) | |
| parent | 1f2371338618c5bae414fe2bb6f797778ddf79bd (diff) | |
| download | linuxcnc-fdf1f567aa99b85b59c5c293eab4260afc502669.tar.gz linuxcnc-fdf1f567aa99b85b59c5c293eab4260afc502669.zip | |
Merge remote-tracking branch 'origin/v2.5_branch'
| -rw-r--r-- | docs/src/hal/pyvcp.txt | 7 | ||||
| -rw-r--r-- | src/emc/usr_intf/touchy/mdi.py | 8 | ||||
| -rw-r--r-- | src/libnml/buffer/tcpmem.cc | 4 | ||||
| -rw-r--r-- | tests/build/header-sanity/expected | 0 | ||||
| -rw-r--r-- | tests/build/header-sanity/test.sh | 16 | ||||
| -rw-r--r-- | tests/build/ui/expected | 0 | ||||
| -rw-r--r-- | tests/build/ui/nml-position-logger.cc | 22 | ||||
| -rw-r--r-- | tests/build/ui/test.sh | 5 |
8 files changed, 52 insertions, 10 deletions
diff --git a/docs/src/hal/pyvcp.txt b/docs/src/hal/pyvcp.txt index 8f48c9295..f83c706cb 100644 --- a/docs/src/hal/pyvcp.txt +++ b/docs/src/hal/pyvcp.txt @@ -920,14 +920,13 @@ image::images/pyvcp_table.png[] ==== Tabs -A tabbed interface can save quite a bit of space. +A tabbed interface can save quite a bit of space. Create one container for +each tab name. Only one 'tabs' section can exist and 'tabs' can not be nested +or stacked. The width of the widest item controls the width of the tabs. [source,xml] ----------------------------------------------------------- <tabs> - <names> ["spindle","green eggs"]</names> -</tabs> -<tabs> <names>["Spindle", "Green Eggs", "Ham"]</names> <vbox> <label> diff --git a/src/emc/usr_intf/touchy/mdi.py b/src/emc/usr_intf/touchy/mdi.py index d0f574adb..86e82b6df 100644 --- a/src/emc/usr_intf/touchy/mdi.py +++ b/src/emc/usr_intf/touchy/mdi.py @@ -55,10 +55,10 @@ class mdi: 'G00' : [_('Straight rapid'), 'A'], 'G1' : [_('Straight feed'), 'A', 'F'], 'G01' : [_('Straight feed'), 'A', 'F'], - 'G2' : [_('Arc CW'), 'A', 'I', 'J', 'K', 'R', 'F'], - 'G02' : [_('Arc CW'), 'A', 'I', 'J', 'K', 'R', 'F'], - 'G3' : [_('Arc CCW'), 'A', 'I', 'J', 'K', 'R', 'F'], - 'G03' : [_('Arc CCW'), 'A', 'I', 'J', 'K', 'R', 'F'], + 'G2' : [_('Arc CW'), 'A', 'I', 'J', 'K', 'R', 'P', 'F'], + 'G02' : [_('Arc CW'), 'A', 'I', 'J', 'K', 'R', 'P', 'F'], + 'G3' : [_('Arc CCW'), 'A', 'I', 'J', 'K', 'R', 'P', 'F'], + 'G03' : [_('Arc CCW'), 'A', 'I', 'J', 'K', 'R', 'P', 'F'], 'G4' : [_('Dwell'), 'P'], 'G04' : [_('Dwell'), 'P'], 'G10' : [_('Setup'), 'L', 'P', 'A', 'Q', 'R'], diff --git a/src/libnml/buffer/tcpmem.cc b/src/libnml/buffer/tcpmem.cc index 23ffa474a..2520ac978 100644 --- a/src/libnml/buffer/tcpmem.cc +++ b/src/libnml/buffer/tcpmem.cc @@ -207,8 +207,8 @@ void TCPMEM::verify_bufname() set_socket_fds(read_socket_fd); putbe32(temp_buffer, (uint32_t) serial_number); - putbe32(temp_buffer + 1, REMOTE_CMS_GET_BUF_NAME_REQUEST_TYPE); - putbe32(temp_buffer + 2, buffer_number); + putbe32(temp_buffer + 4, REMOTE_CMS_GET_BUF_NAME_REQUEST_TYPE); + putbe32(temp_buffer + 8, buffer_number); if (sendn(socket_fd, temp_buffer, 20, 0, timeout) < 0) { reconnect_needed = 1; fatal_error_occurred = 1; diff --git a/tests/build/header-sanity/expected b/tests/build/header-sanity/expected new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/build/header-sanity/expected diff --git a/tests/build/header-sanity/test.sh b/tests/build/header-sanity/test.sh new file mode 100644 index 000000000..c05132d8e --- /dev/null +++ b/tests/build/header-sanity/test.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -xe +HEADERS=$(readlink -f ../../../include) +for i in $HEADERS/*.h; do + case $i in + */rtapi_app.h) continue ;; + esac + gcc -DULAPI -I$HEADERS -E -x c $i > /dev/null +done +for i in $HEADERS/*.h $HEADERS/*.hh; do + case $i in + */rtapi_app.h) continue ;; + */interp_internal.hh) continue ;; + esac + g++ -DULAPI -I$HEADERS -E -x c++ $i > /dev/null +done diff --git a/tests/build/ui/expected b/tests/build/ui/expected new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/build/ui/expected diff --git a/tests/build/ui/nml-position-logger.cc b/tests/build/ui/nml-position-logger.cc new file mode 100644 index 000000000..aaac0a0ff --- /dev/null +++ b/tests/build/ui/nml-position-logger.cc @@ -0,0 +1,22 @@ +// g++ nml-position-logger.cc -I include -L lib -l nml -l linuxcnc +#include "emc.hh" +#include "emc_nml.hh" +#include <unistd.h> +#include <iostream> +#include <cstdlib> + +int main(int argc, char **argv) { + if(argc < 2) { std::cerr << "Usage: " << argv[0] << " NMLFILE\n"; abort(); } + const char *nmlfile = argv[1]; + RCS_STAT_CHANNEL *stat = new RCS_STAT_CHANNEL(emcFormat, "emcStatus", "xemc", nmlfile); + while(1) { + usleep(100*1000); + if(!stat->valid()) continue; + if(stat->peek() != EMC_STAT_TYPE) continue; + EMC_STAT *emcStatus = static_cast<EMC_STAT*>(stat->get_address()); + std::cout << emcStatus->motion.traj.position.tran.x << " " + << emcStatus->motion.traj.position.tran.y << " " + << emcStatus->motion.traj.position.tran.z << "\n"; + } + return 0; +} diff --git a/tests/build/ui/test.sh b/tests/build/ui/test.sh new file mode 100644 index 000000000..d4bfdfbb6 --- /dev/null +++ b/tests/build/ui/test.sh @@ -0,0 +1,5 @@ +#!/bin/sh +set -x +g++ -I $EMC2_HOME/include \ + nml-position-logger.cc \ + -L $EMC2_HOME/lib -lnml -llinuxcnc |