cores/arduino/Arduino.h

@@ -118,6 +118,7 @@ int digitalPinToInterrupt(pin_size_t pin);
 #include <zephyrSerial.h>
 #include <strings.h>
 #include <api/itoa.h>
+#include <time_macros.h>
 
 // Allow namespace-less operations if Arduino.h is included
 using namespace arduino;

cores/arduino/time_macros.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <zephyr/sys/time_units.h>
+
+#define clockCyclesPerMicrosecond()  (1000000 / k_cyc_to_ns_near64(1000))
+#define clockCyclesToMicroseconds(a) (a / clockCyclesPerMicrosecond())
+#define microsecondsToClockCycles(a) (a * clockCyclesPerMicrosecond())

libraries/SPI/SPI.cpp

@@ -8,9 +8,7 @@
 #include "zephyrInternal.h"
 #include <zephyr/kernel.h>
 
-arduino::ZephyrSPI::ZephyrSPI(const struct device *spi) : spi_dev(spi) {
-  memset(&config, 0, sizeof(config));
-}
+arduino::ZephyrSPI::ZephyrSPI(const struct device *spi) : spi_dev(spi) {}
 
 uint8_t arduino::ZephyrSPI::transfer(uint8_t data) {
   int ret;
@@ -26,10 +24,6 @@ uint8_t arduino::ZephyrSPI::transfer(uint8_t data) {
       .count = 1,
   };
 
-  if (config.frequency == 0) {
-    beginTransaction(DEFAULT_SPI_SETTINGS);
-  }
-
   ret = spi_transceive(spi_dev, &config, &tx_buf_set, &rx_buf_set);
   if (ret < 0) {
     return 0;
@@ -52,11 +46,7 @@ uint16_t arduino::ZephyrSPI::transfer16(uint16_t data) {
       .count = 1,
   };
 
-  if (config.frequency == 0) {
-    beginTransaction(DEFAULT_SPI_SETTINGS);
-  }
-
-  ret = spi_transceive(spi_dev, &config, &tx_buf_set, &rx_buf_set);
+  ret = spi_transceive(spi_dev, &config16, &tx_buf_set, &rx_buf_set);
   if (ret < 0) {
     return 0;
   }
@@ -65,7 +55,7 @@ uint16_t arduino::ZephyrSPI::transfer16(uint16_t data) {
 }
 
 void arduino::ZephyrSPI::transfer(void *buf, size_t count) {
-
+  int ret;
   const struct spi_buf tx_buf = {.buf = buf, .len = count};
   const struct spi_buf_set tx_buf_set = {
       .buffers = &tx_buf,
@@ -79,10 +69,6 @@ void arduino::ZephyrSPI::transfer(void *buf, size_t count) {
       .count = 1,
   };
 
-  if (config.frequency == 0) {
-    beginTransaction(DEFAULT_SPI_SETTINGS);
-  }
-
   spi_transceive(spi_dev, &config, &tx_buf_set, &rx_buf_set);
   memcpy(buf, rx, count);
 }
@@ -99,7 +85,10 @@ void arduino::ZephyrSPI::notUsingInterrupt(int interruptNumber) {
 
 void arduino::ZephyrSPI::beginTransaction(SPISettings settings) {
   memset(&config, 0, sizeof(config));
+  memset(&config16, 0, sizeof(config16));
   config.frequency = settings.getClockFreq() > SPI_MIN_CLOCK_FEQUENCY ? settings.getClockFreq() : SPI_MIN_CLOCK_FEQUENCY;
+  config16.frequency = config.frequency;
+
   auto mode = SPI_MODE_CPOL | SPI_MODE_CPHA;
   switch (settings.getDataMode()) {
     case SPI_MODE0:
@@ -112,6 +101,7 @@ void arduino::ZephyrSPI::beginTransaction(SPISettings settings) {
       mode = SPI_MODE_CPOL | SPI_MODE_CPHA; break;
   }
   config.operation = SPI_WORD_SET(8) | (settings.getBitOrder() == MSBFIRST ? SPI_TRANSFER_MSB : SPI_TRANSFER_LSB) | mode;
+  config16.operation = SPI_WORD_SET(16) | (settings.getBitOrder() == MSBFIRST ? SPI_TRANSFER_MSB : SPI_TRANSFER_LSB) | mode;
 }
 
 void arduino::ZephyrSPI::endTransaction(void) {
@@ -123,7 +113,10 @@ void arduino::ZephyrSPI::attachInterrupt() {}
 void arduino::ZephyrSPI::detachInterrupt() {}
 
 
-void arduino::ZephyrSPI::begin() {}
+void arduino::ZephyrSPI::begin() {
+  beginTransaction(SPISettings());
+  endTransaction();
+}
 
 void arduino::ZephyrSPI::end() {}
 

libraries/SPI/SPI.h

@@ -50,9 +50,10 @@ class ZephyrSPI : public HardwareSPI {
   virtual void begin();
   virtual void end();
 
-private:
+protected:
   const struct device *spi_dev;
   struct spi_config config;
+  struct spi_config config16;
   int interrupt[INTERRUPT_COUNT];
   size_t interrupt_pos = 0;
 };