Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/axis_kinds.hh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*
* License: GPL Version 2
********************************************************************/
#ifndef AXIS_KINDS_HH
#define AXIS_KINDS_HH
#ifndef __LINUXCNC_AXIS_KINDS_HH
#define __LINUXCNC_AXIS_KINDS_HH

#include <ctype.h>
#include <math.h>
Expand Down
4 changes: 2 additions & 2 deletions src/libnml/cms/cms.hh → include/libnml/cms/cms.hh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* Last change:
********************************************************************/

#ifndef CMS_HH
#define CMS_HH
#ifndef __LINUXCNC_LIBNML_CMS_CMS_HH
#define __LINUXCNC_LIBNML_CMS_CMS_HH

#include <stdint.h>
#include <stddef.h> /* size_t */
Expand Down
4 changes: 2 additions & 2 deletions src/libnml/cms/cms_user.hh → include/libnml/cms/cms_user.hh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
*
* Last change:
********************************************************************/
#ifndef CMS_USER_HH
#define CMS_USER_HH
#ifndef __LINUXCNC_LIBNML_CMS_CMS_USER_HH
#define __LINUXCNC_LIBNML_CMS_CMS_USER_HH

class CMS;

Expand Down
4 changes: 2 additions & 2 deletions src/libnml/nml/cmd_msg.hh → include/libnml/nml/cmd_msg.hh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
*
* Last change:
********************************************************************/
#ifndef RCS_CMD_HH
#define RCS_CMD_HH
#ifndef __LINUXCNC_LIBNML_NML_CMD_MSG_HH
#define __LINUXCNC_LIBNML_NML_CMD_MSG_HH

#include "nml.hh"
#include "nmlmsg.hh"
Expand Down
6 changes: 3 additions & 3 deletions src/libnml/nml/nml.hh → include/libnml/nml/nml.hh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
* Last change:
********************************************************************/

#ifndef NML_HH
#define NML_HH
#ifndef __LINUXCNC_LIBNML_NML_NML_HH
#define __LINUXCNC_LIBNML_NML_NML_HH

#include <stddef.h> /* size_t */

#include "libnml/cms/cms_user.hh" /* class CMS_USER */
#include <libnml/cms/cms_user.hh> /* class CMS_USER */
class LinkedList;
/* Generic NML Stuff */
#include "nml_type.hh"
Expand Down
5 changes: 2 additions & 3 deletions src/libnml/nml/nml_oi.hh → include/libnml/nml/nml_oi.hh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
* Last change:
********************************************************************/

#ifndef NML_OI_HH
#define NML_OI_HH
#ifndef __LINUXCNC_LIBNML_NML_NML_OI_HH
#define __LINUXCNC_LIBNML_NML_NML_OI_HH

#include "libnml/cms/cms.hh" // class CMS
#include "nml.hh" // class NML
#include "nmlmsg.hh" // class NMLmsg

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#ifndef NMLTYPE_TYPEDEFED
#ifndef __LINUXCNC_LIBNML_NML_NML_TYPE
#define __LINUXCNC_LIBNML_NML_NML_TYPE
#define NMLTYPE_TYPEDEFED
#include <stdint.h>
typedef int32_t NMLTYPE;
Expand Down
4 changes: 2 additions & 2 deletions src/libnml/nml/nmlmsg.hh → include/libnml/nml/nmlmsg.hh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
* Last change:
********************************************************************/

#ifndef NMLMSG_HH
#define NMLMSG_HH
#ifndef __LINUXCNC_LIBNML_NML_NMLMSG_HH
#define __LINUXCNC_LIBNML_NML_NMLMSG_HH

#include <stddef.h> /* size_t */

Expand Down
6 changes: 3 additions & 3 deletions src/libnml/nml/stat_msg.hh → include/libnml/nml/stat_msg.hh
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
*
* Last change:
********************************************************************/
#ifndef RCS_STAT_HH
#define RCS_STAT_HH
#ifndef __LINUXCNC_LIBNML_NML_STAT_MSG_HH
#define __LINUXCNC_LIBNML_NML_STAT_MSG_HH

#include "nml.hh"
#include "nmlmsg.hh"
#include "libnml/rcs/rcs.hh"
#include <libnml/rcs/rcs.hh>

class RCS_STAT_MSG:public NMLmsg {
public:
Expand Down
8 changes: 4 additions & 4 deletions src/libnml/rcs/rcs.hh → include/libnml/rcs/rcs.hh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
*
* Last change:
********************************************************************/
#ifndef RCS_HH
#define RCS_HH
#ifndef __LINUXCNC_LIBNML_RCS_RCS_HH
#define __LINUXCNC_LIBNML_RCS_RCS_HH

class RCS_LINKED_LIST;
class NMLmsg;
Expand All @@ -29,7 +29,7 @@ class RCS_STAT_MSG;
// The underlying type specifier of int is meant to stress that it
// is of paramount importance that the underlying type of the
// RCS_STATUS enum is int. See nml/stat_msg.hh for more details.
#include "rcs_status.hh" // enum class RCS_STATUS
#include <rcs_status.hh> // enum class RCS_STATUS

#include "libnml/nml/nml_type.hh"
#include <libnml/nml/nml_type.hh>
#endif /* !defined(RCS_HH) */
9 changes: 5 additions & 4 deletions src/emc/nml_intf/canon.hh → include/nml_intf/canon.hh
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,20 @@
* Copyright (c) 2004 All rights reserved.
*
********************************************************************/
#ifndef CANON_HH
#define CANON_HH
#ifndef __LINUXCNC_NML_INTF_CANON_HH
#define __LINUXCNC_NML_INTF_CANON_HH

#include <stdio.h> // FILE
#include <string>
#include <string_view>
#include <vector>

#include <emcpos.h>
#include "emctool.h"
#include <nml_intf/emctool.h>
#include "canon_position.hh"
#include <emcmotcfg.h> // Just for EMCMOT_NUM_SPINDLES
#include "modal_state.hh"

struct StateTag;

/*
This is the header file that all applications that use the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* Copyright (c) 2014 All rights reserved.
********************************************************************/

#ifndef CANON_POSITION_HH
#define CANON_POSITION_HH
#ifndef __LINUXCNC_NML_INTF_CANON_POSITION_HH
#define __LINUXCNC_NML_INTF_CANON_POSITION_HH

#include <stdio.h> // FILE
#include <vector>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
// factored out from emcglb.h so subsystems not requiring the
// emcglb.h defines may include them as well


#ifndef __LINUXCNC_NML_INTF_DEBUGFLAGS_H
#define __LINUXCNC_NML_INTF_DEBUGFLAGS_H

#define EMC_DEBUG_CONFIG 0x00000002
#define EMC_DEBUG_VERSIONS 0x00000008
Expand Down Expand Up @@ -48,3 +49,5 @@
#define LOG_TIME 1
#define LOG_PID 2
#define LOG_FILENAME 4 // and line

#endif
9 changes: 5 additions & 4 deletions src/emc/nml_intf/emc.hh → include/nml_intf/emc.hh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
*
* Last change:
********************************************************************/
#ifndef EMC_HH
#define EMC_HH
#ifndef __LINUXCNC_NML_INTF_EMC_HH
#define __LINUXCNC_NML_INTF_EMC_HH

#include <emcmotcfg.h> // EMC_JOINT_MAX, EMC_AXIS_MAX
#include "libnml/nml/nml_type.hh"
#include <libnml/nml/nml_type.hh>
#include <motion_types.h>
#include <stdint.h>
#include "modal_state.hh"

struct StateTag;

// Forward class declarations
class EMC_JOINT_STAT;
Expand Down
9 changes: 5 additions & 4 deletions src/emc/nml_intf/emc_nml.hh → include/nml_intf/emc_nml.hh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
*
* Last change:
********************************************************************/
#ifndef EMC_NML_HH
#define EMC_NML_HH
#ifndef __LINUXCNC_NML_INTF_EMC_NML_HH
#define __LINUXCNC_NML_INTF_EMC_NML_HH

#include <linuxcnc.h>
#include <emcpos.h>
#include <kinematics.h> // SWITCHKINS_MAX_TYPES
#include "emc.hh"
#include "libnml/nml/cmd_msg.hh"
#include "libnml/nml/stat_msg.hh"
#include <libnml/nml/cmd_msg.hh>
#include <libnml/nml/stat_msg.hh>
#include "modal_state.hh"
#include "canon.hh" // CANON_TOOL_TABLE, CANON_UNITS
#include "interp_codes.h" // ACTIVE_G_CODES, etc
Expand Down
4 changes: 2 additions & 2 deletions src/emc/nml_intf/emccfg.h → include/nml_intf/emccfg.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
*
* Last change:
********************************************************************/
#ifndef EMCCFG_H
#define EMCCFG_H
#ifndef __LINUXCNC_NML_INTF_EMCCFG_H
#define __LINUXCNC_NML_INTF_EMCCFG_H

#ifdef __cplusplus
extern "C" {
Expand Down
4 changes: 2 additions & 2 deletions src/emc/nml_intf/emcglb.h → include/nml_intf/emcglb.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
*
* Last change:
********************************************************************/
#ifndef EMCGLB_H
#define EMCGLB_H
#ifndef __LINUXCNC_NML_INTF_EMCGLB_H
#define __LINUXCNC_NML_INTF_EMCGLB_H

#include <math.h> /* M_PI */
#include <linuxcnc.h> /* LINELEN */
Expand Down
4 changes: 2 additions & 2 deletions src/emc/nml_intf/emctool.h → include/nml_intf/emctool.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#ifndef EMCTOOL_H
#define EMCTOOL_H
#ifndef __LINUXCNC_NML_INTF_EMCTOOL_H
#define __LINUXCNC_NML_INTF_EMCTOOL_H

#include <emcpos.h>

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
********************************************************************/

#ifndef MODAL_STATE_HH
#define MODAL_STATE_HH
#ifndef __LINUXCNC_NML_INTF_MODAL_STATE_HH
#define __LINUXCNC_NML_INTF_MODAL_STATE_HH

#include <vector>
#include <bitset>

Expand Down
4 changes: 2 additions & 2 deletions src/emc/nml_intf/state_tag.h → include/nml_intf/state_tag.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
********************************************************************/


#ifndef STATE_TAG_H
#define STATE_TAG_H
#ifndef __LINUXCNC_NML_INTF_STATE_TAG_H
#define __LINUXCNC_NML_INTF_STATE_TAG_H

#include <rtapi_stdint.h>

Expand Down
4 changes: 2 additions & 2 deletions src/emc/rcs_status.hh → include/rcs_status.hh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
* License: GPL Version 2
* System: Linux
********************************************************************/
#ifndef LINUXCNC_RCS_STATUS_HH
#define LINUXCNC_RCS_STATUS_HH
#ifndef __LINUXCNC_RCS_STATUS_HH
#define __LINUXCNC_RCS_STATUS_HH

enum class RCS_STATUS : int { /* Originally from nml_mod.hh */
UNINITIALIZED = -1,
Expand Down
4 changes: 2 additions & 2 deletions src/emc/canterp/canterp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
#include <algorithm>
#include <linuxcnc.h>
#include "nml_intf/interp_return.hh"
#include "nml_intf/canon.hh"
#include <nml_intf/canon.hh>
#include "rs274ngc/interp_base.hh"
#include "nml_intf/modal_state.hh"
#include <nml_intf/modal_state.hh>

static char the_command[LINELEN] = { 0 }; // our current command
static char the_command_name[LINELEN] = { 0 }; // just the name part
Expand Down
6 changes: 3 additions & 3 deletions src/emc/ini/iniaxis.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
#include <fmt/format.h>
#include "logutil.hh"

#include "nml_intf/emc.hh"
#include "nml_intf/emcglb.h"
#include "nml_intf/emccfg.h"
#include <nml_intf/emc.hh>
#include <nml_intf/emcglb.h>
#include <nml_intf/emccfg.h>
#include <cstdio>
#include <inifile.hh>

Expand Down
2 changes: 1 addition & 1 deletion src/emc/ini/iniaxis.hh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef INIAXIS_HH
#define INIAXIS_HH

#include "nml_intf/emc.hh" // EMC_AXIS_STAT
#include <nml_intf/emc.hh> // EMC_AXIS_STAT

/* initializes axis modules from INI file */
extern int iniAxis(int axis, const char *filename);
Expand Down
2 changes: 1 addition & 1 deletion src/emc/ini/inifile.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <locale.h>


#include "nml_intf/emc.hh"
#include <nml_intf/emc.hh>

#include <inifile.hh>

Expand Down
4 changes: 2 additions & 2 deletions src/emc/ini/inihal.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
----------------------------------------------------------------------*/
#include "logutil.hh"
#include "nml_intf/emc.hh"
#include "nml_intf/emcglb.h"
#include <nml_intf/emc.hh>
#include <nml_intf/emcglb.h>
#include <stdio.h>
#include <hal.h>
#include <rtapi.h>
Expand Down
6 changes: 3 additions & 3 deletions src/emc/ini/inijoint.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include <fmt/format.h>
#include "logutil.hh"

#include "nml_intf/emc.hh"
#include <nml_intf/emc.hh>
#include <cstdio>
#include "nml_intf/emcglb.h"
#include "nml_intf/emccfg.h"
#include <nml_intf/emcglb.h>
#include <nml_intf/emccfg.h>
#include <inifile.hh>

#include "inihal.hh"
Expand Down
6 changes: 3 additions & 3 deletions src/emc/ini/inispindle.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
#include <fmt/format.h>
#include "logutil.hh"

#include "nml_intf/emc.hh"
#include <nml_intf/emc.hh>
#include <cstdio>
#include "nml_intf/emcglb.h"
#include "nml_intf/emccfg.h"
#include <nml_intf/emcglb.h>
#include <nml_intf/emccfg.h>
#include <inifile.hh>

#include "inihal.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/emc/ini/inispindle.hh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef INISPINDLE_HH
#define INISPINDLE_HH

#include "nml_intf/emc.hh" // EMC_AXIS_STAT
#include <nml_intf/emc.hh> // EMC_AXIS_STAT

/* initializes spindle modules from INI file */
extern int iniSpindle(int spindle, const char *filename);
Expand Down
4 changes: 2 additions & 2 deletions src/emc/ini/initraj.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include <stdlib.h>
#include "logutil.hh"

#include "nml_intf/emc.hh"
#include <nml_intf/emc.hh>
#include <emcpos.h>
#include <cstdio>
#include "nml_intf/emcglb.h"
#include <nml_intf/emcglb.h>
#include <inifile.hh>

#include "inihal.hh"
Expand Down
Loading