Skip to content

Commit 24f2343

Browse files
author
JeromeGalan
authored
Merge pull request #184 from Luos-io/rc_2.3.1
Rc 2.3.1
2 parents 625d89e + 2d8d64c commit 24f2343

File tree

10 files changed

+17
-9
lines changed

10 files changed

+17
-9
lines changed

.github/workflows/build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ jobs:
113113
PLATFORMIO_LIB_EXTRA_DIRS: ${{ matrix.pio_lib_path }}
114114
if: ${{ runner.os == 'Windows' }}
115115
run: |
116-
cd ../Luos/
116+
cd ..
117+
cd ${{ github.event.repository.name }}
117118
118119
# Clean all projects
119120
platformio run -t clean -c .\test\msg_alloc\config\platformio.ini

.github/workflows/dev-build.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ jobs:
138138
PLATFORMIO_LIB_EXTRA_DIRS: ${{ matrix.pio_lib_path }}
139139
if: ${{ runner.os == 'Windows' }}
140140
run: |
141-
cd ../Luos/
141+
cd ..
142+
cd ${{ github.event.repository.name }}
142143
143144
# Clean all projects
144145
platformio run -t clean -c .\test\msg_alloc\config\platformio.ini

Robus/src/robus.c

+4
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ static error_return_t Robus_ResetNetworkDetection(ll_service_t *ll_service)
296296
msg_t msg;
297297
uint8_t try_nbr = 0;
298298

299+
msg.header.config = BASE_PROCOTOL;
299300
msg.header.target = BROADCAST_VAL;
300301
msg.header.target_mode = BROADCAST;
301302
msg.header.cmd = START_DETECTION;
@@ -349,6 +350,7 @@ static error_return_t Robus_DetectNextNodes(ll_service_t *ll_service)
349350
ll_service->dead_service_spotted = 0;
350351
// Ask an ID to the detector service.
351352
msg_t msg;
353+
msg.header.config = BASE_PROCOTOL;
352354
msg.header.target_mode = NODEIDACK;
353355
msg.header.target = 1;
354356
msg.header.cmd = WRITE_NODE_ID;
@@ -404,6 +406,7 @@ static error_return_t Robus_MsgHandler(msg_t *input)
404406
// Someone asking us a new node id (we are the detecting service)
405407
// Increase the number of node_nb and send it back
406408
last_node++;
409+
output_msg.header.config = BASE_PROCOTOL;
407410
output_msg.header.cmd = WRITE_NODE_ID;
408411
output_msg.header.size = sizeof(uint16_t);
409412
output_msg.header.target = input->header.source;
@@ -420,6 +423,7 @@ static error_return_t Robus_MsgHandler(msg_t *input)
420423
// Now we can send it to the next node
421424
memcpy((void *)&node_bootstrap.nodeid, (void *)&input->data[0], sizeof(uint16_t));
422425
node_bootstrap.prev_nodeid = ctx.node.node_id;
426+
output_msg.header.config = BASE_PROCOTOL;
423427
output_msg.header.cmd = WRITE_NODE_ID;
424428
output_msg.header.size = sizeof(node_bootstrap_t);
425429
output_msg.header.target = 0;

library.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Luos",
33
"keywords": "robus,network,microservice,luos,operating system,os,embedded,communication,service,ST",
44
"description": "Luos turns your embedded system into services like microservices architecture does it in software.",
5-
"version": "2.3.0",
5+
"version": "2.3.1",
66
"authors": {
77
"name": "Luos",
88
"url": "https://luos.io"
@@ -39,4 +39,4 @@
3939
"dependencies": {
4040
"luos/LuosHAL": "^0.5.3"
4141
}
42-
}
42+
}

src/luos.c

+2
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,7 @@ void Luos_SendBaudrate(service_t *service, uint32_t baudrate)
10251025
{
10261026
msg_t msg;
10271027
memcpy(msg.data, &baudrate, sizeof(uint32_t));
1028+
msg.header.config = BASE_PROCOTOL;
10281029
msg.header.target_mode = BROADCAST;
10291030
msg.header.target = BROADCAST_VAL;
10301031
msg.header.cmd = SET_BAUDRATE;
@@ -1042,6 +1043,7 @@ void Luos_SendBaudrate(service_t *service, uint32_t baudrate)
10421043
void Luos_SetExternId(service_t *service, target_mode_t target_mode, uint16_t target, uint16_t newid)
10431044
{
10441045
msg_t msg;
1046+
msg.header.config = BASE_PROCOTOL;
10451047
msg.header.target = target;
10461048
msg.header.target_mode = target_mode;
10471049
msg.header.cmd = WRITE_NODE_ID;

test/_template/config/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ platform = native
1717
test_transport = custom
1818
test_build_project_src = true
1919
build_type = debug
20-
20+
lib_extra_dirs= ../
2121
src_filter =
2222
"+<../test/_resources/Unity/*.c>"
2323
"+<../test/_resources/Mock/*.c>"

test/luos/config/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ platform = native
1717
test_transport = custom
1818
test_build_project_src = true
1919
build_type = debug
20-
20+
lib_extra_dirs= ../
2121
src_filter =
2222
"+<../test/_resources/Unity/*.c>"
2323
"+<../test/_resources/Mock/*.c>"

test/msg_alloc/config/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ platform = native
1717
test_transport = custom
1818
test_build_project_src = true
1919
build_type = debug
20-
20+
lib_extra_dirs= ../
2121
src_filter =
2222
"+<../test/_resources/Unity/*.c>"
2323
"+<../test/_resources/Mock/*.c>"

test/routing_table/config/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ platform = native
1717
test_transport = custom
1818
test_build_project_src = true
1919
build_type = debug
20-
20+
lib_extra_dirs= ../
2121
src_filter =
2222
"+<../test/_resources/Unity/*.c>"
2323
"+<../test/_resources/Mock/*.c>"

test/timestamp/config/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ platform = native
1717
test_transport = custom
1818
test_build_project_src = true
1919
build_type = debug
20-
20+
lib_extra_dirs= ../
2121
src_filter =
2222
"+<../test/_resources/Unity/*.c>"
2323
"+<../test/_resources/Mock/*.c>"

0 commit comments

Comments
 (0)