Commit a9382ed5 authored by Wenxi Xu's avatar Wenxi Xu
Browse files

对设备树做了一些修改

parent 8b89f47f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@
		zephyr,dtcm = &dtcm;
		zephyr,itcm = &itcm;
		sbus,uart = &uart5;
		ares,usb = &cdc_acm_uart;
	};

	aliases {
+7 −7
Original line number Diff line number Diff line
@@ -32,13 +32,11 @@ CONFIG_SPI=y
CONFIG_DMA=y

CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="ARES CDC"
CONFIG_USB_DEVICE_PID=0x0088
CONFIG_USB_DEVICE_VID=0x2025
CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC ACM sample"
CONFIG_USB_DEVICE_PID=0x0001
CONFIG_USB_CDC_ACM=y
CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y
CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n

CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y

# CONFIG_MEM_ATTR=y
# CONFIG_MEM_ATTR_HEAP=y
@@ -73,3 +71,5 @@ CONFIG_BMI08X_GYRO_TRIGGER_NONE=n
CONFIG_BMI08X_GYRO_THREAD_PRIORITY=10
CONFIG_BMI08X_GYRO_THREAD_STACK_SIZE=2048
CONFIG_BMI08X_I2C_WRITE_BURST_SIZE=16

CONFIG_CRC=y
 No newline at end of file
+7 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@
		zephyr,ccm = &ccm0;
		ares,pwm = &heater;
		sbus,uart = &usart3;
		ares,usb = &cdc_acm_uart0;
	};

	aliases {
@@ -99,10 +100,10 @@
};

&pll {
	div-m = <6>;
	mul-n = <168>;
	div-m = <12>;
	mul-n = <336>;
	div-p = <2>;
	div-q = <4>;
	div-q = <7>;
	clocks = <&clk_hse>;
	status = "okay";
};
@@ -144,6 +145,9 @@
	status = "okay";
	data-bits = <8>;
	stop-bits = "1";
	dmas = <&dma2 7 4 STM32_DMA_PERIPH_TX STM32_DMA_FIFO_FULL>,
		   <&dma2 5 4 STM32_DMA_PERIPH_RX STM32_DMA_FIFO_FULL>;
	dma-names = "tx", "rx";
};

&usart3 {
+28 −1
Original line number Diff line number Diff line
@@ -18,6 +18,23 @@ CONFIG_SERIAL=y
CONFIG_UART_ASYNC_API=y
CONFIG_UART_INTERRUPT_DRIVEN=y

# 启用 Shell 支持
CONFIG_SHELL=n
CONFIG_SHELL_BACKENDS=n
CONFIG_SHELL_BACKEND_SERIAL=n

# 启用 UART 控制台
CONFIG_UART_CONSOLE=y

# 禁用 SEGGER RTT
CONFIG_USE_SEGGER_RTT=n

# 启用事件支持
CONFIG_EVENTS=y

# 启用控制台支持
CONFIG_CONSOLE=y

CONFIG_LOG=y
CONFIG_LOG_MODE_IMMEDIATE=y

@@ -54,3 +71,13 @@ CONFIG_NVS=y
CONFIG_MPU_ALLOW_FLASH_WRITE=y

CONFIG_FLASH_PAGE_LAYOUT=y

CONFIG_DMA_STM32=y  # STM32 DMA 驱动
CONFIG_UART_STM32=y # STM32 UART 驱动

CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC ACM sample"
CONFIG_USB_DEVICE_PID=0x0001
CONFIG_USB_CDC_ACM=y

CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
 No newline at end of file
+6 −5
Original line number Diff line number Diff line
/ {
	motor0: motor0{
		compatible = "dm,motor";
		compatible = "dji,motor";
		is_m3508;
		id = <1>;
		rx_id = <0x00>;
		tx_id = <0x01>;
		gear_ratio = "1";
		v_max = "785";
		rx_id = <0x201>;
		tx_id = <0x200>;
		gear_ratio = "19.20";
		status = "okay";
		can_channel = <&canbus1>;
		controllers = <&speed_pid>;
@@ -19,6 +19,7 @@
			k_p = "1.8";
			k_i = "2.0";
			k_d = "2";
			detri_lpf = "0.985";
		};
	};
	sbus0: sbus0 {