update registers and add a few examples (#5)

RaccoonlabDev · Nov 1, 2023 · ed06399 · ed06399
1 parent 7afdb51
commit ed06399
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 46 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,8 @@ else()
     )
     set(applicationSourceCode
         Src/cyphal_application/application.cpp
-        Src/cyphal_application/params.cpp
+        build/src/params.cpp
+        build/src/string_params.cpp
     )
     set(applicationHeaders
         Src/cyphal_application

diff --git a/Libs/Cyphal b/Libs/Cyphal
diff --git a/Libs/libparams b/Libs/libparams
diff --git a/Makefile b/Makefile
@@ -7,6 +7,7 @@ BUILD_OBJ_DIR:=build/obj
 
 cyphal: clean autogenerate_git_related_headers
 	mkdir -p ${BUILD_OBJ_DIR}
+	./scripts/prebuild_cyphal.sh
 	cd ${BUILD_OBJ_DIR} && cmake ../.. && make
 
 dronecan: clean autogenerate_git_related_headers

diff --git a/Src/cyphal_application/application.cpp b/Src/cyphal_application/application.cpp
@@ -8,7 +8,6 @@
 #include "main.h"
 #include "string_params.hpp"
 #include "params.hpp"
-#include "storage.h"
 
 void application_entry_point() {
     paramsInit(static_cast<uint8_t>(IntParamsIndexes::INTEGER_PARAMS_AMOUNT), NUM_OF_STR_PARAMS);

diff --git a/Src/cyphal_application/params.cpp b/Src/cyphal_application/params.cpp
diff --git a/Src/cyphal_application/params.hpp b/Src/cyphal_application/params.hpp
diff --git a/Src/cyphal_application/params.yaml b/Src/cyphal_application/params.yaml
@@ -0,0 +1,17 @@
+example.integer:
+  type: Integer
+  enum: PARAM_EXAMPLE_INTEGER
+  flags: mutable
+  default: 42
+  min: 0
+  max: 255
+
+example.string:
+  type: String
+  enum: PARAM_EXAMPLE_STRING
+  flags: mutable
+  default: "default_string_value"
+
+uavcan.pub.example :
+  data_type: reg.udral.service.actuator.common.Feedback.0.1
+  enum_base: PWM_1_FB
diff --git a/Src/cyphal_application/string_params.hpp b/Src/cyphal_application/string_params.hpp
diff --git a/Src/dronecan_application/params.cpp b/Src/dronecan_application/params.cpp
@@ -7,11 +7,11 @@
 #include "storage.h"
 
 IntegerDesc_t integer_desc_pool[] = {
-    {(uint8_t*)"id", 0, 127, 50},
+    {"id", 0, 127, 50},
 };
 IntegerParamValue_t integer_values_pool[sizeof(integer_desc_pool) / sizeof(IntegerDesc_t)];
 
 StringDesc_t __attribute__((weak)) string_desc_pool[NUM_OF_STR_PARAMS] = {
-    {(uint8_t*)"name", "", false},
+    {"name", "", false},
 };
 StringParamValue_t string_values_pool[sizeof(string_desc_pool) / sizeof(StringDesc_t)];
diff --git a/scripts/prebuild_cyphal.sh b/scripts/prebuild_cyphal.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+REPOSITORY_PATH="$(dirname "$SCRIPT_DIR")"
+BUILD_DIR=${REPOSITORY_PATH}/build/src/
+
+${REPOSITORY_PATH}/Libs/libparams/scripts/params_generate_array_from_yaml.py \
+    ${BUILD_DIR} \
+    c++ \
+    params \
+    ${REPOSITORY_PATH}/Libs/Cyphal/Cyphal/params.yaml ${REPOSITORY_PATH}/Src/cyphal_application/params.yaml
+2 −5		.github/workflows/sonarcloud.yml
+6 −6		README.md
+4 −0		libparams/rom.c
+2 −0		libparams/rom.h
+19 −4		libparams/storage.c
+14 −10		libparams/storage.h
+0 −1		scripts/params.py
+0 −188		scripts/params_generate_array.py
+144 −30		scripts/params_generate_array_from_yaml.py
+5 −5		tests/params.c