Skip to content

Commit

Permalink
feat: update canlib and error-handler versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tonidotpy
Tonidotpy committed Apr 17, 2024
1 parent ec0255e commit 80eee64
Show file tree
Hide file tree
Showing 9 changed files with 1,772 additions and 1,767 deletions.
2 changes: 1 addition & 1 deletion cellboard/Core/Lib/can
Submodule can updated 27 files
+1 −1 dbc/bms/bms.dbc
+95 −77 dbc/primary/primary.dbc
+1 −1 dbc/secondary/secondary.dbc
+1 −1 dbc/simulator/simulator.dbc
+1 −1 lib/bms/bms_network.c
+2 −2 lib/bms/bms_network.h
+3 −3 lib/bms/bms_utils_c.h
+1 −1 lib/inverters/inverters_network.c
+2 −2 lib/inverters/inverters_network.h
+2 −2 lib/inverters/inverters_utils_c.h
+1 −1 lib/ivts/ivts_network.c
+2 −2 lib/ivts/ivts_network.h
+5 −5 lib/ivts/ivts_utils_c.h
+805 −311 lib/primary/primary_network.c
+580 −144 lib/primary/primary_network.h
+267 −162 lib/primary/primary_utils_c.c
+23 −3 lib/primary/primary_utils_c.h
+99 −81 lib/primary/primary_watchdog.c
+64 −60 lib/primary/primary_watchdog.h
+1 −1 lib/secondary/secondary_network.c
+2 −2 lib/secondary/secondary_network.h
+3 −3 lib/secondary/secondary_utils_c.h
+1 −1 lib/simulator/simulator_network.c
+2 −2 lib/simulator/simulator_network.h
+39 −0 networks/primary/network.json
+80 −59 proto/primary/primary.proto
+100 −38 proto/primary/primary_proto_interface.h
2 changes: 1 addition & 1 deletion cellboard/Core/Lib/micro-libs
Submodule micro-libs updated 34 files
+77 −7 README.md
+34 −0 blinky/blinky.mk
+8 −0 bms-monitor/CHANGELOG.md
+34 −0 bms-monitor/bms-monitor.mk
+8 −0 can-manager/CHANGELOG.md
+34 −0 can-manager/can-manager.mk
+0 −45 circ-buf/circ-buf.c
+0 −22 circ-buf/circ-buf.h
+0 −11 circ-buf/test/Makefile
+0 −34 circ-buf/test/main.c
+ − circ-buf/test/test
+0 −61 circ-buf/test/tests.c
+0 −12 circ-buf/test/tests.h
+36 −2 docs/min-heap/heap-handler.md
+13 −0 docs/min-heap/operations.md
+35 −0 docs/ring-buffer/buffer-handler.md
+12 −0 docs/ring-buffer/operations.md
+0 −639 error-utils/error_utils.c
+0 −373 error-utils/error_utils.h
+8 −0 mcp23017/CHANGELOG.md
+34 −0 mcp23017/mcp23017.mk
+22 −0 min-heap/CHANGELOG.md
+11 −3 min-heap/README.md
+40 −8 min-heap/inc/min-heap.h
+34 −0 min-heap/min-heap.mk
+31 −20 min-heap/src/min-heap.c
+80 −13 min-heap/test/test-min-heap.c
+24 −0 ring-buffer/CHANGELOG.md
+11 −3 ring-buffer/README.md
+53 −14 ring-buffer/inc/ring-buffer.h
+34 −0 ring-buffer/ring-buffer.mk
+30 −28 ring-buffer/src/ring-buffer.c
+75 −33 ring-buffer/test/test-ring-buffer.c
+54 −4 scripts/gen_library_template.sh
6 changes: 3 additions & 3 deletions mainboard/Inc/error/error-handler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* Generated by error_gen ruby gem, for more information see:
* https://github.com/eagletrt/micro-utils/tree/master/error-handler-generator
*
* Error_gen version 1.3.0
* Generation date: 2024-03-24 12:45:37 +0100
* Generation from:
* Error_gen version 1.3.3
* Generation date: 2024-04-15 15:45:58 +0200
* Generated from: errors.json
* The error handler contains:
* - 15 error groups
* - 66 total error instances
Expand Down
30 changes: 15 additions & 15 deletions mainboard/Src/error/error-handler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* Generated by error_gen ruby gem, for more information see:
* https://github.com/eagletrt/micro-utils/tree/master/error-handler-generator
*
* Error_gen version 1.3.0
* Generation date: 2024-03-24 12:45:37 +0100
* Generation from:
* Error_gen version 1.3.3
* Generation date: 2024-04-15 15:45:58 +0200
* Generated from: errors.json
* The error handler contains:
* - 15 error groups
* - 66 total error instances
Expand Down Expand Up @@ -155,7 +155,7 @@ void _error_set(ErrorData data) {

// Add error to the running list of errors and
// update timer if the error is the first to expire
if (!min_heap_insert(&running_errors, &err))
if (min_heap_insert(&running_errors, &err) != MIN_HEAP_OK)
return;
Error ** top = (Error **)min_heap_peek(&running_errors);
if (top != NULL && *top == err)
Expand All @@ -179,18 +179,18 @@ void _error_reset(ErrorData data) {

// Get the current first element
Error * top = NULL;
if (!min_heap_top(&running_errors, &top))
if (min_heap_top(&running_errors, &top) != MIN_HEAP_OK)
return;

if (top == err) {
// If the removed error is the first in the heap
// remove it and update (or stop) the timer
if (!min_heap_remove(&running_errors, 0, NULL))
if (min_heap_remove(&running_errors, 0, NULL) != MIN_HEAP_OK)
return;

if (min_heap_is_empty(&running_errors))
error_stop_timer_callback();
else if (min_heap_top(&running_errors, &top))
else if (min_heap_top(&running_errors, &top) == MIN_HEAP_OK)
error_update_timer_callback(top->timestamp, timeouts[top->group]);
}
else {
Expand All @@ -209,7 +209,7 @@ void _error_reset(ErrorData data) {
void _error_expire(ErrorData data) {
// Get error
Error * top = NULL;
if (!min_heap_top(&running_errors, &top))
if (min_heap_top(&running_errors, &top) != MIN_HEAP_OK)
return;

if (!top->is_running || top->is_expired)
Expand All @@ -223,11 +223,11 @@ void _error_expire(ErrorData data) {
++expired_groups[data.group];

// Add error to the list of expired errors
if (!ring_buffer_push_back(&expired_errors, top))
if (ring_buffer_push_back(&expired_errors, &top) != RING_BUFFER_OK)
break;

// Get next error and remove the previous
if (!min_heap_remove(&running_errors, 0, NULL))
if (min_heap_remove(&running_errors, 0, NULL) != MIN_HEAP_OK)
break;

// Stop the timer if there are no more errors
Expand All @@ -237,7 +237,7 @@ void _error_expire(ErrorData data) {
}

// Get next errors
if (!min_heap_top(&running_errors, &top))
if (min_heap_top(&running_errors, &top) != MIN_HEAP_OK)
break;
} while(_error_compare(&top, &prev) <= 0);

Expand Down Expand Up @@ -351,7 +351,7 @@ void error_set(ErrorGroup group, ErrorInstance instance, uint32_t timestamp) {
.timestamp = timestamp,
.op = _error_set
};
if (ring_buffer_push_back(&err_buf, &data))
if (ring_buffer_push_back(&err_buf, &data) == RING_BUFFER_OK)
error_routine();
}
void error_reset(ErrorGroup group, ErrorInstance instance) {
Expand All @@ -365,13 +365,13 @@ void error_reset(ErrorGroup group, ErrorInstance instance) {
.timestamp = 0,
.op = _error_reset
};
if (ring_buffer_push_back(&err_buf, &data))
if (ring_buffer_push_back(&err_buf, &data) == RING_BUFFER_OK)
error_routine();
}
void error_expire(void) {
// Push data to the buffer
ErrorData data = { .op = _error_expire };
if (ring_buffer_push_back(&err_buf, &data))
if (ring_buffer_push_back(&err_buf, &data) == RING_BUFFER_OK)
error_routine();
}
void error_routine(void) {
Expand All @@ -388,7 +388,7 @@ void error_routine(void) {

// Execute the right function for the error
ErrorData err;
if (ring_buffer_pop_front(&err_buf, &err))
if (ring_buffer_pop_front(&err_buf, &err) == RING_BUFFER_OK)
err.op(err);

routine_lock = false;
Expand Down
1 change: 1 addition & 0 deletions mainboard/Src/pack/pack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ GPIO_PinState pack_get_airn_off() {
return HAL_GPIO_ReadPin(AIRN_OFF_GPIO_Port, AIRN_OFF_Pin);
}
void pack_set_airn_off(GPIO_PinState value) {

HAL_GPIO_WritePin(AIRN_OFF_GPIO_Port, AIRN_OFF_Pin, value);
}

Expand Down
2 changes: 1 addition & 1 deletion mainboard/lib/can
Submodule can updated 27 files
+1 −1 dbc/bms/bms.dbc
+95 −77 dbc/primary/primary.dbc
+1 −1 dbc/secondary/secondary.dbc
+1 −1 dbc/simulator/simulator.dbc
+1 −1 lib/bms/bms_network.c
+2 −2 lib/bms/bms_network.h
+3 −3 lib/bms/bms_utils_c.h
+1 −1 lib/inverters/inverters_network.c
+2 −2 lib/inverters/inverters_network.h
+2 −2 lib/inverters/inverters_utils_c.h
+1 −1 lib/ivts/ivts_network.c
+2 −2 lib/ivts/ivts_network.h
+5 −5 lib/ivts/ivts_utils_c.h
+805 −311 lib/primary/primary_network.c
+580 −144 lib/primary/primary_network.h
+267 −162 lib/primary/primary_utils_c.c
+23 −3 lib/primary/primary_utils_c.h
+99 −81 lib/primary/primary_watchdog.c
+64 −60 lib/primary/primary_watchdog.h
+1 −1 lib/secondary/secondary_network.c
+2 −2 lib/secondary/secondary_network.h
+3 −3 lib/secondary/secondary_utils_c.h
+1 −1 lib/simulator/simulator_network.c
+2 −2 lib/simulator/simulator_network.h
+39 −0 networks/primary/network.json
+80 −59 proto/primary/primary.proto
+100 −38 proto/primary/primary_proto_interface.h
2 changes: 1 addition & 1 deletion mainboard/lib/micro-libs
Submodule micro-libs updated 34 files
+77 −7 README.md
+34 −0 blinky/blinky.mk
+8 −0 bms-monitor/CHANGELOG.md
+34 −0 bms-monitor/bms-monitor.mk
+8 −0 can-manager/CHANGELOG.md
+34 −0 can-manager/can-manager.mk
+0 −45 circ-buf/circ-buf.c
+0 −22 circ-buf/circ-buf.h
+0 −11 circ-buf/test/Makefile
+0 −34 circ-buf/test/main.c
+ − circ-buf/test/test
+0 −61 circ-buf/test/tests.c
+0 −12 circ-buf/test/tests.h
+36 −2 docs/min-heap/heap-handler.md
+13 −0 docs/min-heap/operations.md
+35 −0 docs/ring-buffer/buffer-handler.md
+12 −0 docs/ring-buffer/operations.md
+0 −639 error-utils/error_utils.c
+0 −373 error-utils/error_utils.h
+8 −0 mcp23017/CHANGELOG.md
+34 −0 mcp23017/mcp23017.mk
+22 −0 min-heap/CHANGELOG.md
+11 −3 min-heap/README.md
+40 −8 min-heap/inc/min-heap.h
+34 −0 min-heap/min-heap.mk
+31 −20 min-heap/src/min-heap.c
+80 −13 min-heap/test/test-min-heap.c
+24 −0 ring-buffer/CHANGELOG.md
+11 −3 ring-buffer/README.md
+53 −14 ring-buffer/inc/ring-buffer.h
+34 −0 ring-buffer/ring-buffer.mk
+30 −28 ring-buffer/src/ring-buffer.c
+75 −33 ring-buffer/test/test-ring-buffer.c
+54 −4 scripts/gen_library_template.sh

0 comments on commit 80eee64

Please sign in to comment.