SPIButton configuration fixup

Author: dracc

Firmware/FFBoard/UserExtensions/Src/SPIButtons.cpp

@@ -51,13 +51,6 @@ SPI_Buttons::SPI_Buttons(uint16_t configuration_address, uint16_t configuration_
 	this->configuration_address_2 = configuration_address_2;
 	restoreFlash();
 
-	this->spiConfig.peripheral.BaudRatePrescaler = speedPresets[this->conf.spi_speed];
-	this->spiConfig.peripheral.FirstBit = SPI_FIRSTBIT_LSB;
-	this->spiConfig.peripheral.CLKPhase = SPI_PHASE_1EDGE;
-	this->spiConfig.peripheral.CLKPolarity = SPI_POLARITY_LOW;
-
-	initSPI();
-
 	registerCommands();
 	this->setCommandsEnabled(true);
 	ready  = true;
@@ -112,7 +105,6 @@ void SPI_Buttons::setConfig(ButtonSourceConfig config){
 		this->spiConfig.peripheral.FirstBit = SPI_FIRSTBIT_LSB;
 		this->spiConfig.peripheral.CLKPhase = SPI_PHASE_1EDGE;
 		this->spiConfig.peripheral.CLKPolarity = SPI_POLARITY_LOW;
-
 	}else if(conf.mode == SPI_BtnMode::PISOSR){
 		this->conf.cutRight = false;
 		this->spiConfig.cspol = false;
@@ -126,9 +118,7 @@ void SPI_Buttons::setConfig(ButtonSourceConfig config){
 		this->spiConfig.peripheral.CLKPhase = SPI_PHASE_1EDGE;
 		this->spiConfig.peripheral.CLKPolarity = SPI_POLARITY_LOW;
 	}
-//	spiPort.takeSemaphore();
-//	spiPort.configurePort(&this->spiConfig.peripheral);
-//	spiPort.giveSemaphore();
+	this->spiConfig.peripheral.BaudRatePrescaler = speedPresets[this->conf.spi_speed];
 	initSPI();
 	if(config.numButtons == 64){ // Special case
 			mask = 0xffffffffffffffff;
@@ -202,7 +192,7 @@ uint8_t SPI_Buttons::readButtons(uint64_t* buf){
 std::string SPI_Buttons::printModes(const std::vector<std::string>& names){
 	std::string reply;
 	for(uint8_t i = 0; i<names.size();i++){
-		reply+=  names[i]  + ":" + std::to_string(i)+"\n";
+		reply += names[i] + ":" + std::to_string(i) + "\n";
 	}
 	return reply;
 }