Skip to content

Commit cfa1db9

Browse files
committed
Revert "Update to use only dshot on rdd2."
This is to allow for merge of estimator PR This reverts commit 67a1551. Signed-off-by: Benjamin Perseghetti <bperseghetti@rudislabs.com>
1 parent 67a1551 commit cfa1db9

File tree

1 file changed

+41
-26
lines changed

1 file changed

+41
-26
lines changed

app/rdd2/boards/vmu_rt1170_mimxrt1176_cm7.overlay

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,50 @@
44
#include <zephyr/dt-bindings/input/input-event-codes.h>
55

66
/ {
7-
dshot_actuators: dshot_actuators {
8-
compatible = "cerebri,dshot-actuators";
7+
pwm_actuators: pwm_actuators {
8+
compatible = "cerebri,pwm-actuators";
99
aux0 {
1010
input-type = "velocity";
1111
input-index = <0>;
12-
center = <200>;
13-
scale = <1500>;
12+
pwms = <&flexpwm1_pwm0 0 PWM_HZ(50) PWM_POLARITY_NORMAL>;
13+
disarmed = <1000>;
14+
min = <1250>;
15+
max = <1900>;
16+
center = <1000>;
17+
scale = <1028>;
1418
scale-div = <1000>;
1519
};
1620
aux1 {
1721
input-type = "velocity";
1822
input-index = <1>;
19-
center = <200>;
20-
scale = <1500>;
23+
pwms = <&flexpwm1_pwm1 0 PWM_HZ(50) PWM_POLARITY_NORMAL>;
24+
disarmed = <1000>;
25+
min = <1250>;
26+
max = <1900>;
27+
center = <1000>;
28+
scale = <1028>;
2129
scale-div = <1000>;
2230
};
2331
aux2 {
2432
input-type = "velocity";
2533
input-index = <2>;
26-
center = <200>;
27-
scale = <1500>;
34+
pwms = <&flexpwm1_pwm2 0 PWM_HZ(50) PWM_POLARITY_NORMAL>;
35+
disarmed = <1000>;
36+
min = <1250>;
37+
max = <1900>;
38+
center = <1000>;
39+
scale = <1028>;
2840
scale-div = <1000>;
2941
};
3042
aux3 {
3143
input-type = "velocity";
3244
input-index = <3>;
33-
center = <200>;
34-
scale = <1500>;
45+
pwms = <&flexpwm2_pwm0 0 PWM_HZ(50) PWM_POLARITY_NORMAL>;
46+
disarmed = <1000>;
47+
min = <1250>;
48+
max = <1900>;
49+
center = <1000>;
50+
scale = <1028>;
3551
scale-div = <1000>;
3652
};
3753
};
@@ -68,38 +84,37 @@
6884
};
6985

7086
&flexpwm1_pwm0 {
71-
status = "disabled";
87+
nxp,prescaler = <64>;
7288
};
7389

7490
&flexpwm1_pwm1 {
75-
status = "disabled";
91+
nxp,prescaler = <64>;
7692
};
7793

78-
&flexpwm1_pwm2 {
79-
status = "disabled";
94+
&flexpwm1_pwm2 {
95+
nxp,prescaler = <64>;
8096
};
8197

82-
&flexpwm2_pwm0 {
83-
status = "disabled";
98+
&flexpwm2_pwm0 {
99+
nxp,prescaler = <64>;
84100
};
85101

86-
&flexpwm2_pwm1 {
87-
status = "disabled";
102+
&flexpwm2_pwm1 {
103+
nxp,prescaler = <64>;
88104
};
89105

90-
&flexpwm2_pwm2 {
91-
status = "disabled";
106+
&flexpwm2_pwm2 {
107+
nxp,prescaler = <64>;
92108
};
93109

94-
&flexpwm2_pwm3 {
95-
status = "disabled";
110+
&flexpwm2_pwm3 {
111+
nxp,prescaler = <64>;
96112
};
97113

98-
&flexpwm3_pwm0 {
99-
status = "disabled";
114+
&flexpwm3_pwm0 {
115+
nxp,prescaler = <64>;
100116
};
101117

102-
103118
&flexcan1 {
104119
status = "okay";
105120
};
@@ -301,7 +316,7 @@ uart1: &lpuart5 {
301316
compatible = "nxp,flexio-dshot";
302317
pinctrl-0 = <&pinmux_dshot_vmu>;
303318
pinctrl-names = "default";
304-
status = "okay";
319+
status = "disabled";
305320
speed = <600>;
306321

307322
ch1 {

0 commit comments

Comments
 (0)