Skip to content

Commit

Permalink
Merge pull request #184 from Luos-io/rc_2.3.1
Browse files Browse the repository at this point in the history
Rc 2.3.1
  • Loading branch information
JeromeGalan authored Apr 21, 2022
2 parents 625d89e + 2d8d64c commit 24f2343
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ jobs:
PLATFORMIO_LIB_EXTRA_DIRS: ${{ matrix.pio_lib_path }}
if: ${{ runner.os == 'Windows' }}
run: |
cd ../Luos/
cd ..
cd ${{ github.event.repository.name }}
# Clean all projects
platformio run -t clean -c .\test\msg_alloc\config\platformio.ini
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dev-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ jobs:
PLATFORMIO_LIB_EXTRA_DIRS: ${{ matrix.pio_lib_path }}
if: ${{ runner.os == 'Windows' }}
run: |
cd ../Luos/
cd ..
cd ${{ github.event.repository.name }}
# Clean all projects
platformio run -t clean -c .\test\msg_alloc\config\platformio.ini
Expand Down
4 changes: 4 additions & 0 deletions Robus/src/robus.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ static error_return_t Robus_ResetNetworkDetection(ll_service_t *ll_service)
msg_t msg;
uint8_t try_nbr = 0;

msg.header.config = BASE_PROCOTOL;
msg.header.target = BROADCAST_VAL;
msg.header.target_mode = BROADCAST;
msg.header.cmd = START_DETECTION;
Expand Down Expand Up @@ -349,6 +350,7 @@ static error_return_t Robus_DetectNextNodes(ll_service_t *ll_service)
ll_service->dead_service_spotted = 0;
// Ask an ID to the detector service.
msg_t msg;
msg.header.config = BASE_PROCOTOL;
msg.header.target_mode = NODEIDACK;
msg.header.target = 1;
msg.header.cmd = WRITE_NODE_ID;
Expand Down Expand Up @@ -404,6 +406,7 @@ static error_return_t Robus_MsgHandler(msg_t *input)
// Someone asking us a new node id (we are the detecting service)
// Increase the number of node_nb and send it back
last_node++;
output_msg.header.config = BASE_PROCOTOL;
output_msg.header.cmd = WRITE_NODE_ID;
output_msg.header.size = sizeof(uint16_t);
output_msg.header.target = input->header.source;
Expand All @@ -420,6 +423,7 @@ static error_return_t Robus_MsgHandler(msg_t *input)
// Now we can send it to the next node
memcpy((void *)&node_bootstrap.nodeid, (void *)&input->data[0], sizeof(uint16_t));
node_bootstrap.prev_nodeid = ctx.node.node_id;
output_msg.header.config = BASE_PROCOTOL;
output_msg.header.cmd = WRITE_NODE_ID;
output_msg.header.size = sizeof(node_bootstrap_t);
output_msg.header.target = 0;
Expand Down
4 changes: 2 additions & 2 deletions library.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Luos",
"keywords": "robus,network,microservice,luos,operating system,os,embedded,communication,service,ST",
"description": "Luos turns your embedded system into services like microservices architecture does it in software.",
"version": "2.3.0",
"version": "2.3.1",
"authors": {
"name": "Luos",
"url": "https://luos.io"
Expand Down Expand Up @@ -39,4 +39,4 @@
"dependencies": {
"luos/LuosHAL": "^0.5.3"
}
}
}
2 changes: 2 additions & 0 deletions src/luos.c
Original file line number Diff line number Diff line change
Expand Up @@ -1025,6 +1025,7 @@ void Luos_SendBaudrate(service_t *service, uint32_t baudrate)
{
msg_t msg;
memcpy(msg.data, &baudrate, sizeof(uint32_t));
msg.header.config = BASE_PROCOTOL;
msg.header.target_mode = BROADCAST;
msg.header.target = BROADCAST_VAL;
msg.header.cmd = SET_BAUDRATE;
Expand All @@ -1042,6 +1043,7 @@ void Luos_SendBaudrate(service_t *service, uint32_t baudrate)
void Luos_SetExternId(service_t *service, target_mode_t target_mode, uint16_t target, uint16_t newid)
{
msg_t msg;
msg.header.config = BASE_PROCOTOL;
msg.header.target = target;
msg.header.target_mode = target_mode;
msg.header.cmd = WRITE_NODE_ID;
Expand Down
2 changes: 1 addition & 1 deletion test/_template/config/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform = native
test_transport = custom
test_build_project_src = true
build_type = debug

lib_extra_dirs= ../
src_filter =
"+<../test/_resources/Unity/*.c>"
"+<../test/_resources/Mock/*.c>"
Expand Down
2 changes: 1 addition & 1 deletion test/luos/config/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform = native
test_transport = custom
test_build_project_src = true
build_type = debug

lib_extra_dirs= ../
src_filter =
"+<../test/_resources/Unity/*.c>"
"+<../test/_resources/Mock/*.c>"
Expand Down
2 changes: 1 addition & 1 deletion test/msg_alloc/config/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform = native
test_transport = custom
test_build_project_src = true
build_type = debug

lib_extra_dirs= ../
src_filter =
"+<../test/_resources/Unity/*.c>"
"+<../test/_resources/Mock/*.c>"
Expand Down
2 changes: 1 addition & 1 deletion test/routing_table/config/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform = native
test_transport = custom
test_build_project_src = true
build_type = debug

lib_extra_dirs= ../
src_filter =
"+<../test/_resources/Unity/*.c>"
"+<../test/_resources/Mock/*.c>"
Expand Down
2 changes: 1 addition & 1 deletion test/timestamp/config/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform = native
test_transport = custom
test_build_project_src = true
build_type = debug

lib_extra_dirs= ../
src_filter =
"+<../test/_resources/Unity/*.c>"
"+<../test/_resources/Mock/*.c>"
Expand Down

0 comments on commit 24f2343

Please sign in to comment.