Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-08-21 06:23:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compile errors after merge

Browse Source
This commit is contained in:
Oskar Weigl
2018-06-21 21:59:16 -07:00
parent 56c0829321
commit cbee6df642
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/fibre/cpp/include/fibre/protocol.hpp
+5 -5
View File
@@ -440,7 +440,7 @@ void default_readwrite_endpoint_handler(endpoint_ref_t* value, const uint8_t* in
size_t cnt = write_le<decltype(value->endpoint_id)>(value->endpoint_id, buffer);
cnt += write_le<decltype(value->json_crc)>(value->json_crc, buffer + cnt);
if (cnt <= output->get_free_space())
output->process_bytes(buffer, cnt);
output->process_bytes(buffer, cnt, nullptr);
}
// If a new value was passed, call the corresponding little endian deserialization function
@@ -880,11 +880,8 @@ public:
if (id < length)
list[id] = this;
}
// void handle(const uint8_t* input, size_t input_length, StreamSink* output) {
// default_readwrite_endpoint_handler<TProperty>(property_, input, input_length, output);
// }
void handle(const uint8_t* input, size_t input_length, StreamSink* output) final {
default_readwrite_endpoint_handler(property_, input, input_length, output);
default_readwrite_endpoint_handler<TProperty>(property_, input, input_length, output);
}
/*void handle(const uint8_t* input, size_t input_length, StreamSink* output) {
handle(input, input_length, output);
@@ -1137,6 +1134,9 @@ extern uint16_t json_crc_;
extern JSONDescriptorEndpoint json_file_endpoint_;
extern EndpointProvider* application_endpoints_;
bool is_endpoint_ref_valid(endpoint_ref_t endpoint_ref);
Endpoint* get_endpoint(endpoint_ref_t endpoint_ref);
// @brief Registers the specified application object list using the provided endpoint table.
// This function should only be called once during the lifetime of the application. TODO: fix this.
// @param application_objects The application objects to be registred.
Firmware/fibre/cpp/protocol.cpp
+1 -1
View File
@@ -221,7 +221,7 @@ bool is_endpoint_ref_valid(endpoint_ref_t endpoint_ref) {
Endpoint* get_endpoint(endpoint_ref_t endpoint_ref) {
if (is_endpoint_ref_valid(endpoint_ref))
return endpoints_[endpoint_ref.endpoint_id];
return endpoint_list_[endpoint_ref.endpoint_id];
else
return nullptr;
}