Update PR to reflect changes from this morning

Author: mjs513

CMakeLists.txt

@@ -1,11 +1,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
+string(REPLACE "__" "_" NORMALIZED_BOARD_TARGET "${NORMALIZED_BOARD_TARGET}")
+
 if (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD})
   set(variant_dir variants/${BOARD})
-elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS})
-  set(variant_dir variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS})
+elseif (IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/variants/${NORMALIZED_BOARD_TARGET})
+  set(variant_dir variants/${NORMALIZED_BOARD_TARGET})
 else()
-  message(INFO "Variant dir not found: variants/${BOARD}, variants/${BOARD}${NORMALIZED_BOARD_QUALIFIERS}")
+if (CONFIG_ARDUINO_API)
+  message(FATAL_ERROR "Variant dir not found: variants/${BOARD}, variants/${NORMALIZED_BOARD_TARGET}")
+endif()
 endif()
 
 if (CONFIG_ARDUINO_API)

cores/arduino/Arduino.h

@@ -12,6 +12,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/dac.h>
 #include <zephyr/drivers/i2c.h>
 #include <math.h>
 
@@ -102,6 +103,17 @@ enum analogPins { DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user),
 
 #endif
 
+#ifdef CONFIG_DAC
+
+#undef DAC0
+#undef DAC1
+#undef DAC2
+#undef DAC3
+#define DAC_ENUMS(n, p, i) DAC ## i = i,
+enum dacPins { DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), dac_channels, DAC_ENUMS) NUM_OF_DACS };
+
+#endif
+
 void interrupts(void);
 void noInterrupts(void);
 
@@ -112,13 +124,17 @@ int digitalPinToInterrupt(pin_size_t pin);
 #define portOutputRegister(x) (x)
 #define portInputRegister(x) (x)
 
+void analogReadResolution(int bits);
+void analogWriteResolution(int bits);
+
 #include <variant.h>
 #ifdef __cplusplus
 #include <SerialUSB.h>
 #include <zephyrSerial.h>
 #include <strings.h>
 #include <api/itoa.h>
 #include <time_macros.h>
+#include <overloads.h>
 
 // Allow namespace-less operations if Arduino.h is included
 using namespace arduino;

cores/arduino/CMakeLists.txt

@@ -6,10 +6,19 @@ if(NOT DEFINED ARDUINO_BUILD_PATH)
 
 zephyr_sources(zephyrSerial.cpp)
 zephyr_sources(zephyrCommon.cpp)
+zephyr_sources(USB.cpp)
+zephyr_sources(itoa.cpp)
+
+zephyr_sources(api/CanMsg.cpp)
+zephyr_sources(api/CanMsgRingbuffer.cpp)
+zephyr_sources(api/Common.cpp)
+zephyr_sources(api/IPAddress.cpp)
+zephyr_sources(api/Print.cpp)
+zephyr_sources(api/Stream.cpp)
+zephyr_sources(api/String.cpp)
 
 if(DEFINED CONFIG_ARDUINO_ENTRY)
 zephyr_sources(main.cpp)
 endif()
 
 endif()
-

cores/arduino/SerialUSB.h

@@ -31,6 +31,6 @@ class SerialUSB_ : public ZephyrSerial {
 };
 }  // namespace arduino
 
-#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
+#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
 extern arduino::SerialUSB_ Serial;
 #endif

cores/arduino/USB.cpp

@@ -4,23 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Make PluggableUSB link happy
-#include "api/PluggableUSB.h"
-
-static uint8_t _epBuffer[1];
-void* epBuffer(unsigned int n) {
-    return &_epBuffer[n];
-};
-
-arduino::PluggableUSB_::PluggableUSB_() {}
-
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/uart/cdc_acm.h>
 #include <zephyr/usb/usb_device.h>
 #include <SerialUSB.h>
 
-#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
+#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
 const struct device *const usb_dev = DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), cdc_acm, 0));
 
 void usb_status_cb(enum usb_dc_status_code cb_status, const uint8_t *param) {

cores/arduino/overloads.h

@@ -0,0 +1,9 @@
+#ifdef CONFIG_DAC
+
+void analogWrite(enum dacPins pinNumber, int value);
+
+#endif
+
+// In c++ mode, we also provide analogReadResolution and analogWriteResolution getters
+int analogReadResolution();
+int analogWriteResolution();

cores/arduino/zephyrCommon.cpp

@@ -163,7 +163,7 @@ size_t pwm_pin_index(pin_size_t pinNumber) {
                 DT_PHA_BY_IDX(DT_PATH(zephyr_user), p, i, pin)),
 #define ADC_CH_CFG(n,p,i) arduino_adc[i].channel_cfg,
 
-const struct adc_dt_spec arduino_adc[] =
+static const struct adc_dt_spec arduino_adc[] =
   { DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), io_channels, ADC_DT_SPEC) };
 
 /* io-channel-pins node provides a mapping digital pin numbers to adc channels */
@@ -184,6 +184,28 @@ size_t analog_pin_index(pin_size_t pinNumber) {
 
 #endif //CONFIG_ADC
 
+#ifdef CONFIG_DAC
+
+#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), dac))
+
+#define DAC_NODE DT_PHANDLE(DT_PATH(zephyr_user), dac)
+#define DAC_RESOLUTION DT_PROP(DT_PATH(zephyr_user), dac_resolution)
+static const struct device *const dac_dev = DEVICE_DT_GET(DAC_NODE);
+
+#define DAC_CHANNEL_DEFINE(n, p, i) \
+  { \
+    .channel_id = DT_PROP_BY_IDX(n, p, i), \
+    .resolution = DAC_RESOLUTION, \
+    .buffered = true, \
+  },
+
+static const struct dac_channel_cfg dac_ch_cfg[] =
+  { DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), dac_channels, DAC_CHANNEL_DEFINE) };
+
+#endif
+
+#endif //CONFIG_DAC
+
 static unsigned int irq_key;
 static bool interrupts_disabled = false;
 }
@@ -276,6 +298,16 @@ unsigned long micros(void) {
 
 unsigned long millis(void) { return k_uptime_get_32(); }
 
+#if defined(CONFIG_DAC) || defined(CONFIG_PWM)
+static int _analog_write_resolution = 8;
+void analogWriteResolution(int bits) {
+    _analog_write_resolution = bits;
+}
+int analogWriteResolution() {
+  return _analog_write_resolution;
+}
+#endif
+
 #ifdef CONFIG_PWM
 
 void analogWrite(pin_size_t pinNumber, int value)
@@ -290,6 +322,8 @@ void analogWrite(pin_size_t pinNumber, int value)
     return;
   }
 
+  value = map(value, 0, 1 << _analog_write_resolution, 0, arduino_pwm[idx].period);
+
   if (((uint32_t)value) > arduino_pwm[idx].period) {
     value = arduino_pwm[idx].period;
   } else if (value < 0) {
@@ -305,6 +339,21 @@ void analogWrite(pin_size_t pinNumber, int value)
 
 #endif
 
+#ifdef CONFIG_DAC
+void analogWrite(enum dacPins dacName, int value)
+{
+  if (dacName >= NUM_OF_DACS) {
+    return;
+  }
+
+  dac_channel_setup(dac_dev, &dac_ch_cfg[dacName]);
+
+  const int max_dac_value = 1U << dac_ch_cfg[dacName].resolution;
+  dac_write_value(dac_dev, dac_ch_cfg[dacName].channel_id, map(value, 0, 1 << _analog_write_resolution, 0, max_dac_value));
+}
+#endif
+
+
 #ifdef CONFIG_ADC
 
 void analogReference(uint8_t mode)

cores/arduino/zephyrSerial.cpp

@@ -198,11 +198,16 @@ void arduino::ZephyrSerial::flush() {
 	}
 }
 
+#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm))
+#define FIRST_UART_INDEX 1
+#else
+#define FIRST_UART_INDEX 0
+#endif
 
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
-#if !DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
+#if !(DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
 // If CDC USB, use that object as Serial (and SerialUSB)
-arduino::ZephyrSerial Serial(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), serials, 0)));
+arduino::ZephyrSerial Serial(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), serials, FIRST_UART_INDEX)));
 #endif
 #if (DT_PROP_LEN(DT_PATH(zephyr_user), serials) > 1)
 #define ARDUINO_SERIAL_DEFINED_0 1

cores/arduino/zephyrSerial.h

@@ -81,7 +81,7 @@ class ZephyrSerial : public HardwareSerial
 }   // namespace arduino
 
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), serials)
-#if !DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm)
+#if !(DT_NODE_HAS_PROP(DT_PATH(zephyr_user), cdc_acm) && CONFIG_USB_CDC_ACM)
 // If CDC USB, use that object as Serial (and SerialUSB)
 extern arduino::ZephyrSerial Serial;
 #endif

extra/bootstrap.sh

@@ -12,3 +12,6 @@ west init -l .
 west update
 pip install -r ../zephyr/scripts/requirements-base.txt
 # download slim toolchain from https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.8
+
+# add here the required blobs based on supported platforms
+west blobs fetch hal_nxp