From a56a0321c6644add7fbb500e5955cabcf0d82827 Mon Sep 17 00:00:00 2001 From: reprappro Date: Sun, 9 Dec 2012 21:02:20 +0000 Subject: [PATCH] Cosmetic tidying. --- Heat.h | 2 +- Platform.h | 12 ++++++------ RepRapFirmware.h | 4 ++-- RepRapFirmware.ino | 12 +++++++++++- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Heat.h b/Heat.h index 88becba..89f37a0 100644 --- a/Heat.h +++ b/Heat.h @@ -37,7 +37,7 @@ class Heat public: Heat(); - ControlHeaters(); + void ControlHeaters(); private: diff --git a/Platform.h b/Platform.h index 327b77e..45504bc 100644 --- a/Platform.h +++ b/Platform.h @@ -119,12 +119,12 @@ class Platform // Communications and data storage; opening something unsupported returns -1. - char* FileList() // Returns a comma-separated?? list of all the files on local storage (for example on an SD card). - int OpenFile(char* fileName, boolean write); // Open a local file (for example on an SD card). + char* FileList(); // Returns a comma-separated?? list of all the files on local storage (for example on an SD card). + int OpenFile(char* fileName, bool write); // Open a local file (for example on an SD card). int OpenHost(); // Open a pseudofile that gives read/write communications to the host computer. int OpenMessage(); // Open a pseudofile that writes to the message system. Messages may simply flash an LED, or, // say, display the messages on an LCD. This may also transmit the messages to the host. - int OpenStore(boolean write); // Non-volatile non-removable storage such as EEPROM. + int OpenStore(bool write); // Non-volatile non-removable storage such as EEPROM. void Read(int file, char* string); // Read printable characters from a file into the string up to the next \n or \r, // which are not returned. Return string[0] == 0 if there's nothing there. void Write(int file, char* string); // Write the 0-terminated string to a file. End the string with \n or \r if you want them. @@ -132,7 +132,7 @@ class Platform // Movement - void setDirection(int drive, boolean forwards); + void setDirection(int drive, bool forwards); void step(int drive); void disable(int drive); // There is no drive enable; drives get enabled automatically the first time they are used. void home(int axis); @@ -146,14 +146,14 @@ class Platform private: - +/* int8_t stepPins[DRIVES] = STEP_PINS; int8_t directionPins[DRIVES] = DIRECTION_PINS; #define ENABLE_PINS {9, 10,11,12} #define LOW_STOP_PINS {13, 14, 15, 16} #define HIGH_STOP_PINS {17, 18, 19, 20} - + */ }; extern "C" diff --git a/RepRapFirmware.h b/RepRapFirmware.h index af59acc..3efb3cd 100644 --- a/RepRapFirmware.h +++ b/RepRapFirmware.h @@ -37,8 +37,8 @@ class RepRap public: RepRap(); - init(); - spin(); + void init(); + void spin(); private: diff --git a/RepRapFirmware.ino b/RepRapFirmware.ino index 29dc903..a563ab5 100644 --- a/RepRapFirmware.ino +++ b/RepRapFirmware.ino @@ -22,7 +22,7 @@ General design principles: * Don't abhor floats - they work fast enough if you're clever, * Don't avoid arrays and structs/classes, * Don't avoid pointers, - * Use operator and function overloading where appropriate, particulary for vector algebra. + * Use operator and function overloading where appropriate, particularly for vector algebra. ----------------------------------------------------------------------------------------------------- @@ -42,6 +42,16 @@ Licence: GPL RepRap* reprap; +void RepRap::init() +{ + +} + +void RepRap::spin() +{ + +} +