Commit 188388b1 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Merge branch 'feature_bullseye' into 'feature_buster'

Remove non-ASCII characters from Board1.xml

See merge request !133
parents 70736b62 91cb5892
Pipeline #8224 passed with stage
in 15 minutes and 22 seconds
Subproject commit a983940c714081a4f9add68535bb800bcc9b01c9
Subproject commit 190b67a61f28157bf1933a30dd055a79656c2e53
Subproject commit d540bba7842180eb3d49cc26ca89cd23840d2d5d
Subproject commit 1d6d496ea0725a9e77d62f4f8aee955128da3a1d
......@@ -6,8 +6,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
mkdir -p "${PREFIX}/share/asn1scc/" || exit 1
cd "${PREFIX}/share/" || exit 1
VER=$(~/tool-inst/share/asn1scc/asn1scc -v | head -1 | awk '{print $NF}')
if [ "${VER}" != "4.2.4.8f" ] ; then
wget --no-check-certificate -q -O - https://github.com/ttsiodras/asn1scc/releases/download/4.2.4.8f/asn1scc-bin-4.2.4.8f.tar.bz2 \
if [ "${VER}" != "4.2.5.0f" ] ; then
wget --no-check-certificate -q -O - https://github.com/ttsiodras/asn1scc/releases/download/4.2.5.0f/asn1scc-bin-4.2.5.0f.tar.bz2 \
| tar jxvf -
fi
# Delete the AST cache folder in case the new version of the compiler generates different XML/Python output
......
......@@ -71,10 +71,10 @@ run:
edit_cv:
\$(MAKE) -C work run_cv
# Simulation target (experimental)
simu: InterfaceView.aadl DeploymentView.aadl DataView.aadl
\$(KAZOO) -t SIMU --glue --gw
# Simulation target (experimental - for systems made of SDL functions only)
simu: work/glue_simu
\$(MAKE) -C work
\$(MAKE) -C work/simulation -f Makefile.Simulation simu
skeletons:
\$(MAKE) work/skeletons_built
......@@ -84,6 +84,11 @@ work/skeletons_built: InterfaceView.aadl DataView.aadl
\$(MAKE) -C work dataview
touch \$@
work/glue_simu: InterfaceView.aadl DataView.aadl
\$(KAZOO) -t SIMU --glue --gw
\$(MAKE) -C work dataview
touch \$@
work/glue_release: InterfaceView.aadl DeploymentView.aadl DataView.aadl
sed -i 's/CoverageEnabled => true/CoverageEnabled => false/g' DeploymentView.aadl || :
\$(KAZOO) -p --glue --gw -o work
......@@ -124,7 +129,7 @@ DataView.aadl: \${ASN1_FILES}
taste-update-data-view \$^
clean:
rm -rf work/build work/dataview/built
rm -rf work/build work/dataview/built work/glue_simu
rm -f *.aadl # Interface and Deployment views in AADL are generated
rm -f work/glue_release work/glue_debug work/glue_coverage work/skeletons_built
find work -type d -name \"wrappers\" -exec rm -rf {} +
......
......@@ -77,7 +77,7 @@ then
cat > initdb.py <<OEF
from sqlalchemy import create_engine
from ${DBNAME}_model import Base
from db_model import Base
from dmt import diagram
engine = create_engine('${ENGINE}', echo=False)
Base.metadata.create_all(engine)
......@@ -97,7 +97,7 @@ else
cat > initdb.py <<OEF
from sqlalchemy import create_engine
from ${DBNAME}_model import Base
from db_model import Base
from dmt import diagram
engine = create_engine('${ENGINE}', echo=False)
Base.metadata.create_all(engine)
......
......@@ -254,14 +254,14 @@ def initialize():
global LOG
LOG = standalone_editor.logger
usage = 'usage: taste-simulator -a file.asn -t type [-d default value]'
version = 'ASN.1 Value Editor version ' + __version__
usage = 'usage: taste-simulator [-g] [--reset]'
version = 'TASTE Interactive Simulator version ' + __version__
LOG.info('TASTE Simulator')
LOG.info(version)
# Parse the command line
parser = optparse.OptionParser(usage=usage, version=version)
parser.add_option('-v', '--verbose',
parser.add_option('-g', '--debug',
action='store_true',
default=False,
help='Display debug information')
......@@ -272,7 +272,7 @@ def initialize():
help='Do not try to restore windows layout')
options, args = parser.parse_args()
if options.verbose:
if options.debug:
LOG.setLevel(logging.DEBUG)
else:
LOG.setLevel(logging.INFO)
......@@ -701,7 +701,7 @@ def initialize():
pass
number_of_periods=len(periodics) # to be continued
print(simulator.periodics)
#print(simulator.periodics)
# Update the behavior of the OK/Cancel buttons in both editors
send_event_button = Observable_Event["okButton"]
......
<Boards>
<Board name="x86 (Linux/C++)" type="ocarina_processors_x86::x86.generic_linux" namespace="ocarina_processors_x86">
<Board name="x86 Linux CPP" type="ocarina_processors_x86::x86.generic_linux" namespace="ocarina_processors_x86">
<Port name="eth0" namespace="ocarina_drivers" bus_namespace="ocarina_buses" extends="ocarina_drivers::ip_socket" impl_extends="ocarina_drivers::ip_socket.linux" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-socket-ip-driver.asn" asn1module="LINUX-SOCKET-IP-DRIVER" asn1type="Socket-IP-Conf-T" requiresBusAccess="ocarina_buses::ip.generic"/>
<Port name="uart0" namespace="ocarina_drivers" bus_namespace="ocarina_buses" extends="ocarina_drivers::serial_ccsds" impl_extends="ocarina_drivers::serial_ccsds.linux" asn1file="/home/taste/tool-inst/include/TASTE-Linux-Drivers/configurations/linux-serial-ccsds-driver.asn" asn1module="LINUX-SERIAL-CCSDS-DRIVER" asn1type="Serial-CCSDS-Linux-Conf-T" requiresBusAccess="ocarina_buses::serial.ccsds"/>
</Board>
<Board name="SAM V71 (FreeRTOS/N7S)" type="ocarina_processors_arm::samv71.freertos" namespace="ocarina_processors_arm">
<Board name="SAM V71 FreeRTOS N7S" type="ocarina_processors_arm::samv71.freertos" namespace="ocarina_processors_arm">
<Port name="uart0" namespace="ocarina_drivers" bus_namespace="ocarina_buses" extends="ocarina_drivers::serial_ccsds" impl_extends="ocarina_drivers::serial_ccsds.samv71" asn1file="/home/taste/tool-inst/include/TASTE-SAMV71-Drivers/configurations/samv71-serial-ccsds-driver.asn" asn1module="SAMV71-SERIAL-CCSDS-DRIVER" asn1type="Serial-CCSDS-SamV71-Conf-T" requiresBusAccess="ocarina_buses::serial.ccsds"/>
</Board>
<Board name="x86 (Linux/POHIC)" type="ocarina_processors_x86::x86.linux" namespace="ocarina_processors_x86">
<Board name="x86 Linux POHIC" type="ocarina_processors_x86::x86.linux" namespace="ocarina_processors_x86">
<Port name="ethernet1" namespace="ocarina_drivers" bus_namespace="ocarina_buses" extends="ocarina_drivers::generic_sockets_ip" impl_extends="ocarina_drivers::generic_sockets_ip.pohic" asn1file="/home/taste/tool-inst/include/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn" asn1module="POHICDRIVER-IP" asn1type="IP-Conf-T" requiresBusAccess="ocarina_buses::ip.i"/>
<Port name="ethernet2" namespace="ocarina_drivers" bus_namespace="ocarina_buses" extends="ocarina_drivers::generic_sockets_ip" impl_extends="ocarina_drivers::generic_sockets_ip.pohic" asn1file="/home/taste/tool-inst/include/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn" asn1module="POHICDRIVER-IP" asn1type="IP-Conf-T" requiresBusAccess="ocarina_buses::ip.i"/>
<Port name="ethernet3" namespace="ocarina_drivers" bus_namespace="ocarina_buses" extends="ocarina_drivers::generic_sockets_ip" impl_extends="ocarina_drivers::generic_sockets_ip.pohic" asn1file="/home/taste/tool-inst/include/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn" asn1module="POHICDRIVER-IP" asn1type="IP-Conf-T" requiresBusAccess="ocarina_buses::ip.i"/>
</Board>
<Board name="GR740 (RTEMS/POHIC)" type="ocarina_processors_leon::leon3.rtems51_posix" namespace="ocarina_processors_leon">
<Board name="GR740 RTEMS POHIC" type="ocarina_processors_leon::leon3.rtems51_posix" namespace="ocarina_processors_leon">
</Board>
<Board name="Raspberry PI (Linux/POHIC)" type="ocarina_processors_arm::rpi.posix" namespace="ocarina_processors_arm">
<Board name="Raspberry PI Linux POHIC" type="ocarina_processors_arm::rpi.posix" namespace="ocarina_processors_arm">
</Board>
<Board name="ZynQ ZC706 (RTEMS/POHIC)" type="ocarina_processors_arm::zynqzc706.rtems_posix" namespace="ocarina_processors_arm">
<Board name="ZynQ ZC706 RTEMS POHIC" type="ocarina_processors_arm::zynqzc706.rtems_posix" namespace="ocarina_processors_arm">
</Board>
<Board name="Linux ARM Runtime" type="ocarina_processors_arm::aarch64.linux" namespace="ocarina_processors_aarch64">
<Port name="eth0" namespace="ocarina_drivers" bus_namespace="ocarina_buses" extends="ocarina_drivers::generic_sockets_ip" impl_extends="ocarina_drivers::generic_sockets_ip.pohic" asn1file="/home/taste/tool-inst/include/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn" asn1module="POHICDRIVER-IP" asn1type="IP-Conf-T" requiresBusAccess="ocarina_buses::ip.i"/>
......
......@@ -128,21 +128,26 @@ FEATURES
{% endfor %}
PROPERTIES
{% for attr in func.attributes %}
{% if attr.name == "language" or attr.name == "type_language" %}
{% if attr.name == "language" %}
Source_Language => ({{ attr.value }});
{% elif attr.name == "is_type" %}
TASTE::Is_Component_Type => {% if attr.value == "YES" %}true{% else %}false{% endif %};
{% elif attr.name == "is_type" and attr.value == "YES" %}
TASTE::Is_Component_Type => true;
{% for attr2 in func.attributes %}
{% if attr2.name == "type_language" %}
Source_Language => ({{ attr2.value }});
{% endif %}
{% endfor %}
{% elif attr.name == "instance_of" and attr.value != "" %}
TASTE_IV_Properties::is_instance_of => "{{ attr.value }}";
{% elif attr.name == "FPGA_Configurations" and attr.value != "" %}
TASTE_IV_Properties::FPGA_Configurations => "{{ attr.value }}";
{% else %}
-- unsupported property found: name: "{{ attr.name }}" value: "{{ attr.value }}"
-- ignored property: {{ attr.name }} = {{ attr.value }}
{% endif %}
{% endfor %}
{% for prop in func.properties %}
{% if prop.name != "Taste::coordinates" and prop.name != "Taste::InnerCoordinates" and prop.name != "Taste::RootCoordinates" %}
{{ prop.name }} => {{prop.value}};
{{ prop.name }} => {{ prop.value }};
{% endif %}
{% endfor %}
END {{ func.name }};
......
Subproject commit e5832b00912accae3e1663f794861df1aa8735f0
Subproject commit 24b336b558ed466247c7ccdc2b02466710a641f7
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