Skip to content

Commit 1f9d53e

Browse files
author
JeromeGalan
authored
Merge pull request #197 from Luos-io/rc_2.4.1
Release Luos Engine - version 2.4.1
2 parents 53ee092 + 8a6b986 commit 1f9d53e

File tree

148 files changed

+241
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+241
-175
lines changed

‎engine/HAL/ATSAMD21_ARDUINO/luos_hal.c

+3
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ void LuosHAL_Init(void)
4545

4646
// Flash Initialization
4747
LuosHAL_FlashInit();
48+
49+
// start timestamp
50+
LuosHAL_StartTimestamp();
4851
}
4952
/******************************************************************************
5053
* @brief Luos HAL general disable IRQ

‎engine/core/inc/luos_list.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ typedef enum
3434
typedef enum
3535
{
3636
// Common register for all services
37-
GET_CMD = LUOS_LAST_RESERVED_CMD, // asks a service to publish its data
38-
SET_CMD, // set some undefined data
37+
UNKNOWN_CMD = LUOS_LAST_RESERVED_CMD, // set or get some undefined data (change size of msg to set or get)
38+
GET_CMD = UNKNOWN_CMD, // retrocompatibility
39+
SET_CMD, // retrocompatibility
3940

4041
// Generic data
4142
COLOR, // color_t (R, G, B)

‎engine/core/src/luos_engine.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ static void Luos_AutoUpdateManager(void)
511511
// This service need to send an update
512512
// Create a fake message for it from the service asking for update
513513
msg_t updt_msg;
514+
updt_msg.header.config = BASE_PROTOCOL;
514515
updt_msg.header.target = service_table[i].ll_service->id;
515516
updt_msg.header.source = service_table[i].auto_refresh.target;
516517
updt_msg.header.target_mode = IDACK;
@@ -522,9 +523,8 @@ static void Luos_AutoUpdateManager(void)
522523
}
523524
else
524525
{
525-
// store service and msg pointer
526-
// todo this can't work for now because this message is not permanent.
527-
// mngr_set(&service_table[i], &updt_msg);
526+
// directly transmit the message in Localhost
527+
Robus_SetTxTask(service_table[i].ll_service, &updt_msg);
528528
}
529529
service_table[i].auto_refresh.last_update = LuosHAL_GetSystick();
530530
}
@@ -605,7 +605,7 @@ service_t *Luos_CreateService(SERVICE_CB service_cb, uint8_t type, const char *a
605605
error_return_t Luos_SendMsg(service_t *service, msg_t *msg)
606606
{
607607
// set protocol version
608-
msg->header.config = BASE_PROCOTOL;
608+
msg->header.config = BASE_PROTOCOL;
609609

610610
if (service == 0)
611611
{
@@ -1021,7 +1021,7 @@ void Luos_SendBaudrate(service_t *service, uint32_t baudrate)
10211021
{
10221022
msg_t msg;
10231023
memcpy(msg.data, &baudrate, sizeof(uint32_t));
1024-
msg.header.config = BASE_PROCOTOL;
1024+
msg.header.config = BASE_PROTOCOL;
10251025
msg.header.target_mode = BROADCAST;
10261026
msg.header.target = BROADCAST_VAL;
10271027
msg.header.cmd = SET_BAUDRATE;
@@ -1039,7 +1039,7 @@ void Luos_SendBaudrate(service_t *service, uint32_t baudrate)
10391039
void Luos_SetExternId(service_t *service, target_mode_t target_mode, uint16_t target, uint16_t newid)
10401040
{
10411041
msg_t msg;
1042-
msg.header.config = BASE_PROCOTOL;
1042+
msg.header.config = BASE_PROTOCOL;
10431043
msg.header.target = target;
10441044
msg.header.target_mode = target_mode;
10451045
msg.header.cmd = WRITE_NODE_ID;

‎examples/apps/alarm_controller/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
},
1010
"licence": "MIT",
1111
"dependencies": {
12-
"luos/luos_engine": "^2.4.0"
12+
"luos/luos_engine": "^2.4.1"
1313
}
1414
}

‎examples/apps/biometric-security/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
},
1010
"licence": "MIT",
1111
"dependencies": {
12-
"luos/luos_engine": "^2.4.0"
12+
"luos/luos_engine": "^2.4.1"
1313
}
1414
}

‎examples/apps/start_controller/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
},
1010
"licence": "MIT",
1111
"dependencies": {
12-
"luos/luos_engine": "^2.4.0"
12+
"luos/luos_engine": "^2.4.1"
1313
}
1414
}

‎examples/projects/Arduino/bldc_simple_foc/lib/motor/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"build": {},
1212
"dependencies": {
1313
"askuric/Simple FOC": "^2.2.1",
14-
"luos/Luos_engine": "^2.4.0"
14+
"luos/Luos_engine": "^2.4.1"
1515
}
1616
}

‎examples/projects/Arduino/bldc_simple_foc/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ build_flags =
2121
-include node_config.h
2222
-DLUOSHAL=ATSAMD21_ARDUINO
2323
lib_deps =
24-
luos_engine@^2.4.0
24+
luos_engine@^2.4.1
2525
SimpleFOC_Motor
2626
askuric/Simple FOC@^2.2.1

‎examples/projects/Arduino/button/lib/button/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT"
1414
}

‎examples/projects/Arduino/button/platformio.ini

+20-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
;
88
; Please visit documentation for the other options and examples
99
; https://docs.platformio.org/page/projectconf.html
10+
[platformio]
11+
default_envs = zero
1012

1113
[env:zero]
1214
lib_extra_dirs = ../../../../../
@@ -22,5 +24,22 @@ build_flags =
2224
-include node_config.h
2325
-D LUOSHAL=ATSAMD21_ARDUINO
2426
lib_deps =
25-
luos_engine@^2.4.0
27+
luos_engine@^2.4.1
28+
Button
29+
30+
[env:seed]
31+
lib_extra_dirs = ../../../../../
32+
lib_ldf_mode =off
33+
platform = atmelsam
34+
board = seeed_xiao
35+
framework = arduino
36+
platform_packages = framework-arduino-samd-seeed@https://github.com/Luos-io/Arduino_core.git
37+
build_unflags = -Os
38+
build_flags =
39+
-O1
40+
-I inc
41+
-include node_config.h
42+
-D LUOSHAL=ATSAMD21_ARDUINO
43+
lib_deps =
44+
luos_engine@^2.4.1
2645
Button

‎examples/projects/Arduino/fingerprint/lib/Fingerprint/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"version": "1.0.0",
66
"licence": "MIT",
77
"dependencies": {
8-
"luos/luos_engine": "^2.4.0",
8+
"luos/luos_engine": "^2.4.1",
99
"adafruit/Adafruit Fingerprint Sensor Library": "*"
1010
}
1111
}

‎examples/projects/Arduino/fingerprint/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ build_flags =
2222
-include node_config.h
2323
-D LUOSHAL=ATSAMD21_ARDUINO
2424
lib_deps =
25-
luos_engine@^2.4.0
25+
luos_engine@^2.4.1
2626
Fingerprint
2727
adafruit/Adafruit Fingerprint Sensor Library

‎examples/projects/Arduino/gate_serialcom/lib/Pipe/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT"
1414
}

‎examples/projects/Arduino/gate_serialcom/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ lib_extra_dirs =
2525
../../../../tool_services/
2626
../../../../../
2727
lib_deps =
28-
luos_engine@^2.4.0
28+
luos_engine@^2.4.1
2929
Gate
3030
Pipe

‎examples/projects/Arduino/inspector_serialcom/lib/Pipe/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT",
1414
}

‎examples/projects/Arduino/inspector_serialcom/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ lib_extra_dirs =
2525
../../../../tool_services/
2626
../../../../../
2727
lib_deps =
28-
luos_engine@^2.4.0
28+
luos_engine@^2.4.1
2929
Inspector
3030
Pipe

‎examples/projects/Arduino/lcd/lib/Lcd/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"version": "1.0.0",
66
"licence": "MIT",
77
"dependencies": {
8-
"luos/luos_engine": "^2.4.0",
8+
"luos/luos_engine": "^2.4.1",
99
"arduino-libraries/LiquidCrystal": "*"
1010
}
1111
}

‎examples/projects/Arduino/lcd/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ build_flags =
2222
-include node_config.h
2323
-D LUOSHAL=ATSAMD21_ARDUINO
2424
lib_deps =
25-
luos_engine@^2.4.0
25+
luos_engine@^2.4.1
2626
Lcd
2727
arduino-libraries/LiquidCrystal

‎examples/projects/Arduino/led/lib/led/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT"
1414
}

‎examples/projects/Arduino/led/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ build_flags =
2222
-include node_config.h
2323
-D LUOSHAL=ATSAMD21_ARDUINO
2424
lib_deps =
25-
luos_engine@^2.4.0
25+
luos_engine@^2.4.1
2626
Led

‎examples/projects/Arduino/servo_motor/lib/Servo_motor/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"licence": "MIT",
77
"dependencies": {
88
"arduino-libraries/servo": "^1.1.8",
9-
"luos/luos_engine": "^2.4.0"
9+
"luos/luos_engine": "^2.4.1"
1010
}
1111
}

‎examples/projects/Arduino/servo_motor/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ build_flags =
2222
-include node_config.h
2323
-D LUOSHAL=ATSAMD21_ARDUINO
2424
lib_deps =
25-
luos_engine@^2.4.0
25+
luos_engine@^2.4.1
2626
arduino-libraries/Servo@^1.1.8
2727
servo_motor

‎examples/projects/Arduino/stepper_simple_foc/lib/motor/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"build": {},
1212
"dependencies": {
1313
"askuric/Simple FOC": "^2.2.1",
14-
"luos/Luos_engine": "^2.4.0",
14+
"luos/Luos_engine": "^2.4.1",
1515
"Wire": "*",
1616
"SPI": "*"
1717
}

‎examples/projects/Arduino/stepper_simple_foc/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ build_flags =
2121
-include node_config.h
2222
-D LUOSHAL=ATSAMD21_ARDUINO
2323
lib_deps =
24-
luos_engine@^2.4.0
24+
luos_engine@^2.4.1
2525
SimpleFOC_Stepper
2626
askuric/Simple FOC@^2.2.1

‎examples/projects/NUCLEO-F072RB/bootloader/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ build_flags =
2424
-O1
2525
debug_build_flags = -O0 -g -ggdb
2626
lib_deps =
27-
luos_engine@^2.4.0
27+
luos_engine@^2.4.1
2828
debug_tool = stlink
2929
upload_protocol = stlink

‎examples/projects/NUCLEO-F072RB/gate_serialcom/lib/Pipe/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT",
1414
"build": {

‎examples/projects/NUCLEO-F072RB/gate_serialcom/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ platform = ststm32
2020
board = nucleo_f072rb
2121
framework = stm32cube
2222
lib_deps =
23-
luos_engine@^2.4.0
23+
luos_engine@^2.4.1
2424
Pipe
2525
Gate
2626
debug_tool = stlink

‎examples/projects/NUCLEO-F072RB/inspector_serialcom/lib/Pipe/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT",
1414
"build": {

‎examples/projects/NUCLEO-F072RB/inspector_serialcom/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ platform = ststm32
2020
board = nucleo_f072rb
2121
framework = stm32cube
2222
lib_deps =
23-
luos_engine@^2.4.0
23+
luos_engine@^2.4.1
2424
Inspector
2525
pipe
2626
debug_tool = stlink

‎examples/projects/NUCLEO-F401RE/bootloader/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ build_flags =
2424
-DLUOSHAL=STM32F4
2525
debug_build_flags = -O0 -g -ggdb
2626
lib_deps =
27-
luos_engine@^2.4.0
27+
luos_engine@^2.4.1
2828
debug_tool = stlink
2929
upload_protocol = stlink

‎examples/projects/NUCLEO-F401RE/button/lib/Button/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT",
1414
"build": {

‎examples/projects/NUCLEO-F401RE/button/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ platform = ststm32
1717
board = nucleo_f401re
1818
framework = stm32cube
1919
lib_deps =
20-
luos_engine@^2.4.0
20+
luos_engine@^2.4.1
2121
Button
2222
debug_tool = stlink
2323

‎examples/projects/NUCLEO-F401RE/gate_serialcom/lib/Pipe/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT",
1414
"build": {

‎examples/projects/NUCLEO-F401RE/gate_serialcom/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ platform = ststm32
1919
board = nucleo_f401re
2020
framework = stm32cube
2121
lib_deps =
22-
luos_engine@^2.4.0
22+
luos_engine@^2.4.1
2323
Gate
2424
Pipe
2525
debug_tool = stlink

‎examples/projects/NUCLEO-F401RE/inspector_serialcom/lib/Pipe/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT",
1414
"build": {

‎examples/projects/NUCLEO-F401RE/inspector_serialcom/platformio.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ platform = ststm32
1919
board = nucleo_f401re
2020
framework = stm32cube
2121
lib_deps =
22-
luos_engine@^2.4.0
22+
luos_engine@^2.4.1
2323
Inspector
2424
Pipe
2525
debug_tool = stlink

‎examples/projects/NUCLEO-F401RE/led/lib/Led/library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"url": "https://luos.io"
99
},
1010
"dependencies": {
11-
"luos/luos_engine": "^2.4.0"
11+
"luos/luos_engine": "^2.4.1"
1212
},
1313
"licence": "MIT",
1414
"build": {

0 commit comments

Comments
 (0)