Commit 5c511acf authored by Wenxi XU's avatar Wenxi XU
Browse files

Merge branch 'uart-protocol-interboard' of https://github.com/ttwards/motor... 

Merge branch 'uart-protocol-interboard' of https://github.com/ttwards/motor into uart-protocol-interboard
parents e0cd3928 4aa7a1a7

include/ares/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,11 @@ menuconfig ARES 
module = ARES

module-str = ARES



config UART_INTERFACE

	bool "UART_INTERFACE"

	help

	  Enable UART_INTERFACE



config USB_BULK_INTERFACE

	bool "USB_BULK_INTERFACE"

	help

include/ares/ares_comm.h

+2 −2
Original line number Diff line number Diff line 
#ifndef ARES_COMM_H__

#define ARES_COMM_H__



#include <ares/protocol/dual/dual_protocol.h>

#include <ares/interface/usb/usb_bulk.h>

#include <ares/protocol/ares_protocol.h>

#include <ares/interface/ares_interface.h>

#include <zephyr/kernel.h>

#include <zephyr/net_buf.h>

include/ares/interface/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line 
add_subdirectory_ifdef(CONFIG_USB_BULK_INTERFACE usb)

add_subdirectory_ifdef(CONFIG_UART_INTERFACE uart)
 
 No newline at end of file

include/ares/interface/Kconfig

+1 −1
Original line number Diff line number Diff line 
rsource "usb/Kconfig"



rsource "uart/Kconfig"



config USB_BULK_INTERFACE

	bool "USB_BULK_INTERFACE"

include/ares/interface/ares_interface.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct AresInterfaceAPI { 
	int (*send)(struct AresInterface *interface, struct net_buf *buf);

	int (*send_with_lock)(struct AresInterface *interface, struct net_buf *buf,

			      struct k_mutex *mutex);

	int (*send_raw)(struct AresInterface *interface, uint8_t *data, uint16_t len);



	int (*connect)(struct AresInterface *interface);

	int (*disconnect)(struct AresInterface *interface);

CRA Git | Maintained and supported by SUSTech CRA and CCSE