Diffusion SoC_Rosa_repo 8fb940f69450

merging
8fb940f69450
Actions

Referenced Files

None

Subscribers

None

Description

merging

Details

Provenance

Maximilian Goetzinger	Authored on Jun 26 2019, 12:19 PM
goetzinger	Pushed on Jun 26 2019, 12:19 PM

Parents

R20:be908eb77687: some changes
R20:3af7a0ed9e2e: Change to uint32_t

Branches

Unknown

Tags

Unknown

Event Timeline

Maximilian Goetzinger <maxgot@utu.fi> committed R20:8fb940f69450: merging (authored by Maximilian Goetzinger <maxgot@utu.fi>).Jun 26 2019, 12:19 PM

Merged Changes

3af7a0ed9e2e Change to uint32_t
Author
• btutzer
Browse Repository
No Audits
e442e2283357 Make SignalStateCondition enum of type uint8_t
Author
• btutzer
Browse Repository
No Audits
a34134f03e87 Tuple type fix
Author
• btutzer
Browse Repository
No Audits
c3e10241c161 Merge branch 'master' of ssh://phabricator.ict.tuwien.ac.
Author
• btutzer
Browse Repository
No Audits
9c75b2d247fc Prepare for DeluxeTuples
Author
• btutzer
Browse Repository
No Audits
e4f912949f50 Merge branch 'master' into deluxe-tuplevalues
Author
Dávid Juhász
Browse Repository
No Audits
e88eaee714d5 Merge branch 'feature/state_detector' of ssh://phabricator.ict.tuwien.ac.
Author
• btutzer
Browse Repository
No Audits
1e8de28e3b14 More fields in configuration
Author
• btutzer
Browse Repository
No Audits
ea1079c9721f Preparing to switch to DeluxeTuples
Author
• btutzer
Browse Repository
No Audits
3cfc2c8f948f createAgent issue
Author
• btutzer
Browse Repository
No Audits
669c4457c4a5 Merge branch 'feature/state_detector' of ssh://phabricator.ict.tuwien.ac.
Author
• btutzer
Browse Repository
No Audits
ecb75cb6710f Fixed constructor of LinearFunction when creating from two x-y coordinates
Author
• btutzer
Browse Repository
No Audits
1ff038881e02 Cannot mix rtty and nortty code, therefore do not use cxxopts any more. TODO…
Author
• btutzer
Browse Repository
No Audits
7d3d25ce51c4 Fixed JSON configuration
Author
• btutzer
Browse Repository
No Audits
a5a59b6358ba Merge branch 'feature/linear_functions' of ssh://phabricator.ict.tuwien.ac.
Author
• btutzer
Browse Repository
No Audits
8f3121b00af1 Configuration helper
Author
• btutzer
Browse Repository
No Audits
bddd6046ba89 StepFunction can now step up or down
Author
• btutzer
Browse Repository
No Audits
fde670cc01bd Remove redundant semicolon
Author
Dávid Juhász
Browse Repository
No Audits
04dbc622e75c Suppress unexpected unused lambda capture warning
Author
Dávid Juhász
Browse Repository
No Audits
122fcdd45fb9 Make constexpr conditional explicit in DeluxeSensor…
Author
Dávid Juhász
Browse Repository
No Audits
06e9cd4317c1 Replace std::is_same_v with std::is_same
Author
Dávid Juhász
Browse Repository
No Audits
2fa0aa9b6730 Merge branch 'deluxe-bidirectionalconnections' into deluxe-tuplevalues
Author
Dávid Juhász
Browse Repository
No Audits
ddc017ef3a25 Merge branch 'master' into deluxe-bidirectionalconnections
Author
Dávid Juhász
Browse Repository
No Audits
a37df9760aa6 Fix dumping of DeluxeTuple with element of std::string
Author
Dávid Juhász
Browse Repository
No Audits
67d936624bf6 Complete documentation DeluxeAgent::prepareInputValueAtPos()
Author
Dávid Juhász
Browse Repository
No Audits
9d6c880f8309 Improve tracability of the deluxe interface
Author
Dávid Juhász
Browse Repository
No Audits
4d1769830f25 Extend example deluxe-interface with DeluxeTuples
Author
Dávid Juhász
Browse Repository
Audited
fb3a26551f89 Implement tuple values in the deluxe interface
Author
Dávid Juhász
Browse Repository
Audited
9ee73cb502ee Move to_string() and operator<<() to namespace std
Author
Dávid Juhász
Browse Repository
No Audits
9f7153ff54cd Add some support features
Author
Dávid Juhász
Browse Repository
No Audits
8d6ba04dffe9 Fix and improve TokenizedStorage
Author
Dávid Juhász
Browse Repository
No Audits
5a8b3325d513 Define rosa::token_size_t for representing length of rosa::Token instances
Author
Dávid Juhász
Browse Repository
No Audits
698eeccfda7c Allow empty TokenizedStorage and fix typed value access in TokenizedStorage
Author
Dávid Juhász
Browse Repository
No Audits
ee76d676b758 Extend the example deluxe-interface to do some master-to-slave communication…
Author
Dávid Juhász
Browse Repository
Audited
7e18d0b1275d Fix DeluxeContext::registerSensorValue() for bool
Author
Dávid Juhász
Browse Repository
No Audits
73b56688312f Fix TypeToken for bool to match TypeNumber
Author
Dávid Juhász
Browse Repository
No Audits
8ba1d057f4c4 Implement master-to-slave communication in the deluxe interface Ref T138
Author
Dávid Juhász
Browse Repository
Audited
7b75ee2e2d00 Fix implementation of TypeListDrop and definition of type_nr_t
Author
Dávid Juhász
Browse Repository
No Audits

Changes (39)

Path

Size

apps/

ccam/

sa-ews1/

examples/

deluxe-interface/

deluxe-interface.cpp

messaging/

messaging.cpp

type-facilities/

type-facilities.cpp

include/

rosa/

agent/

FunctionAbstractions.hpp

SignalState.hpp

SignalStateDetector.hpp

SystemStateDetector.hpp

core/

deluxe/

support/

tokenized_storages.hpp

lib/

core/

deluxe/

	deluxe/
	support/

	DeluxeTuple.cpp
	debug.cpp

support/

atom.cpp

tokenized_storages.cpp

type_token.cpp

R20:8fb940f69450

View Options

apps/ccam/CMakeLists.txt

View Options

apps/ccam/ccam.cpp

View Options

apps/ccam/configuration.h

View Options

apps/ccam/json.hpp

View Options

apps/sa-ews1/sa-ews1.cpp

View Options

examples/deluxe-interface/deluxe-interface.cpp

View Options

examples/messaging/messaging.cpp

View Options

examples/type-facilities/type-facilities.cpp

View Options

include/rosa/agent/FunctionAbstractions.hpp

View Options

include/rosa/agent/SignalState.hpp

View Options

include/rosa/agent/SignalStateDetector.hpp

View Options

include/rosa/agent/SystemStateDetector.hpp

View Options

include/rosa/core/Invoker.hpp

View Options

include/rosa/core/Message.hpp

View Options

include/rosa/core/MessageMatcher.hpp

View Options

include/rosa/core/Unit.h

View Options

include/rosa/deluxe/DeluxeAgent.hpp

View Options

include/rosa/deluxe/DeluxeAtoms.hpp

View Options

include/rosa/deluxe/DeluxeContext.hpp

View Options

include/rosa/deluxe/DeluxeSensor.hpp

View Options

include/rosa/deluxe/DeluxeSystem.hpp

View Options

include/rosa/deluxe/DeluxeTuple.hpp

View Options

include/rosa/support/atom.hpp

View Options

include/rosa/support/sequence.hpp

View Options

include/rosa/support/squashed_int.hpp

View Options

include/rosa/support/tokenized_storages.hpp

View Options

include/rosa/support/type_list.hpp

View Options

include/rosa/support/type_numbers.hpp

View Options

include/rosa/support/type_token.hpp

View Options

include/rosa/support/types.hpp

View Options

lib/core/Unit.cpp

View Options

lib/deluxe/CMakeLists.txt

View Options

lib/deluxe/DeluxeAgent.cpp

View Options

lib/deluxe/DeluxeContext.cpp

View Options

lib/deluxe/DeluxeSensor.cpp

View Options

lib/deluxe/DeluxeTuple.cpp

View Options

lib/support/atom.cpp

View Options

lib/support/tokenized_storages.cpp

View Options

lib/support/type_token.cpp

merging8fb940f69450Actions

Description

Details

Event Timeline

Merged Changes

Changes (39)

R20:8fb940f69450

apps/ccam/CMakeLists.txt

apps/ccam/ccam.cpp

apps/ccam/configuration.h

apps/ccam/json.hpp

apps/sa-ews1/sa-ews1.cpp

examples/deluxe-interface/deluxe-interface.cpp

examples/messaging/messaging.cpp

examples/type-facilities/type-facilities.cpp

include/rosa/agent/FunctionAbstractions.hpp

include/rosa/agent/SignalState.hpp

include/rosa/agent/SignalStateDetector.hpp

include/rosa/agent/SystemStateDetector.hpp

include/rosa/core/Invoker.hpp

include/rosa/core/Message.hpp

include/rosa/core/MessageMatcher.hpp

include/rosa/core/Unit.h

include/rosa/deluxe/DeluxeAgent.hpp

include/rosa/deluxe/DeluxeAtoms.hpp

include/rosa/deluxe/DeluxeContext.hpp

include/rosa/deluxe/DeluxeSensor.hpp

include/rosa/deluxe/DeluxeSystem.hpp

include/rosa/deluxe/DeluxeTuple.hpp

include/rosa/support/atom.hpp

include/rosa/support/sequence.hpp

include/rosa/support/squashed_int.hpp

include/rosa/support/tokenized_storages.hpp

include/rosa/support/type_list.hpp

include/rosa/support/type_numbers.hpp

include/rosa/support/type_token.hpp

include/rosa/support/types.hpp

lib/core/Unit.cpp

lib/deluxe/CMakeLists.txt

lib/deluxe/DeluxeAgent.cpp

lib/deluxe/DeluxeContext.cpp

lib/deluxe/DeluxeSensor.cpp

lib/deluxe/DeluxeTuple.cpp

lib/support/atom.cpp

lib/support/tokenized_storages.cpp

lib/support/type_token.cpp

merging
8fb940f69450
Actions