diff --git a/lib/comms/bus.cpp b/lib/comms/bus.cpp index 520aa58..e728d04 100644 --- a/lib/comms/bus.cpp +++ b/lib/comms/bus.cpp @@ -20,12 +20,15 @@ bool initUARTs(Config &config) return true; } +#ifndef HELTEC SPIClass &hspi = *(new SPIClass(HSPI)); // not usable until initSPIs +#endif bool initSPIs(Config &config) { if (config.spi1.enabled) { +#ifndef HELTEC delete (&hspi); hspi = *(new SPIClass(config.spi1.bus_num)); if (config.spi1.clock_freq > 0) @@ -35,10 +38,14 @@ bool initSPIs(Config &config) // if all the pins are -1, then will use the default for SPI bus_num hspi.begin(config.spi1.clk, config.spi1.miso, config.spi1.mosi); + Serial.printf("Initialized SPI%d @ %x: SC:%d MISO:%d MOSI:%d clock:%d\n", (int)config.spi1.bus_num, (void *)&hspi, (int)config.spi1.clk, (int)config.spi1.miso, (int)config.spi1.mosi, (int)config.spi1.clock_freq); +#else + Serial.println("SPI not supported on Heltec"); +#endif } return true; diff --git a/lib/comms/bus.h b/lib/comms/bus.h index b94599e..35a0aae 100644 --- a/lib/comms/bus.h +++ b/lib/comms/bus.h @@ -17,7 +17,9 @@ enum I2CDevices extern uint8_t wireDevices; extern uint8_t wire1Devices; +#ifndef HELTEC extern SPIClass &hspi; +#endif // abstract away a reference to Serial vs Serial0 vs Serial1, so it compiles #ifndef ARDUINO_USB_CDC_ON_BOOT