mirror of
https://github.com/thooge/esp32-nmea2000-obp60.git
synced 2025-12-16 15:33:05 +01:00
working spi task, measure with dms22b
This commit is contained in:
@@ -17,11 +17,27 @@
|
||||
#include "GWDMS22B.h"
|
||||
#include "GwTimer.h"
|
||||
|
||||
static SPIBus bus1(GWSPIHOST1);
|
||||
static SPIBus bus2(GWSPIHOST2);
|
||||
static SPIBus bus1(GWSPI0_HOST);
|
||||
static SPIBus bus2(GWSPI1_HOST);
|
||||
|
||||
static SpiSensorList sensors;
|
||||
|
||||
#ifdef GWSPI0_CLK
|
||||
static const int spi0clk=GWSPI0_CLK;
|
||||
#else
|
||||
static const int spi0clk=-1;
|
||||
#endif
|
||||
#ifdef GWSPI0_MISO
|
||||
static const int spi0miso=GWSPI0_MISO;
|
||||
#else
|
||||
static const int spi0miso=-1;
|
||||
#endif
|
||||
#ifdef GWSPI0_MOSI
|
||||
static const int spi0mosi=GWSPI0_MOSI;
|
||||
#else
|
||||
static const int spi0mosi=-1;
|
||||
#endif
|
||||
|
||||
#ifdef GWSPI1_CLK
|
||||
static const int spi1clk=GWSPI1_CLK;
|
||||
#else
|
||||
@@ -38,22 +54,6 @@ static const int spi1mosi=GWSPI1_MOSI;
|
||||
static const int spi1mosi=-1;
|
||||
#endif
|
||||
|
||||
#ifdef GWSPI2_CLK
|
||||
static const int spi2clk=GWSPI2_CLK;
|
||||
#else
|
||||
static const int spi2clk=-1;
|
||||
#endif
|
||||
#ifdef GWSPI2_MISO
|
||||
static const int spi2miso=GWSPI2_MISO;
|
||||
#else
|
||||
static const int spi2miso=-1;
|
||||
#endif
|
||||
#ifdef GWSPI2_MOSI
|
||||
static const int spi2mosi=GWSPI2_MOSI;
|
||||
#else
|
||||
static const int spi2mosi=-1;
|
||||
#endif
|
||||
|
||||
#define _GWSPI
|
||||
void runSpiTask(GwApi *api){
|
||||
GwLog *logger=api->getLogger();
|
||||
@@ -64,22 +64,22 @@ void runSpiTask(GwApi *api){
|
||||
if (bus == buses.end()){
|
||||
switch (busId)
|
||||
{
|
||||
case 1:
|
||||
if (spi1clk < 0){
|
||||
case GWSPI0_HOST:
|
||||
if (spi0clk < 0){
|
||||
LOG_DEBUG(GwLog::ERROR,"SPI bus 1 not configured, cannot create %s",sensor->prefix.c_str());
|
||||
}
|
||||
else{
|
||||
if (bus1.init(logger,spi1miso,spi1mosi,spi1clk)){
|
||||
if (bus1.init(logger,spi0mosi,spi0miso,spi0clk)){
|
||||
buses[busId]=&bus1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (spi2clk < 0){
|
||||
case GWSPI1_HOST:
|
||||
if (spi1clk < 0){
|
||||
LOG_DEBUG(GwLog::ERROR,"SPI bus 2 not configured, cannot create %s",sensor->prefix.c_str());
|
||||
}
|
||||
else{
|
||||
if (bus2.init(logger,spi2miso,spi2mosi,spi2clk)){
|
||||
if (bus2.init(logger,spi1mosi,spi1miso,spi1clk)){
|
||||
buses[busId]=&bus2;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user