Minor updates

Author: sdavi

src/LPC/BoardConfig.cpp

@@ -79,12 +79,12 @@ static const boardConfigEntry_t boardConfigs[]=
 };
 
 
-static inline bool isSpaceOrTab(char c)
+static inline bool isSpaceOrTab(char c) noexcept
 {
     return (c == ' ' || c == '\t');
 }
 
-BoardConfig::BoardConfig()
+BoardConfig::BoardConfig() noexcept
 {
 
 }
@@ -201,7 +201,7 @@ void BoardConfig::Init()
 
 
 //Convert a pin string into a RRF Pin
-Pin BoardConfig::StringToPin(const char *strvalue)
+Pin BoardConfig::StringToPin(const char *strvalue) noexcept
 {
     //check size.. should be 3chars or 4 chars i.e. 0.1, 2.25, 2nd char should always be .
     uint8_t len = strlen(strvalue);
@@ -229,7 +229,7 @@ Pin BoardConfig::StringToPin(const char *strvalue)
 
 
 
-void BoardConfig::PrintValue(MessageType mtype, configValueType configType, void *variable)
+void BoardConfig::PrintValue(MessageType mtype, configValueType configType, void *variable) noexcept
 {
     switch(configType)
     {
@@ -272,7 +272,7 @@ void BoardConfig::PrintValue(MessageType mtype, configValueType configType, void
 
 
 //Information printed by M122 P200
-void BoardConfig::Diagnostics(MessageType mtype)
+void BoardConfig::Diagnostics(MessageType mtype) noexcept
 {
     reprap.GetPlatform().MessageF(mtype, "== Configurable Board.txt Settings ==\n");
 
@@ -325,7 +325,7 @@ void BoardConfig::Diagnostics(MessageType mtype)
 
 }
 
-void BoardConfig::PrintPinArray(MessageType mtype, Pin arr[], uint16_t numEntries)
+void BoardConfig::PrintPinArray(MessageType mtype, Pin arr[], uint16_t numEntries) noexcept
 {
     reprap.GetPlatform().MessageF(mtype, "[ ");
     for(uint8_t i=0; i<numEntries; i++)
@@ -345,7 +345,7 @@ void BoardConfig::PrintPinArray(MessageType mtype, Pin arr[], uint16_t numEntrie
 
 
 //Set a variable from a string using the specified data type
-void BoardConfig::SetValueFromString(configValueType type, void *variable, const char *valuePtr)
+void BoardConfig::SetValueFromString(configValueType type, void *variable, const char *valuePtr) noexcept
 {
     switch(type)
     {
@@ -422,7 +422,7 @@ void BoardConfig::SetValueFromString(configValueType type, void *variable, const
 
 
 
-bool BoardConfig::GetConfigKeys(FileStore *configFile)
+bool BoardConfig::GetConfigKeys(FileStore *configFile) noexcept
 {
 
     size_t maxLineLength = 120;

src/LPC/BoardConfig.h

@@ -33,15 +33,15 @@ class BoardConfig {
 public:
     static void Init();
 
-    static void Diagnostics(MessageType mtype);
-    static Pin StringToPin(const char *strvalue);
+    static void Diagnostics(MessageType mtype) noexcept;
+    static Pin StringToPin(const char *strvalue) noexcept;
 
 private:
-    BoardConfig();
-    static bool GetConfigKeys(FileStore *configFile );
-    static void SetValueFromString(configValueType type, void *variable, const char *valuePtr);
-    static void PrintValue(MessageType mtype, configValueType configType, void *variable);
-    static void PrintPinArray(MessageType mtype, Pin arr[], uint16_t numEntries);
+    BoardConfig()  noexcept;
+    static bool GetConfigKeys(FileStore *configFile ) noexcept;
+    static void SetValueFromString(configValueType type, void *variable, const char *valuePtr) noexcept;
+    static void PrintValue(MessageType mtype, configValueType configType, void *variable) noexcept;
+    static void PrintPinArray(MessageType mtype, Pin arr[], uint16_t numEntries) noexcept;
 
 };
 

src/LPC/Pins_LPC.cpp

@@ -9,60 +9,59 @@
 //All I/Os default to input with pullup after reset (9.2.1 from manual)
 //The Smoothie Bootloader turns off Pins 2.4, 2.5, 2.6 and 2.7 which are used as Heater pins
 
-Pin TEMP_SENSE_PINS[NumThermistorInputs] =   {NoPin, NoPin, NoPin, NoPin};
+Pin TEMP_SENSE_PINS[NumThermistorInputs] = {NoPin, NoPin, NoPin, NoPin};
 Pin SpiTempSensorCsPins[MaxSpiTempSensors] = { NoPin, NoPin };
 
 Pin ATX_POWER_PIN = NoPin;
 bool ATX_POWER_INVERTED = false;
 
-
-Pin SdCardDetectPins[NumSdCards] =  { NoPin, NoPin };
-Pin SdSpiCSPins[NumSdCards] =       { P0_6, NoPin };    // Internal, external. Note:: ("slot" 0 in CORE is configured to be LCP SSP1 to match default RRF behaviour)
-uint32_t ExternalSDCardFrequency =  4000000;            //default to 4MHz
+//SDCard pins and settings
+Pin SdCardDetectPins[NumSdCards] = { NoPin, NoPin };
+Pin SdSpiCSPins[NumSdCards] =      { P0_6,  NoPin };    // Internal, external. Note:: ("slot" 0 in CORE is configured to be LCP SSP1 to match default RRF behaviour)
+uint32_t ExternalSDCardFrequency = 4000000;             //default to 4MHz
 SSPChannel ExternalSDCardSSPChannel = SSP0;             //default to SSP0
-uint32_t InternalSDCardFrequency =  25000000;           //default to 25MHz
+uint32_t InternalSDCardFrequency = 25000000;            //default to 25MHz
 
 
-Pin LcdCSPin =       NoPin; //LCD Chip Select
-Pin LcdDCPin =       NoPin;  //DataControl Pin (A0) if none used set to NoPin
-Pin LcdBeepPin =     NoPin;
-Pin EncoderPinA =    NoPin;
-Pin EncoderPinB =    NoPin;
-Pin EncoderPinSw =   NoPin; //click
-Pin PanelButtonPin = NoPin; //Extra button on Viki and RRD Panels (reset/back etc)
+Pin LcdCSPin = NoPin;               //LCD Chip Select
+Pin LcdDCPin = NoPin;               //DataControl Pin (A0) if none used set to NoPin
+Pin LcdBeepPin = NoPin;
+Pin EncoderPinA = NoPin;
+Pin EncoderPinB = NoPin;
+Pin EncoderPinSw = NoPin;           //click
+Pin PanelButtonPin = NoPin;         //Extra button on Viki and RRD Panels (reset/back etc)
 SSPChannel LcdSpiChannel = SSP0;
 
 Pin DiagPin = NoPin;
 
+//Stepper settings
 Pin ENABLE_PINS[NumDirectDrivers] =     {NoPin, NoPin, NoPin, NoPin, NoPin};
 Pin STEP_PINS[NumDirectDrivers] =       {NoPin, NoPin, NoPin, NoPin, NoPin};
 Pin DIRECTION_PINS[NumDirectDrivers] =  {NoPin, NoPin, NoPin, NoPin, NoPin};
-uint32_t STEP_DRIVER_MASK = 0; //SD: mask of the step pins on Port 2 used for writing to step pins in parallel
+uint32_t STEP_DRIVER_MASK = 0;                          //SD: mask of the step pins on Port 2 used for writing to step pins in parallel
+bool hasStepPinsOnDifferentPorts = false;               //for boards that don't have all step pins on port2
+bool hasDriverCurrentControl = false;                   //Supports digipots to set stepper current
+float digipotFactor = 113.33;                           //defualt factor for converting current to digipot value
 
-bool hasStepPinsOnDifferentPorts = false;   //for boards that don't have all step pins on port2
-bool hasDriverCurrentControl = false;
-float digipotFactor = 113.33;               //defualt factor for converting current to digipot value
-bool UARTPanelDueMode = false;              //disable PanelDue support by default
 
-Pin SoftwareSPIPins[3] = {NoPin, NoPin, NoPin}; //GPIO pins for softwareSPI (used with SharedSPI)
+Pin SoftwareSPIPins[3] = {NoPin, NoPin, NoPin};         //GPIO pins for softwareSPI (used with SharedSPI)
 
 #if defined(HAS_LINUX_INTERFACE)
-Pin LinuxTfrReadyPin = NoPin;
+    Pin LinuxTfrReadyPin = NoPin;
 #endif
 
 #if defined(ESP8266WIFI)
     Pin EspDataReadyPin = NoPin;
-    Pin SamTfrReadyPin =  NoPin;
-    Pin EspResetPin =     NoPin;
-    //Pin SamCsPin =        NoPin; 
+    Pin SamTfrReadyPin = NoPin;
+    Pin EspResetPin = NoPin;
 #endif
 
 //Default to the Generic PinTable
 PinEntry *PinTable = (PinEntry *) PinTable_Generic;
 size_t NumNamedLPCPins = ARRAY_SIZE(PinTable_Generic);
 char lpcBoardName[MaxBoardNameLength] = "generic";
 
-bool IsEmptyPinArray(Pin *arr, size_t len)
+bool IsEmptyPinArray(Pin *arr, size_t len) noexcept
 {
     for(size_t i=0; i<len; i++)
     {
@@ -72,7 +71,8 @@ bool IsEmptyPinArray(Pin *arr, size_t len)
     return true;
 }
 
-void SetDefaultPinArray(const Pin *src, Pin *dst, size_t len)
+//If the dst array is empty, then copy the src array to dst array
+void SetDefaultPinArray(const Pin *src, Pin *dst, size_t len) noexcept
 {
     if(IsEmptyPinArray(dst, len))
     {
@@ -86,7 +86,7 @@ void SetDefaultPinArray(const Pin *src, Pin *dst, size_t len)
 
 
 //Find Board settings from string
-bool SetBoard(const char* bn)
+bool SetBoard(const char* bn) noexcept
 {
     const size_t numBoards = ARRAY_SIZE(LPC_Boards);
 
@@ -97,7 +97,7 @@ bool SetBoard(const char* bn)
             PinTable = (PinEntry *)LPC_Boards[i].boardPinTable;
             NumNamedLPCPins = LPC_Boards[i].numNamedEntries;
 
-            //copy defaults (if needed)
+            //copy default settings (if not set in board.txt)
             SetDefaultPinArray(LPC_Boards[i].defaults.enablePins, ENABLE_PINS, MaxTotalDrivers);
             SetDefaultPinArray(LPC_Boards[i].defaults.stepPins, STEP_PINS, MaxTotalDrivers);
             SetDefaultPinArray(LPC_Boards[i].defaults.dirPins, DIRECTION_PINS, MaxTotalDrivers);
@@ -115,7 +115,7 @@ bool SetBoard(const char* bn)
 
 // Function to look up a pin name pass back the corresponding index into the pin table
 // On this platform, the mapping from pin names to pins is fixed, so this is a simple lookup
-bool LookupPinName(const char*pn, LogicalPin& lpin, bool& hardwareInverted)
+bool LookupPinName(const char*pn, LogicalPin& lpin, bool& hardwareInverted) noexcept
 {
     if (StringEqualsIgnoreCase(pn, NoPinName))
     {
@@ -162,8 +162,8 @@ bool LookupPinName(const char*pn, LogicalPin& lpin, bool& hardwareInverted)
     }
 
     //pn did not match a label in the lookup table, so now
-    //look up by classic port.pin
-    //Note: only allocated pins already in the lookup table are suported.
+    //look up by classic port.pin format
+    //Note: only pins in the selected board lookup table are suported.
     const Pin lpcPin = BoardConfig::StringToPin(pn);
     if(lpcPin != NoPin){
         //find pin in lookup table

src/LPC/Pins_LPC.h

@@ -66,16 +66,11 @@
 #endif
 
 
-#define NO_EXTRUDER_ENDSTOPS             1    // Temporary!!!
-
-
-
 // The physical capabilities of the machine
 constexpr size_t NumDirectDrivers = 5;               // The maximum number of drives supported by the electronics
 constexpr size_t MaxSmartDrivers = 0;                // The maximum number of smart drivers
 
-constexpr size_t MaxSensorsInSystem = 32;
-typedef uint32_t SensorsBitmap;
+constexpr size_t MaxSensors = 32;
 
 constexpr size_t MaxHeaters = 3;                     // The maximum number of heaters in the machine
 constexpr size_t MaxExtraHeaterProtections = 3;      // The number of extra heater protection instances
@@ -133,8 +128,8 @@ constexpr float EXT_SHC = 0.0;
 constexpr float DefaultThermistorSeriesR = 4700.0;
 
 constexpr size_t MaxSpiTempSensors = 2;
-extern Pin SpiTempSensorCsPins[MaxSpiTempSensors]; // Digital pins the 31855s have their select lines tied to
-constexpr SSPChannel TempSensorSSPChannel = SSP0; //Conect SPI Temp sensor to SSP0
+extern Pin SpiTempSensorCsPins[MaxSpiTempSensors];  // Digital pins the 31855s have their select lines tied to
+constexpr SSPChannel TempSensorSSPChannel = SSP0;   //Connect SPI Temp sensor to SSP0
 
 #if HAS_LINUX_INTERFACE
     extern Pin LinuxTfrReadyPin;
@@ -257,10 +252,10 @@ constexpr inline PinCapability operator|(PinCapability a, PinCapability b)
 
 struct PinEntry
 {
-    bool CanDo(PinAccess access) const;
-    Pin GetPin() const { return pin; }
-    PinCapability GetCapability() const { return cap; }
-    const char* GetNames() const { return names; }
+    bool CanDo(PinAccess access) const noexcept;
+    Pin GetPin() const  noexcept{ return pin; }
+    PinCapability GetCapability() const  noexcept{ return cap; }
+    const char* GetNames() const  noexcept{ return names; }
 
     Pin pin;
     PinCapability cap;
@@ -271,7 +266,7 @@ extern PinEntry *PinTable;
 
 
 
-bool LookupPinName(const char *pn, LogicalPin& lpin, bool& hardwareInverted);
+bool LookupPinName(const char *pn, LogicalPin& lpin, bool& hardwareInverted) noexcept;
 
 constexpr const char *DefaultEndstopPinNames[] = { "nil", "nil", "nil" };
 constexpr const char *DefaultZProbePinNames = "nil";
@@ -282,7 +277,7 @@ constexpr PwmFrequency DefaultFanPwmFrequencies[] = { DefaultFanPwmFreq };
 
 //Boards
 
-bool SetBoard(const char* bn);
+bool SetBoard(const char* bn)  noexcept;
 
 constexpr size_t MaxBoardNameLength = 20;
 extern char lpcBoardName[MaxBoardNameLength];
@@ -316,6 +311,7 @@ struct BoardEntry
 
 
 
+//Known boards with built in stepper configurations and pin table 
 constexpr BoardEntry LPC_Boards[] =
 {
     {"mbed",             PinTable_Mbed,             ARRAY_SIZE(PinTable_Mbed),             mbedDefaults}, //for debugging
@@ -346,7 +342,7 @@ namespace StepPins
     // All our step pins are on port D, so the bitmap is just the map of step bits in port D.
 
     // Calculate the step bit for a driver. This doesn't need to be fast. It must return 0 if the driver is remote.
-    static inline uint32_t CalcDriverBitmap(size_t driver)
+    static inline uint32_t CalcDriverBitmap(size_t driver)  noexcept
     {
         if (driver >= NumDirectDrivers)
         {
@@ -365,8 +361,7 @@ namespace StepPins
 
     // Set the specified step pins high
     // This needs to be as fast as possible, so we do a parallel write to the port(s).
-    // We rely on only those port bits that are step pins being set in the PIO_OWSR register of each port
-    static inline void StepDriversHigh(uint32_t driverMap)
+    static inline void StepDriversHigh(uint32_t driverMap)  noexcept
     {
         if(hasStepPinsOnDifferentPorts == true )
         {
@@ -392,7 +387,7 @@ namespace StepPins
     // Set all step pins low
     // This needs to be as fast as possible, so we do a parallel write to the port(s).
     // We rely on only those port bits that are step pins being set in the STEP_DRIVER_MASK variable
-    static inline void StepDriversLow()
+    static inline void StepDriversLow() noexcept
     {
         if(hasStepPinsOnDifferentPorts == true )
         {
@@ -403,6 +398,7 @@ namespace StepPins
         }
         else
         {
+            //pins all on port 2, parallel write
             LPC_GPIO2->CLR = STEP_DRIVER_MASK; //clear only pins that are 1 in the mask
         }
     }