Move SpiManager registration into PinMapping class

This commit is contained in:
Thomas Basler
2025-02-13 22:50:08 +01:00
parent 136657c846
commit 5d43ec4fe3
2 changed files with 8 additions and 7 deletions

View File

@@ -7,6 +7,7 @@
#include "Utils.h" #include "Utils.h"
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <LittleFS.h> #include <LittleFS.h>
#include <SpiManager.h>
#include <string.h> #include <string.h>
#ifndef DISPLAY_TYPE #ifndef DISPLAY_TYPE
@@ -194,6 +195,13 @@ PinMapping_t& PinMappingClass::get()
bool PinMappingClass::init(const String& deviceMapping) bool PinMappingClass::init(const String& deviceMapping)
{ {
// Initialize SpiManager
SpiManagerInst.register_bus(SPI2_HOST);
#if SOC_SPI_PERIPH_NUM > 2
SpiManagerInst.register_bus(SPI3_HOST);
#endif
File f = LittleFS.open(PINMAPPING_FILENAME, "r", false); File f = LittleFS.open(PINMAPPING_FILENAME, "r", false);
if (!f) { if (!f) {

View File

@@ -25,7 +25,6 @@
#include "defaults.h" #include "defaults.h"
#include <Arduino.h> #include <Arduino.h>
#include <LittleFS.h> #include <LittleFS.h>
#include <SpiManager.h>
#include <TaskScheduler.h> #include <TaskScheduler.h>
#include <esp_heap_caps.h> #include <esp_heap_caps.h>
@@ -34,12 +33,6 @@ void setup()
// Move all dynamic allocations >512byte to psram (if available) // Move all dynamic allocations >512byte to psram (if available)
heap_caps_malloc_extmem_enable(512); heap_caps_malloc_extmem_enable(512);
// Initialize SpiManager
SpiManagerInst.register_bus(SPI2_HOST);
#if SOC_SPI_PERIPH_NUM > 2
SpiManagerInst.register_bus(SPI3_HOST);
#endif
// Initialize serial output // Initialize serial output
Serial.begin(SERIAL_BAUDRATE); Serial.begin(SERIAL_BAUDRATE);
#if !ARDUINO_USB_CDC_ON_BOOT #if !ARDUINO_USB_CDC_ON_BOOT