Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3a06894

Browse files
facchinmfacchinm
authoredJan 24, 2025··
Merge pull request #46 from facchinm/fixes_analogWrite
Fix analogWrite()
2 parents 205688d + a25ca3f commit 3a06894

File tree

5 files changed

+165
-16
lines changed

5 files changed

+165
-16
lines changed
 

‎cores/arduino/Arduino.h

+16
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <zephyr/drivers/gpio.h>
1313
#include <zephyr/drivers/pwm.h>
1414
#include <zephyr/drivers/adc.h>
15+
#include <zephyr/drivers/dac.h>
1516
#include <zephyr/drivers/i2c.h>
1617
#include <math.h>
1718

@@ -102,6 +103,17 @@ enum analogPins { DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user),
102103

103104
#endif
104105

106+
#ifdef CONFIG_DAC
107+
108+
#undef DAC0
109+
#undef DAC1
110+
#undef DAC2
111+
#undef DAC3
112+
#define DAC_ENUMS(n, p, i) DAC ## i = i,
113+
enum dacPins { DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), dac_channels, DAC_ENUMS) NUM_OF_DACS };
114+
115+
#endif
116+
105117
void interrupts(void);
106118
void noInterrupts(void);
107119

@@ -112,13 +124,17 @@ int digitalPinToInterrupt(pin_size_t pin);
112124
#define portOutputRegister(x) (x)
113125
#define portInputRegister(x) (x)
114126

127+
void analogReadResolution(int bits);
128+
void analogWriteResolution(int bits);
129+
115130
#include <variant.h>
116131
#ifdef __cplusplus
117132
#include <SerialUSB.h>
118133
#include <zephyrSerial.h>
119134
#include <strings.h>
120135
#include <api/itoa.h>
121136
#include <time_macros.h>
137+
#include <overloads.h>
122138

123139
// Allow namespace-less operations if Arduino.h is included
124140
using namespace arduino;

‎cores/arduino/overloads.h

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#ifdef CONFIG_DAC
2+
3+
void analogWrite(enum dacPins pinNumber, int value);
4+
5+
#endif
6+
7+
// In c++ mode, we also provide analogReadResolution and analogWriteResolution getters
8+
int analogReadResolution();
9+
int analogWriteResolution();

‎cores/arduino/zephyrCommon.cpp

+50-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ size_t pwm_pin_index(pin_size_t pinNumber) {
163163
DT_PHA_BY_IDX(DT_PATH(zephyr_user), p, i, pin)),
164164
#define ADC_CH_CFG(n,p,i) arduino_adc[i].channel_cfg,
165165

166-
const struct adc_dt_spec arduino_adc[] =
166+
static const struct adc_dt_spec arduino_adc[] =
167167
{ DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), io_channels, ADC_DT_SPEC) };
168168

169169
/* 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) {
184184

185185
#endif //CONFIG_ADC
186186

187+
#ifdef CONFIG_DAC
188+
189+
#if (DT_NODE_HAS_PROP(DT_PATH(zephyr_user), dac))
190+
191+
#define DAC_NODE DT_PHANDLE(DT_PATH(zephyr_user), dac)
192+
#define DAC_RESOLUTION DT_PROP(DT_PATH(zephyr_user), dac_resolution)
193+
static const struct device *const dac_dev = DEVICE_DT_GET(DAC_NODE);
194+
195+
#define DAC_CHANNEL_DEFINE(n, p, i) \
196+
{ \
197+
.channel_id = DT_PROP_BY_IDX(n, p, i), \
198+
.resolution = DAC_RESOLUTION, \
199+
.buffered = true, \
200+
},
201+
202+
static const struct dac_channel_cfg dac_ch_cfg[] =
203+
{ DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), dac_channels, DAC_CHANNEL_DEFINE) };
204+
205+
#endif
206+
207+
#endif //CONFIG_DAC
208+
187209
static unsigned int irq_key;
188210
static bool interrupts_disabled = false;
189211
}
@@ -276,6 +298,16 @@ unsigned long micros(void) {
276298

277299
unsigned long millis(void) { return k_uptime_get_32(); }
278300

301+
#if defined(CONFIG_DAC) || defined(CONFIG_PWM)
302+
static int _analog_write_resolution = 8;
303+
void analogWriteResolution(int bits) {
304+
_analog_write_resolution = bits;
305+
}
306+
int analogWriteResolution() {
307+
return _analog_write_resolution;
308+
}
309+
#endif
310+
279311
#ifdef CONFIG_PWM
280312

281313
void analogWrite(pin_size_t pinNumber, int value)
@@ -290,6 +322,8 @@ void analogWrite(pin_size_t pinNumber, int value)
290322
return;
291323
}
292324

325+
value = map(value, 0, 1 << _analog_write_resolution, 0, arduino_pwm[idx].period);
326+
293327
if (((uint32_t)value) > arduino_pwm[idx].period) {
294328
value = arduino_pwm[idx].period;
295329
} else if (value < 0) {
@@ -305,6 +339,21 @@ void analogWrite(pin_size_t pinNumber, int value)
305339

306340
#endif
307341

342+
#ifdef CONFIG_DAC
343+
void analogWrite(enum dacPins dacName, int value)
344+
{
345+
if (dacName >= NUM_OF_DACS) {
346+
return;
347+
}
348+
349+
dac_channel_setup(dac_dev, &dac_ch_cfg[dacName]);
350+
351+
const int max_dac_value = 1U << dac_ch_cfg[dacName].resolution;
352+
dac_write_value(dac_dev, dac_ch_cfg[dacName].channel_id, map(value, 0, 1 << _analog_write_resolution, 0, max_dac_value));
353+
}
354+
#endif
355+
356+
308357
#ifdef CONFIG_ADC
309358

310359
void analogReference(uint8_t mode)

‎loader/boards/arduino_giga_r1_m7.conf

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CONFIG_LLEXT_HEAP_SIZE=128
1818
CONFIG_FPU=y
1919

2020
CONFIG_ADC=y
21+
CONFIG_DAC=y
2122
CONFIG_PWM=y
2223

2324
CONFIG_DMA=y

‎loader/boards/arduino_giga_r1_m7.overlay

+89-15
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,80 @@
5757
clock-frequency = <I2C_BITRATE_FAST>;
5858
};
5959

60-
// XCLK as PWM from PJ9
6160
&timers1 {
6261
status = "okay";
63-
st,prescaler = <0>;
62+
st,prescaler = <4>;
6463

65-
cam_clock_pwm: pwm {
64+
pwm1: pwm {
6665
status = "okay";
67-
pinctrl-0 = <&tim1_ch3_pj9>;
66+
pinctrl-0 = <&tim1_ch3_pj9 &tim1_ch1_pk1 &tim1_ch2_pj11>;
6867
pinctrl-names = "default";
6968
};
7069
};
7170

72-
&cam_clock_pwm {
73-
/* ...then use the pwmclock node to start the clock generation */
71+
&timers2 {
72+
status = "okay";
73+
st,prescaler = <100>;
74+
75+
pwm2: pwm {
76+
status = "okay";
77+
pinctrl-0 = <&tim2_ch4_pa3 &tim2_ch3_pa2>;
78+
pinctrl-names = "default";
79+
};
80+
};
81+
82+
&timers3 {
83+
status = "okay";
84+
st,prescaler = <100>;
85+
86+
pwm3: pwm {
87+
status = "okay";
88+
pinctrl-0 = <&tim3_ch2_pa7 &tim3_ch1_pb4>;
89+
pinctrl-names = "default";
90+
};
91+
};
92+
93+
&timers4 {
94+
status = "okay";
95+
st,prescaler = <100>;
96+
97+
pwm4: pwm {
98+
status = "okay";
99+
pinctrl-0 = <&tim4_ch2_pd13 &tim4_ch3_pb8 &tim4_ch4_pb9>;
100+
pinctrl-names = "default";
101+
};
102+
};
103+
104+
&timers8 {
105+
status = "okay";
106+
st,prescaler = <100>;
107+
108+
pwm8: pwm {
109+
status = "okay";
110+
pinctrl-0 = <&tim8_ch1_pj8 &tim8_ch2_pj10>;
111+
pinctrl-names = "default";
112+
};
113+
};
114+
115+
&timers12 {
116+
status = "okay";
117+
st,prescaler = <100>;
118+
119+
pwm12: pwm {
120+
status = "okay";
121+
pinctrl-0 = <&tim12_ch1_ph6>;
122+
pinctrl-names = "default";
123+
};
124+
};
125+
126+
&pwm1 {
127+
/* Use the pwmclock node to start the clock generation */
74128
pwmclock: pwmclock {
75129
status = "okay";
76130
compatible = "pwm-clock";
77131
clock-frequency = <0>;
78132
#clock-cells = <1>;
79-
pwms = <&cam_clock_pwm 3 PWM_HZ(6000000) PWM_POLARITY_NORMAL>;
133+
pwms = <&pwm1 3 PWM_HZ(12000000) PWM_POLARITY_NORMAL>;
80134
};
81135
};
82136

@@ -422,14 +476,18 @@
422476
<&gpioe 3 GPIO_ACTIVE_LOW>;
423477

424478
pwm-pin-gpios = <&gpioj 9 0>,
425-
<&arduino_header 6 0>,
426-
<&arduino_header 5 0>,
427-
<&arduino_header 17 0>,
428-
<&arduino_header 12 0>,
429-
<&arduino_header 2 0>,
430-
<&arduino_header 3 0>,
479+
<&arduino_header 8 0>,
431480
<&arduino_header 9 0>,
432-
<&arduino_header 10 0>;
481+
<&arduino_header 10 0>,
482+
<&arduino_header 11 0>,
483+
<&arduino_header 12 0>,
484+
<&arduino_header 13 0>,
485+
<&arduino_header 14 0>,
486+
<&arduino_header 15 0>,
487+
<&arduino_header 16 0>,
488+
<&arduino_header 17 0>,
489+
<&arduino_header 18 0>,
490+
<&arduino_header 19 0>;
433491

434492
adc-pin-gpios = <&gpioc 4 0>,
435493
<&gpioc 5 0>,
@@ -450,7 +508,19 @@
450508
cdc-acm = <&cdc_acm_uart0>;
451509
i2cs = <&i2c2>, <&i2c4>, <&i2c1>;
452510
spis = <&spi1>, <&spi5>;
453-
pwms = <&cam_clock_pwm 3 PWM_HZ(6000000) PWM_POLARITY_NORMAL>;
511+
pwms = <&pwm1 3 PWM_HZ(6000000) PWM_POLARITY_NORMAL>,
512+
<&pwm2 4 PWM_HZ(500) PWM_POLARITY_NORMAL>,
513+
<&pwm2 3 PWM_HZ(500) PWM_POLARITY_NORMAL>,
514+
<&pwm8 1 PWM_HZ(500) PWM_POLARITY_NORMAL>,
515+
<&pwm3 2 PWM_HZ(500) PWM_POLARITY_NORMAL>,
516+
<&pwm4 2 PWM_HZ(500) PWM_POLARITY_NORMAL>,
517+
<&pwm3 1 PWM_HZ(500) PWM_POLARITY_NORMAL>,
518+
<&pwm4 3 PWM_HZ(500) PWM_POLARITY_NORMAL>,
519+
<&pwm4 4 PWM_HZ(500) PWM_POLARITY_NORMAL>,
520+
<&pwm1 1 PWM_HZ(5000) PWM_POLARITY_NORMAL>,
521+
<&pwm8 2 PWM_HZ(500) PWM_POLARITY_NORMAL>,
522+
<&pwm1 2 PWM_HZ(5000) PWM_POLARITY_NORMAL>,
523+
<&pwm12 1 PWM_HZ(500) PWM_POLARITY_NORMAL>;
454524

455525
io-channels = <&adc1 4>,
456526
<&adc1 8>,
@@ -466,5 +536,9 @@
466536
<&adc1 0>,
467537
<&adc1 18>,
468538
<&adc1 19>;
539+
540+
dac = <&dac1>;
541+
dac-channels = <1>, <2>;
542+
dac-resolution = <12>;
469543
};
470544
};

0 commit comments

Comments
 (0)
Please sign in to comment.