Merge pull request iNavFlight#11129 from functionpointer/nexus_xr_dmar

sensei-hacker · web-flow · commit 579daf118dac · 2025-11-25T13:53:34.000-06:00
NEXUSX: USE_DSHOT_DMAR, use TIM2 instead of TIM5
diff --git a/src/main/target/NEXUSX/config.c b/src/main/target/NEXUSX/config.c
@@ -36,4 +36,7 @@
 void targetConfiguration(void)
 {
   pinioBoxConfigMutable()->permanentId[0] = BOX_PERMANENT_ID_USER1;
+
+  // default "ESC" pin to be a motor
+  timerOverridesMutable(timer2id(TIM1))->outputMode = OUTPUT_MODE_MOTORS;
 }
diff --git a/src/main/target/NEXUSX/target.c b/src/main/target/NEXUSX/target.c
@@ -33,8 +33,8 @@ timerHardware_t timerHardware[] = {
 
     DEF_TIM(TIM1, CH2, PA9,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "ESC"
 
-    DEF_TIM(TIM5, CH3, PA2,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "RPM", clashes with UART2 TX
-    DEF_TIM(TIM5, CH4, PA3,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "TLM", clashes with UART2 RX
+    DEF_TIM(TIM2, CH3, PA2,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "RPM", clashes with UART2 TX
+    DEF_TIM(TIM2, CH4, PA3,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "TLM", clashes with UART2 RX
 
     DEF_TIM(TIM4, CH1, PB6,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "AUX", clashes with UART1 TX and I2C1 SCL
     DEF_TIM(TIM4, CH2, PB7,   TIM_USE_OUTPUT_AUTO, 0, 0),   // labelled "SBUS", clashes with UART1 RX and I2C1 SDA
diff --git a/src/main/target/NEXUSX/target.h b/src/main/target/NEXUSX/target.h
@@ -151,3 +151,5 @@
 #define USE_SERIALSHOT
 #define USE_ESC_SENSOR
 #define USE_SMARTPORT_MASTER // no internal current sensor, enable SMARTPORT_MASTER so external ones can be used
+
+#define USE_DSHOT_DMAR

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,7 @@`
`36`	`36`	`void targetConfiguration(void)`
`37`	`37`	`{`
`38`	`38`	`pinioBoxConfigMutable()->permanentId[0] = BOX_PERMANENT_ID_USER1;`
	`39`	`+`
	`40`	`+ // default "ESC" pin to be a motor`
	`41`	`+ timerOverridesMutable(timer2id(TIM1))->outputMode = OUTPUT_MODE_MOTORS;`
`39`	`42`	`}`