Skip to content

Commit

Permalink
Merge pull request #197 from Luos-io/rc_2.4.1
Browse files Browse the repository at this point in the history
Release Luos Engine - version 2.4.1
  • Loading branch information
JeromeGalan authored May 4, 2022
2 parents 53ee092 + 8a6b986 commit 1f9d53e
Show file tree
Hide file tree
Showing 148 changed files with 241 additions and 175 deletions.
3 changes: 3 additions & 0 deletions engine/HAL/ATSAMD21_ARDUINO/luos_hal.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ void LuosHAL_Init(void)

// Flash Initialization
LuosHAL_FlashInit();

// start timestamp
LuosHAL_StartTimestamp();
}
/******************************************************************************
* @brief Luos HAL general disable IRQ
Expand Down
5 changes: 3 additions & 2 deletions engine/core/inc/luos_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ typedef enum
typedef enum
{
// Common register for all services
GET_CMD = LUOS_LAST_RESERVED_CMD, // asks a service to publish its data
SET_CMD, // set some undefined data
UNKNOWN_CMD = LUOS_LAST_RESERVED_CMD, // set or get some undefined data (change size of msg to set or get)
GET_CMD = UNKNOWN_CMD, // retrocompatibility
SET_CMD, // retrocompatibility

// Generic data
COLOR, // color_t (R, G, B)
Expand Down
12 changes: 6 additions & 6 deletions engine/core/src/luos_engine.c
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ static void Luos_AutoUpdateManager(void)
// This service need to send an update
// Create a fake message for it from the service asking for update
msg_t updt_msg;
updt_msg.header.config = BASE_PROTOCOL;
updt_msg.header.target = service_table[i].ll_service->id;
updt_msg.header.source = service_table[i].auto_refresh.target;
updt_msg.header.target_mode = IDACK;
Expand All @@ -522,9 +523,8 @@ static void Luos_AutoUpdateManager(void)
}
else
{
// store service and msg pointer
// todo this can't work for now because this message is not permanent.
// mngr_set(&service_table[i], &updt_msg);
// directly transmit the message in Localhost
Robus_SetTxTask(service_table[i].ll_service, &updt_msg);
}
service_table[i].auto_refresh.last_update = LuosHAL_GetSystick();
}
Expand Down Expand Up @@ -605,7 +605,7 @@ service_t *Luos_CreateService(SERVICE_CB service_cb, uint8_t type, const char *a
error_return_t Luos_SendMsg(service_t *service, msg_t *msg)
{
// set protocol version
msg->header.config = BASE_PROCOTOL;
msg->header.config = BASE_PROTOCOL;

if (service == 0)
{
Expand Down Expand Up @@ -1021,7 +1021,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.config = BASE_PROTOCOL;
msg.header.target_mode = BROADCAST;
msg.header.target = BROADCAST_VAL;
msg.header.cmd = SET_BAUDRATE;
Expand All @@ -1039,7 +1039,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.config = BASE_PROTOCOL;
msg.header.target = target;
msg.header.target_mode = target_mode;
msg.header.cmd = WRITE_NODE_ID;
Expand Down
2 changes: 1 addition & 1 deletion examples/apps/alarm_controller/library.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
},
"licence": "MIT",
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
}
}
2 changes: 1 addition & 1 deletion examples/apps/biometric-security/library.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
},
"licence": "MIT",
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
}
}
2 changes: 1 addition & 1 deletion examples/apps/start_controller/library.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
},
"licence": "MIT",
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"build": {},
"dependencies": {
"askuric/Simple FOC": "^2.2.1",
"luos/Luos_engine": "^2.4.0"
"luos/Luos_engine": "^2.4.1"
}
}
2 changes: 1 addition & 1 deletion examples/projects/Arduino/bldc_simple_foc/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ build_flags =
-include node_config.h
-DLUOSHAL=ATSAMD21_ARDUINO
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
SimpleFOC_Motor
askuric/Simple FOC@^2.2.1
2 changes: 1 addition & 1 deletion examples/projects/Arduino/button/lib/button/library.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT"
}
21 changes: 20 additions & 1 deletion examples/projects/Arduino/button/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
;
; Please visit documentation for the other options and examples
; https://docs.platformio.org/page/projectconf.html
[platformio]
default_envs = zero

[env:zero]
lib_extra_dirs = ../../../../../
Expand All @@ -22,5 +24,22 @@ build_flags =
-include node_config.h
-D LUOSHAL=ATSAMD21_ARDUINO
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Button

[env:seed]
lib_extra_dirs = ../../../../../
lib_ldf_mode =off
platform = atmelsam
board = seeed_xiao
framework = arduino
platform_packages = framework-arduino-samd-seeed@https://github.com/Luos-io/Arduino_core.git
build_unflags = -Os
build_flags =
-O1
-I inc
-include node_config.h
-D LUOSHAL=ATSAMD21_ARDUINO
lib_deps =
luos_engine@^2.4.1
Button
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"version": "1.0.0",
"licence": "MIT",
"dependencies": {
"luos/luos_engine": "^2.4.0",
"luos/luos_engine": "^2.4.1",
"adafruit/Adafruit Fingerprint Sensor Library": "*"
}
}
2 changes: 1 addition & 1 deletion examples/projects/Arduino/fingerprint/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ build_flags =
-include node_config.h
-D LUOSHAL=ATSAMD21_ARDUINO
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Fingerprint
adafruit/Adafruit Fingerprint Sensor Library
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT"
}
2 changes: 1 addition & 1 deletion examples/projects/Arduino/gate_serialcom/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ lib_extra_dirs =
../../../../tool_services/
../../../../../
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Gate
Pipe
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT",
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ lib_extra_dirs =
../../../../tool_services/
../../../../../
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Inspector
Pipe
2 changes: 1 addition & 1 deletion examples/projects/Arduino/lcd/lib/Lcd/library.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"version": "1.0.0",
"licence": "MIT",
"dependencies": {
"luos/luos_engine": "^2.4.0",
"luos/luos_engine": "^2.4.1",
"arduino-libraries/LiquidCrystal": "*"
}
}
2 changes: 1 addition & 1 deletion examples/projects/Arduino/lcd/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ build_flags =
-include node_config.h
-D LUOSHAL=ATSAMD21_ARDUINO
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Lcd
arduino-libraries/LiquidCrystal
2 changes: 1 addition & 1 deletion examples/projects/Arduino/led/lib/led/library.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT"
}
2 changes: 1 addition & 1 deletion examples/projects/Arduino/led/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ build_flags =
-include node_config.h
-D LUOSHAL=ATSAMD21_ARDUINO
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Led
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"licence": "MIT",
"dependencies": {
"arduino-libraries/servo": "^1.1.8",
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
}
}
2 changes: 1 addition & 1 deletion examples/projects/Arduino/servo_motor/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ build_flags =
-include node_config.h
-D LUOSHAL=ATSAMD21_ARDUINO
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
arduino-libraries/Servo@^1.1.8
servo_motor
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"build": {},
"dependencies": {
"askuric/Simple FOC": "^2.2.1",
"luos/Luos_engine": "^2.4.0",
"luos/Luos_engine": "^2.4.1",
"Wire": "*",
"SPI": "*"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ build_flags =
-include node_config.h
-D LUOSHAL=ATSAMD21_ARDUINO
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
SimpleFOC_Stepper
askuric/Simple FOC@^2.2.1
2 changes: 1 addition & 1 deletion examples/projects/NUCLEO-F072RB/bootloader/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ build_flags =
-O1
debug_build_flags = -O0 -g -ggdb
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
debug_tool = stlink
upload_protocol = stlink
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT",
"build": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ platform = ststm32
board = nucleo_f072rb
framework = stm32cube
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Pipe
Gate
debug_tool = stlink
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT",
"build": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ platform = ststm32
board = nucleo_f072rb
framework = stm32cube
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Inspector
pipe
debug_tool = stlink
Expand Down
2 changes: 1 addition & 1 deletion examples/projects/NUCLEO-F401RE/bootloader/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ build_flags =
-DLUOSHAL=STM32F4
debug_build_flags = -O0 -g -ggdb
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
debug_tool = stlink
upload_protocol = stlink
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT",
"build": {
Expand Down
2 changes: 1 addition & 1 deletion examples/projects/NUCLEO-F401RE/button/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ platform = ststm32
board = nucleo_f401re
framework = stm32cube
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Button
debug_tool = stlink

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT",
"build": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ platform = ststm32
board = nucleo_f401re
framework = stm32cube
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Gate
Pipe
debug_tool = stlink
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT",
"build": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ platform = ststm32
board = nucleo_f401re
framework = stm32cube
lib_deps =
luos_engine@^2.4.0
luos_engine@^2.4.1
Inspector
Pipe
debug_tool = stlink
Expand Down
2 changes: 1 addition & 1 deletion examples/projects/NUCLEO-F401RE/led/lib/Led/library.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"url": "https://luos.io"
},
"dependencies": {
"luos/luos_engine": "^2.4.0"
"luos/luos_engine": "^2.4.1"
},
"licence": "MIT",
"build": {
Expand Down
Loading

0 comments on commit 1f9d53e

Please sign in to comment.