Patch to next

Kconfig

@@ -39,8 +39,8 @@ config ARDUINO_MAX_TONES
 	default -1
 	help
 	  Specify the maximum number of tones that can be played simultaneously with tone().
-	  If set to a negative value, the maximum number will be determined from the
-	  system's digital pin configuration.
+	  If set to -1 (or any other negative value), the maximum number will be
+	  determined from the system's digital pin configuration.
 
 module = ARDUINO_API
 module-str = 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>
 
 #if DT_PROP_LEN(DT_PATH(zephyr_user), digital_pin_gpios) > 0
@@ -103,19 +104,66 @@ enum analogPins {
 	DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), adc_pin_gpios, AN_ENUMS)
 };
 
+// We provide analogReadResolution APIs
+void analogReadResolution(int bits);
+
+#endif
+
+#ifdef CONFIG_DAC
+
+#undef DAC0
+#undef DAC1
+#undef DAC2
+#undef DAC3
+#define DAC_ENUMS(n, p, i) DAC##i = i,
+
+enum dacPins {
+#if DT_PROP_LEN_OR(DT_PATH(zephyr_user), dac_channels, 0) > 0
+	DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), dac_channels, DAC_ENUMS)
+#endif
+	NUM_OF_DACS
+};
+
 #endif
 
 void interrupts(void);
 void noInterrupts(void);
 
 int digitalPinToInterrupt(pin_size_t pin);
 
+// These defines can be overridden by variant.h if implemented
+#define digitalPinToPort(x)    (x)
+#define digitalPinToBitMask(x) (x)
+#define portOutputRegister(x)  (x)
+#define portInputRegister(x)   (x)
+
+const struct device *digitalPinToPortDevice(pin_size_t pinNumber);
+int digitalPinToPinIndex(pin_size_t pinNumber);
+
+#if defined(CONFIG_PWM) || defined(CONFIG_DAC)
+void analogWriteResolution(int bits);
+#endif
+
+#if defined(__arm__)
+#define F_CPU (SystemCoreClock)
+#endif
+
 #include <variant.h>
 
 #if !defined(LED_BUILTIN) && defined(ZARD_LED_BUILTIN)
 #define LED_BUILTIN ZARD_LED_BUILTIN
 #endif // LED_BUILTIN
 
+#include <inlines.h>
+
 #ifdef __cplusplus
 #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;
+
 #endif // __cplusplus

cores/arduino/inlines.h

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Arduino s.r.l. and/or its affiliated companies
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*
+ * Provide implementations for inline functions.
+ */
+
+#ifndef __INLINES_H__
+#define __INLINES_H__
+
+#include <zephyr/kernel.h>
+
+inline __attribute__((always_inline)) void delay(unsigned long ms) {
+	k_sleep(K_MSEC(ms));
+}
+
+inline __attribute__((always_inline)) void delayMicroseconds(unsigned int us) {
+	if (us == 0) {
+		return;
+	}
+	k_busy_wait(us - 1);
+}
+
+#endif /* __INLINES_H__ */

cores/arduino/overloads.h

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Arduino s.r.l. and/or its affiliated companies
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#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/time_macros.h

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) Arduino s.r.l. and/or its affiliated companies
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#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())