Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-08-18 09:29:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix include paths, duplicated function in merge

Browse Source
This commit is contained in:
Oskar Weigl
2018-06-08 19:48:27 -07:00
parent 6ff4445770
commit 4841ff03fb
7 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/communication/interface_can.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
*/
#include "interface_can.hpp"
#include "crc.hpp"
#include "fibre/crc.hpp"
#include "utils.h"
#include <can.h>
Firmware/communication/interface_can.hpp
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef __INTERFACE_CAN_HPP
#define __INTERFACE_CAN_HPP
#include "protocol.hpp"
#include "fibre/protocol.hpp"
#include <stm32f4xx_hal.h>
#include <cmsis_os.h>
Firmware/communication/interface_i2c.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include "interface_i2c.h"
#include "protocol.hpp"
#include "fibre/protocol.hpp"
#include <i2c.h>
Firmware/communication/interface_uart.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define __INTERFACE_UART_HPP
#ifdef __cplusplus
#include "protocol.hpp"
#include "fibre/protocol.hpp"
extern StreamSink* uart4_stream_output_ptr;
extern "C" {
Firmware/communication/interface_usb.cpp
+1 -3
View File
@@ -1,7 +1,6 @@
#include "interface_usb.h"
#include "ascii_protocol.h"
#include "ascii_protocol.hpp"
#include <MotorControl/utils.h>
@@ -13,7 +12,6 @@
#include <freertos_vars.h>
#include <odrive_main.h>
#include "ascii_protocol.h"
static uint8_t* usb_buf;
static uint32_t usb_len;
Firmware/communication/interface_usb.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define __INTERFACE_USB_HPP
#ifdef __cplusplus
#include "protocol.hpp"
#include "fibre/protocol.hpp"
extern StreamSink* usb_stream_output_ptr;
extern "C" {
Firmware/fibre/cpp/include/fibre/protocol.hpp
-12
View File
@@ -887,18 +887,6 @@ public:
LOG_FIBRE("COPIED! my tuple is at %x and of size %u\r\n", (uintptr_t)&in_args_, sizeof(in_args_));
}
// The custom copy constructor is needed because otherwise the
// input_properties_ and output_properties_ would point to memory
// locations of the old object.
ProtocolFunction(const ProtocolFunction& other) :
name_(other.name_), obj_(other.obj_), func_ptr_(other.func_ptr_),
input_names_{other.input_names_}, output_names_{other.output_names_},
input_properties_(PropertyListFactory<TInputs...>::template make_property_list<0>(input_names_, in_args_)),
output_properties_(PropertyListFactory<TOutputs...>::template make_property_list<0>(output_names_, out_args_))
{
LOG_PROTO("COPIED! my tuple is at %x and of size %u\r\n", (uintptr_t)&in_args_, sizeof(in_args_));
}
void write_json(size_t id, StreamSink* output) {
// write name
write_string("{\"name\":\"", output);