Commit 6fda3939 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Merge branch 'feature_buster' into qgen_fix_adacore

parents 7d861098 79b5aa7b
......@@ -143,7 +143,6 @@ project @_CAPITALIZE:Name_@ is
"-ffunction-sections",
"-fdiagnostics-color=always",
"-Wno-cast-function-type",
"-Wmissing-prototypes",
@@IF@@ @_Coverage_@
"-fprofile-arcs",
"-ftest-coverage",
......@@ -164,7 +163,7 @@ project @_CAPITALIZE:Name_@ is
case Build is
when "Release" =>
for Default_Switches ("C") use Common_C_Switches & ("-O2", "-DNDEBUG");
for Default_Switches ("C") use Common_C_Switches & ("-O2", "-DNDEBUG" ,"-Wmissing-prototypes");
for Default_Switches ("C++") use Common_C_Switches & ("-O2", "-DNDEBUG");
for Default_Switches ("Ada") use Common_Ada_Switches & ("-O2", "-DNDEBUG");
when "Debug" =>
......@@ -185,6 +184,7 @@ project @_CAPITALIZE:Name_@ is
"-lm",
@@IF@@ @_CPU_Platform_@ = PLATFORM_RPI
"-lgnat",
"-lstdc++",
@@END_IF@@
@@IF@@ @_Coverage_@
"-fprofile-arcs",
......
......@@ -68,7 +68,7 @@ configuration project Raspberry_PI is
for Driver ("C++") use "arm-linux-gnueabihf-g++";
for Leading_Required_Switches ("C") use ("-c", "-x", "c");
for Leading_Required_Switches ("C++") use ("-c", "-x", "c");
for Leading_Required_Switches ("C++") use ("-c", "-x", "c++");
for Required_Switches("Ada") use ("-c", "-x", "ada");
Common_C_Switches :=
......@@ -116,8 +116,8 @@ configuration project Raspberry_PI is
for Export_File_Switch use "-Wl,--version-script=";
for Map_File_Option use "-Wl,-Map,";
for Default_Switches ("C") use Common_C_Linker_Switches;
for Default_Switches ("C++") use Common_C_Linker_Switches;
for Default_Switches ("Ada") use ("-pipe", "-g", "-lm");
for Default_Switches ("C++") use Common_C_Linker_Switches & ("-lstdc++");
for Default_Switches ("Ada") use ("-pipe", "-g", "-lm", "-lgnat");
end Linker;
package Clean is
......
......@@ -19,7 +19,7 @@ DATAVIEW_ACN :=
@@END_IF@@
DATAVIEW_AADLV1 := ${DATAVIEW_PATH}/dataview_aadlv1.aadl
DATAVIEW_AADLV2 := ${DATAVIEW_PATH}/dataview_aadlv2.aadl
TASTE_SHARED_TYPES?=${TOOL-INST}/share/SharedTypes
TASTE_SHARED_TYPES?=${TOOL_INST}/share/SharedTypes
# Project cache folder is used to speed up all ASN.1-related processing
export PROJECT_CACHE=${HOME}/.taste_AST_cache
......
......@@ -27,6 +27,7 @@ PUBLIC
WITH interfaceview::IV::HELLO_WORLD;
WITH interfaceview::IV::SdlFunction;
WITH interfaceview::IV::Function1;
WITH ocarina_processors_arm;
WITH deploymentview::DV::Node1;
WITH Taste;
......@@ -44,16 +45,20 @@ SUBCOMPONENTS
IV_SdlFunction : SYSTEM interfaceview::IV::SdlFunction::SdlFunction.others {
Taste::FunctionName => "SdlFunction";
};
IV_Function1 : SYSTEM interfaceview::IV::Function1::Function1.others {
Taste::FunctionName => "Function1";
};
rpi_partition : PROCESS deploymentview::DV::Node1::rpi_partition.others {
Taste::coordinates => "97518 93988 142671 127004";
Taste::coordinates => "90791 74134 135944 107150";
Deployment::Port_Number => 0;
};
rpi_posix : PROCESSOR ocarina_processors_arm::rpi.posix {
Taste::coordinates => "91874 84555 148315 131721";
Taste::coordinates => "85147 64701 141588 111867";
};
PROPERTIES
Taste::APLC_Binding => (reference (rpi_partition)) APPLIES TO IV_HELLO_WORLD;
Taste::APLC_Binding => (reference (rpi_partition)) APPLIES TO IV_SdlFunction;
Taste::APLC_Binding => (reference (rpi_partition)) APPLIES TO IV_Function1;
Actual_Processor_Binding => (reference (rpi_posix)) APPLIES TO rpi_partition;
END Node1.others;
......@@ -63,7 +68,7 @@ END deploymentview;
SYSTEM IMPLEMENTATION deploymentview.others
SUBCOMPONENTS
Node1 : SYSTEM Node1.others {
Taste::coordinates => "84819 71079 155370 138459";
Taste::coordinates => "78092 51225 148643 118605";
};
interfaceview : SYSTEM interfaceview::IV::interfaceview.others;
END deploymentview.others;
......@@ -72,6 +77,6 @@ PROPERTIES
Taste::coordinates => "0 0 297000 210000";
Taste::version => "2.4";
Taste::interfaceView => "InterfaceView.aadl";
Taste::HWLibraries => ("../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
Taste::HWLibraries => ("/home/taste/tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV;
......@@ -60,6 +60,8 @@ WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_doSomething
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_doSomething;
SUBPROGRAM IMPLEMENTATION PI_doSomething.others
......@@ -72,6 +74,8 @@ FEATURES
PI_doSomething : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::SdlFunction::PI_doSomething.others {
Taste::coordinates => "166726 84097";
Taste::RCMoperationKind => sporadic;
Taste::RCMperiod => 0 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "doSomething";
};
PROPERTIES
......@@ -84,11 +88,44 @@ END SdlFunction.others;
END interfaceview::IV::SdlFunction;
PACKAGE interfaceview::IV::Function1
PUBLIC
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_pulse
END PI_pulse;
SUBPROGRAM IMPLEMENTATION PI_pulse.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_pulse.others;
SYSTEM Function1
FEATURES
PI_pulse : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Function1::PI_pulse.others {
Taste::coordinates => "157569 49878";
Taste::RCMoperationKind => cyclic;
Taste::RCMperiod => 1000 ms;
Taste::InterfaceName => "pulse";
};
PROPERTIES
Source_Language => (CPP);
Taste::Active_Interfaces => any;
END Function1;
SYSTEM IMPLEMENTATION Function1.others
END Function1.others;
END interfaceview::IV::Function1;
PACKAGE interfaceview::IV
PUBLIC
WITH interfaceview::IV::HELLO_WORLD;
WITH interfaceview::IV::SdlFunction;
WITH interfaceview::IV::Function1;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
......@@ -106,6 +143,9 @@ SUBCOMPONENTS
SdlFunction : SYSTEM interfaceview::IV::SdlFunction::SdlFunction.others {
Taste::coordinates => "166726 79793 194177 106706";
};
Function1 : SYSTEM interfaceview::IV::Function1::Function1.others {
Taste::coordinates => "157569 40286 188960 64876";
};
CONNECTIONS
HELLO_WORLD_RI_doSomething_SdlFunction_PI_doSomething : SUBPROGRAM ACCESS SdlFunction.PI_doSomething -> HELLO_WORLD.RI_doSomething {
Taste::coordinates => "140435 82271 159232 82271 159232 84097 166726 84097";
......
// Body file for function Function1
// Generated by TASTE on 2021-04-26 12:27:34
// You can edit this file, it will not be overwritten
// Provided interfaces : pulse
// Required interfaces :
// User-defined properties for this function:
// |_ Taste::Active_Interfaces = any
// |_ Taste::coordinates = 157569 40286 188960 64876
// Timers :
#include "function1.h"
#include "function1_state.h"
#include <iostream>
// Define and use function state inside this context structure
// avoid defining global/static variable elsewhere
function1_state ctxt_function1;
void function1_startup(void)
{
// Write your initialisation code, but DO NOT CALL REQUIRED INTERFACES
std::cout << "[Function1] Startup" << std::endl;
}
void function1_PI_pulse(void)
{
// Write your code here
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment