Updated hardware.h’s to use changed system settings

This commit is contained in:
Alden Hart
2018-04-15 05:18:34 -04:00
parent 38ca38b2ed
commit 2c53a2854c
6 changed files with 84 additions and 111 deletions
+14 -18
View File
@@ -40,24 +40,28 @@
#define G2CORE_HARDWARE_PLATFORM "Archim"
#define G2CORE_HARDWARE_VERSION "na"
/***** Axes, motors & PWM channels used by the application *****/
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
/***** Motors & PWM channels supported by this hardware *****/
// These must be defines (not enums) so expressions like this:
// #if (MOTORS >= 6) will work
#define AXES 9 // number of axes supported in this version
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
#define MOTORS 4 // number of motors on the board
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
#define PWMS 2 // number of supported PWM channels
#define TOOLS 32 // number of entries in tool table (index starts at 1)
#define MOTORS 4 // number of motors supported the hardware
#define PWMS 2 // number of PWM channels supported the hardware
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/*************************
* Motate Setup *
*************************/
#include "MotatePins.h"
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
using Motate::TimerChannel;
using Motate::ServiceCall;
@@ -67,14 +71,6 @@ using Motate::Pin;
using Motate::PWMOutputPin;
using Motate::OutputPin;
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/************************************************************************************
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************
************************************************************************************/
+14 -20
View File
@@ -40,26 +40,28 @@
#define G2CORE_HARDWARE_PLATFORM "ArduinoDue"
#define G2CORE_HARDWARE_VERSION "na"
/***** Axes, motors & PWM channels used by the application *****/
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
/***** Motors & PWM channels supported by this hardware *****/
// These must be defines (not enums) so expressions like this:
// #if (MOTORS >= 6) will work
#define AXES 9 // number of axes supported in this version
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
#define MOTORS 4 // number of motors on the board
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
#define PWMS 2 // number of supported PWM channels
#define TOOLS 32 // number of entries in tool table (index starts at 1)
#define MOTORS 4 // number of motors supported the hardware
#define PWMS 2 // number of PWM channels supported the hardware
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/*************************
* Motate Setup *
*************************/
// ARM specific code start here
#include "MotatePins.h"
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
using Motate::TimerChannel;
using Motate::ServiceCall;
@@ -69,14 +71,6 @@ using Motate::Pin;
using Motate::PWMOutputPin;
using Motate::OutputPin;
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/************************************************************************************
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************
************************************************************************************/
+14 -18
View File
@@ -41,24 +41,28 @@
#define G2CORE_HARDWARE_PLATFORM "gQuadtratic"
#define G2CORE_HARDWARE_VERSION "b"
/***** Axes, motors & PWM channels used by the application *****/
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
/***** Motors & PWM channels supported by this hardware *****/
// These must be defines (not enums) so expressions like this:
// #if (MOTORS >= 6) will work
#define AXES 9 // number of axes supported in this version
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
#define MOTORS 3 // number of motors on the board
#define COORDS 6 // number of supported coordinate systems (1-6)
#define PWMS 2 // number of supported PWM channels
#define TOOLS 32 // number of entries in tool table (index starts at 1)
#define MOTORS 4 // number of motors supported the hardware
#define PWMS 2 // number of PWM channels supported the hardware
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/*************************
* Motate Setup *
*************************/
#include "MotatePins.h"
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
using Motate::TimerChannel;
using Motate::ServiceCall;
@@ -68,14 +72,6 @@ using Motate::Pin;
using Motate::PWMOutputPin;
using Motate::OutputPin;
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/************************************************************************************
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************
************************************************************************************/
+14 -19
View File
@@ -35,30 +35,33 @@
#ifndef HARDWARE_H_ONCE
#define HARDWARE_H_ONCE
/*--- Hardware platform enumerations ---*/
#define G2CORE_HARDWARE_PLATFORM "gQuintic"
#define G2CORE_HARDWARE_VERSION "b"
/***** Axes, motors & PWM channels used by the application *****/
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
/***** Motors & PWM channels supported by this hardware *****/
// These must be defines (not enums) so expressions like this:
// #if (MOTORS >= 6) will work
#define AXES 9 // number of axes supported in this version
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
#define MOTORS 5 // number of motors on the board
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
#define PWMS 2 // number of supported PWM channels
#define TOOLS 32 // number of entries in tool table (index starts at 1)
#define MOTORS 4 // number of motors supported the hardware
#define PWMS 2 // number of PWM channels supported the hardware
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/*************************
* Motate Setup *
*************************/
#include "MotatePins.h"
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
using Motate::TimerChannel;
using Motate::ServiceCall;
@@ -68,14 +71,6 @@ using Motate::Pin;
using Motate::PWMOutputPin;
using Motate::OutputPin;
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/************************************************************************************
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************
************************************************************************************/
+14 -18
View File
@@ -40,24 +40,28 @@
#define G2CORE_HARDWARE_PLATFORM "printerboardg2"
#define G2CORE_HARDWARE_VERSION "c"
/***** Axes, motors & PWM channels used by the application *****/
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
/***** Motors & PWM channels supported by this hardware *****/
// These must be defines (not enums) so expressions like this:
// #if (MOTORS >= 6) will work
#define AXES 9 // number of axes supported in this version
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
#define MOTORS 4 // number of motors on the board
#define COORDS 6 // number of supported coordinate systems (index starts at 1)
#define PWMS 2 // number of supported PWM channels
#define TOOLS 32 // number of entries in tool table (index starts at 1)
#define MOTORS 4 // number of motors supported the hardware
#define PWMS 2 // number of PWM channels supported the hardware
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/*************************
* Motate Setup *
*************************/
#include "MotatePins.h"
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
using Motate::TimerChannel;
using Motate::ServiceCall;
@@ -67,14 +71,6 @@ using Motate::Pin;
using Motate::PWMOutputPin;
using Motate::OutputPin;
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/************************************************************************************
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************
************************************************************************************/
+14 -18
View File
@@ -40,24 +40,28 @@
#define G2CORE_HARDWARE_PLATFORM "sbv300"
#define G2CORE_HARDWARE_VERSION "k"
/***** Axes, motors & PWM channels used by the application *****/
// Axes, motors & PWM channels must be defines (not enums) so expressions like this:
/***** Motors & PWM channels supported by this hardware *****/
// These must be defines (not enums) so expressions like this:
// #if (MOTORS >= 6) will work
#define AXES 9 // number of axes supported in this version
#define HOMING_AXES 4 // number of axes that can be homed (assumes Zxyabc sequence)
#define MOTORS 4 // number of motors on the board
#define COORDS 6 // number of supported coordinate systems (1-6)
#define PWMS 2 // number of supported PWM channels
#define TOOLS 32 // number of entries in tool table (index starts at 1)
#define MOTORS 4 // number of motors supported the hardware
#define PWMS 2 // number of PWM channels supported the hardware
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/*************************
* Motate Setup *
*************************/
#include "MotatePins.h"
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
#include "MotateTimers.h" // for TimerChanel<> and related...
#include "MotateServiceCall.h" // for ServiceCall<>
using Motate::TimerChannel;
using Motate::ServiceCall;
@@ -67,14 +71,6 @@ using Motate::Pin;
using Motate::PWMOutputPin;
using Motate::OutputPin;
/*************************
* Global System Defines *
*************************/
#define MILLISECONDS_PER_TICK 1 // MS for system tick (systick * N)
#define SYS_ID_DIGITS 16 // actual digits in system ID (up to 16)
#define SYS_ID_LEN 24 // total length including dashes and NUL
/************************************************************************************
**** ARM SAM3X8E SPECIFIC HARDWARE *************************************************
************************************************************************************/