Board config to support Software SPI

Author: sdavi

src/LPC/BoardConfig.cpp

@@ -16,6 +16,7 @@
 #include "RepRapFirmware.h"
 #include "GCodes/GCodeResult.h"
 #include "sd_mmc.h"
+#include "SharedSPI.h"
 
 #include "Platform.h"
 
@@ -68,7 +69,7 @@ static const boardConfigEntry_t boardConfigs[]=
     {"externalSDCard.csPin", &SdSpiCSPins[1], nullptr, cvPinType},
     {"externalSDCard.cardDetectPin", &SdCardDetectPins[1], nullptr, cvPinType},
     {"lpc.externalSDCard.spiFrequencyHz", &ExternalSDCardFrequency, nullptr, cvUint32Type},
-
+    {"lpc.externalSDCard.spiChannel", &ExternalSDCardSSPChannel, nullptr, cvUint8Type},
 
     {"lcd.lcdCSPin", &LcdCSPin, nullptr, cvPinType},
     {"lcd.lcdBeepPin", &LcdBeepPin, nullptr, cvPinType},
@@ -77,10 +78,12 @@ static const boardConfigEntry_t boardConfigs[]=
     {"lcd.encoderPinSw", &EncoderPinSw, nullptr, cvPinType},
     {"lcd.lcdDCPin", &LcdDCPin, nullptr, cvPinType},
     {"lcd.panelButtonPin", &PanelButtonPin, nullptr, cvPinType},
+    {"lcd.spiChannel", &LcdSpiChannel, nullptr, cvUint8Type},
 
+    {"lpc.softwareSPI.pins", SoftwareSPIPins, &NumSoftwareSPIPins, cvPinType}, //SCK, MISO, MOSI
+    
     {"lpc.uartPanelDueMode", &UARTPanelDueMode, nullptr, cvBoolType},
 
-    
 };
 
 
@@ -164,6 +167,8 @@ void BoardConfig::Init() {
             }
         }
 
+        //Setup the Software SPI Pins
+        sspi_setPinsForChannel(SWSPI0, SoftwareSPIPins[0], SoftwareSPIPins[1], SoftwareSPIPins[2]);
 
         //Configure the HW Timers
         ConfigureTimerForPWM(0, Timer1Frequency); //Timer1 is channel 0
@@ -177,15 +182,22 @@ void BoardConfig::Init() {
         //Configure the External SDCard
         if(SdSpiCSPins[1] != NoPin)
         {
+            setPullup(SdCardDetectPins[1], true);
+            //set the SSP Channel for External SDCard
+            if(ExternalSDCardSSPChannel == SSP0 || ExternalSDCardSSPChannel == SSP1 || ExternalSDCardSSPChannel == SWSPI0){
+                sd_mmc_setSSPChannel(1, ExternalSDCardSSPChannel); //must be called before reinit
+            }
             //set the CSPin and the frequency for the External SDCard
             sd_mmc_reinit_slot(1, SdSpiCSPins[1], ExternalSDCardFrequency);
         }
 
-        //Init Extra pins from LCD (not used anywhere yet)
+        //Init pins from LCD (not used anywhere yet)
         //make sure to init ButtonPin as input incase user presses button
-        if(PanelButtonPin != NoPin) pinMode(PanelButtonPin, INPUT);
-        if(LcdDCPin != NoPin) pinMode(LcdDCPin, OUTPUT_HIGH);
-        
+        if(PanelButtonPin != NoPin) pinMode(PanelButtonPin, INPUT); //unused
+        if(LcdDCPin != NoPin) pinMode(LcdDCPin, OUTPUT_HIGH); //unused
+        if(LcdBeepPin != NoPin) pinMode(LcdBeepPin, OUTPUT_LOW);
+        // Set the 12864 display CS pin low to prevent it from receiving garbage due to other SPI traffic
+        if(LcdCSPin != NoPin) pinMode(LcdCSPin, OUTPUT_LOW);
 
 
     }

src/LPC/Pins_LPC.cpp

@@ -30,8 +30,9 @@ Pin TachoPins[NumTachos] = { NoPin };
 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 = 2000000; //default to 2MHz
+uint32_t InternalSDCardFrequency = 25000000; //default to 25MHz
+SSPChannel ExternalSDCardSSPChannel = SSP0;
 
-uint32_t InternalSDCardFrequency = 10000000; //default to 10MHz
 
 Pin SpecialPinMap[MaxNumberSpecialPins] = { NoPin, NoPin, NoPin, NoPin, NoPin, NoPin, NoPin, NoPin, NoPin, NoPin };
 
@@ -43,6 +44,8 @@ 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 LED1 = NoPin;
 //Pin LED2 = NoPin;
@@ -67,5 +70,6 @@ float digipotFactor = 113.33; //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)
 
 

src/LPC/Pins_LPC.h

@@ -144,14 +144,15 @@ constexpr Pin SdWriteProtectPins[NumSdCards] = { NoPin, NoPin }; //unused on LPC
 extern Pin SdSpiCSPins[NumSdCards];
 extern uint32_t ExternalSDCardFrequency;
 extern uint32_t InternalSDCardFrequency;
+extern SSPChannel ExternalSDCardSSPChannel;
 
 
 // Definition of which pins we allow to be controlled using M42 etc
 constexpr size_t MaxNumberSpecialPins = 10;
 extern Pin SpecialPinMap[MaxNumberSpecialPins];
 
 constexpr uint32_t LcdSpiClockFrequency = 2000000;    // 2.0MHz
-constexpr SSPChannel LcdSpiChannel = SSP0;
+extern SSPChannel LcdSpiChannel;
 extern Pin LcdCSPin;
 extern Pin LcdDCPin;
 extern Pin LcdBeepPin;
@@ -160,7 +161,6 @@ extern Pin EncoderPinB;
 extern Pin EncoderPinSw;
 extern Pin PanelButtonPin;
 
-
 //LEDs
 extern Pin StatusLEDPin;
 extern Pin DiagPin;
@@ -169,6 +169,8 @@ extern Pin DiagPin;
 constexpr size_t NUM_SERIAL_CHANNELS = 2;
 extern bool UARTPanelDueMode;
 
+constexpr size_t NumSoftwareSPIPins = 3;
+extern Pin SoftwareSPIPins[3]; //GPIO pins for softwareSPI (used with SharedSPI)
 
 // Use TX0/RX0 for the auxiliary serial line
 #if defined(__MBED__)