Skip to content
This repository has been archived by the owner on May 19, 2020. It is now read-only.

Commit

Permalink
protobuf+isotp ok, bufferized, todo filter setting function
Browse files Browse the repository at this point in the history
  • Loading branch information
@tictacmenthe
tictacmenthe committed Apr 10, 2020
1 parent 05f2150 commit 051bed5
Show file tree
Hide file tree
Showing 16 changed files with 563 additions and 351 deletions.
12 changes: 6 additions & 6 deletions .cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.3096051" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/com}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/com/proto}&quot;"/>
<listOptionValue builtIn="false" value="../Drivers/STM32G4xx_HAL_Driver/Inc/Legacy"/>
<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32G4xx/Include"/>
<listOptionValue builtIn="false" value="../Drivers/STM32G4xx_HAL_Driver/Inc"/>
</option>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra.740083156" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.pedantic.1350970004" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.pedantic" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra.740083156" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.pedantic.1350970004" name="Issue all warnings demanded by strict ISO C and ISO C++ (-pedantic)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.pedantic" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1477574306" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1166025954" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
Expand All @@ -69,14 +69,14 @@
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.1026391382" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/com}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src/com/proto}&quot;"/>
<listOptionValue builtIn="false" value="../Drivers/STM32G4xx_HAL_Driver/Inc/Legacy"/>
<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32G4xx/Include"/>
<listOptionValue builtIn="false" value="../Drivers/STM32G4xx_HAL_Driver/Inc"/>
</option>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.pedantic.1543176335" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.pedantic" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra.706841062" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.pedantic.1543176335" name="Issue all warnings demanded by strict ISO C and ISO C++ (-pedantic)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.pedantic" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra.706841062" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1004007346" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
</tool>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.870520834" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
Expand Down
2 changes: 1 addition & 1 deletion src/com/can_pb.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "com/isotp/isotp.h"
#include "com/proto/pb_encode.h"
#include "com/proto/pb_decode.h"
#include "com/proto/proto.pb.h"
#include "com/proto/roboto.pb.h"
#include "utility/ring_buffer.hpp"
#include "config.h"

Expand Down
2 changes: 1 addition & 1 deletion src/com/isotp/isotp_user.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extern "C" {
* bytes. */
int isotp_user_send_can(const uint32_t arbitration_id,
const uint8_t* data, const uint8_t size) {
return CAN_send_packet(arbitration_id, data, size, 0);
return CAN_send_packet(arbitration_id, data, size, false);
}

/* required, return system tick, unit is millisecond */
Expand Down
2 changes: 1 addition & 1 deletion src/com/proto/pb_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 2014 Petteri Aimonen <[email protected]>
*/

#include <COM/proto/pb_common.h>
#include "pb_common.h"

static bool load_descriptor_values(pb_field_iter_t *iter)
{
Expand Down
2 changes: 1 addition & 1 deletion src/com/proto/pb_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef PB_COMMON_H_INCLUDED
#define PB_COMMON_H_INCLUDED

#include <COM/proto/pb.h>
#include "pb.h"

#ifdef __cplusplus
extern "C" {
Expand Down
6 changes: 3 additions & 3 deletions src/com/proto/pb_decode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#define checkreturn __attribute__((warn_unused_result))
#endif

#include <COM/proto/pb.h>
#include <COM/proto/pb_decode.h>
#include <COM/proto/pb_common.h>
#include "pb.h"
#include "pb_decode.h"
#include "pb_common.h"

/**************************************
* Declarations internal to this file *
Expand Down
2 changes: 1 addition & 1 deletion src/com/proto/pb_decode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef PB_DECODE_H_INCLUDED
#define PB_DECODE_H_INCLUDED

#include <COM/proto/pb.h>
#include "pb.h"

#ifdef __cplusplus
extern "C" {
Expand Down
6 changes: 3 additions & 3 deletions src/com/proto/pb_encode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* 2011 Petteri Aimonen <[email protected]>
*/

#include <COM/proto/pb.h>
#include <COM/proto/pb_common.h>
#include <COM/proto/pb_encode.h>
#include "pb.h"
#include "pb_encode.h"
#include "pb_common.h"

/* Use the GCC warn_unused_result attribute to check that all return values
* are propagated correctly. On other compilers and gcc before 3.4.0 just
Expand Down
2 changes: 1 addition & 1 deletion src/com/proto/pb_encode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef PB_ENCODE_H_INCLUDED
#define PB_ENCODE_H_INCLUDED

#include <COM/proto/pb.h>
#include "pb.h"

#ifdef __cplusplus
extern "C" {
Expand Down
249 changes: 0 additions & 249 deletions src/com/proto/proto.pb.h
View file

This file was deleted.

Loading

0 comments on commit 051bed5

Please sign in to comment.