1612 Commits

Author SHA1 Message Date
John Wellbelove
dcb1e75358 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/deque.h
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt
14.5.0
2018-12-16 22:19:31 +00:00
John Wellbelove
f2f23395cd Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt
2018-12-09 12:32:31 +00:00
John Wellbelove
bb9b07a837 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/private/pvoidvector.h
2018-12-09 12:15:42 +00:00
John Wellbelove
30520892e1 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt
2018-12-08 13:32:38 +00:00
TimoKroeger
6a808895a1 Fix CMake build by converting etl to a INTERFACE library (#104)
The 14.0 release removed all cpp files
2018-11-27 19:30:48 +00:00
John Wellbelove
60e55535e2 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
2018-11-25 16:20:52 +00:00
John Wellbelove
fe91a72b82 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
2018-11-17 09:34:28 +00:00
John Wellbelove
df86158adf Merge remote-tracking branch 'origin/development' 14.0.0 2018-11-11 20:09:24 +00:00
John Wellbelove
869219870f Merge remote-tracking branch 'origin/development' 2018-11-04 10:11:25 +00:00
John Wellbelove
3cb35ffd7c Trigger CI pipelines on gitlab 2018-11-04 10:10:50 +00:00
John Wellbelove
64c061e860 Merge remote-tracking branch 'origin/development' 2018-10-31 20:37:53 +00:00
John Wellbelove
6def4a10a0 Merge branch 'feature/clion_project' into development 2018-10-31 20:34:14 +00:00
John Wellbelove
8db807f4a1
Added copyright notice 2018-10-31 08:07:00 +00:00
John Wellbelove
fc09a70051 Merge remote-tracking branch 'origin/development' 2018-10-28 15:37:46 +00:00
John Wellbelove
8cdf601249 Removed unused code 2018-10-28 15:34:47 +00:00
John Wellbelove
7ceabcb571 Merge from GitLab CMake-CLion feature branch 2018-10-28 12:54:45 +00:00
John Wellbelove
4703b78fb9 Merge remote-tracking branch 'origin/development' 13.0.0 2018-10-07 08:40:00 +01:00
John Wellbelove
aee76d67e8 Merge remote-tracking branch 'origin/feature/bit_stream' into development
# Conflicts:
#	include/etl/profiles/armv6.h
#	include/etl/profiles/armv6_no_stl.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters
2018-10-07 08:37:14 +01:00
John Wellbelove
c26b94867f Merge remote-tracking branch 'origin/master' into development 2018-10-01 08:50:15 +01:00
Bartłomiej Burdukiewicz
c505e9a522 Removed repeated semicolon, this helps to compile etl without errors (#100)
with -pedantic/-pedantic-errors flags.
2018-09-29 20:23:45 +02:00
John Wellbelove
df842eacec Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
2018-09-22 13:37:25 +01:00
John Wellbelove
f0a3051a21 Updated release and version 2018-09-22 13:30:05 +01:00
John Wellbelove
06afe8a22a Merge remote-tracking branch 'origin/feature/random_pcg' into development 2018-09-22 13:27:02 +01:00
John Wellbelove
1c34d6f836 Ignore PCG output file 2018-09-22 13:26:19 +01:00
John Wellbelove
b3dcf0e881 Added permuted congruential random generator 2018-09-22 13:25:07 +01:00
John Wellbelove
8e83f95164 Merge remote-tracking branch 'origin/master' into development 2018-09-22 09:45:43 +01:00
Austin Morton
fb3d4d78fa Use diagnostic push and pop when suppressing GCC warnings to prevent suppressions from impacting code outside of ETL (#99) 2018-09-21 07:34:16 +01:00
Arek Sredzki
ece332630d Use deleter in etl::unique_ptr::reset(...) (#98) 2018-09-20 12:51:48 +01:00
John Wellbelove
65c0de9110 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
2018-09-18 18:39:35 +01:00
John Wellbelove
c596ae8f6a Made 'next state id' a member to support recursive events 2018-09-18 18:38:57 +01:00
John Wellbelove
93d23226f7 Merge remote-tracking branch 'origin/feature/light_weight_fsm' into development 2018-09-18 18:38:21 +01:00
John Wellbelove
984a56430a Made 'next state id' a member to support recursive events 2018-09-18 18:36:03 +01:00
John Wellbelove
b47c0a6c9b Merge remote-tracking branch 'origin/development' 2018-09-15 09:56:54 +01:00
John Wellbelove
6637757ad4 Merge remote-tracking branch 'origin/feature/light_weight_fsm' into development 2018-09-15 09:49:17 +01:00
John Wellbelove
0e6bad5c91 Modified the API of etl::state_chart constructors. 2018-09-15 09:48:52 +01:00
John Wellbelove
c6203a0d1e Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
2018-09-15 09:00:00 +01:00
John Wellbelove
02987191a5 Removed push(void) push_back(void) and push_front(void) function for containers. 2018-09-15 08:58:08 +01:00
John Wellbelove
c3dc3000b3 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters
2018-09-14 19:26:43 +01:00
John Wellbelove
218b1573f8 Added CRC16 MODBUS
Added ETL_ prefic to extern const arrays.
2018-09-14 19:25:32 +01:00
John Wellbelove
b72aee854e Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/state_chart.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/test_state_chart.cpp
2018-09-12 17:40:13 +01:00
John Wellbelove
eb406eafea Swapped event and current state parameters for state transition 2018-09-12 17:39:02 +01:00
John Wellbelove
0ec2a1f06f Merge remote-tracking branch 'origin/feature/light_weight_fsm' into development 2018-09-12 17:36:28 +01:00
John Wellbelove
2ab1d8d346 Swapped event and current state parameters for state transition 2018-09-12 17:35:59 +01:00
John Wellbelove
45ff002610 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/state_chart.h
#	test/test_state_chart.cpp
2018-09-11 23:03:26 +01:00
John Wellbelove
5522f2aa4e Merge remote-tracking branch 'origin/feature/light_weight_fsm' into development 2018-09-11 23:01:20 +01:00
John Wellbelove
37e86e7971 Process event loops until action or end of transition table 2018-09-11 23:00:25 +01:00
John Wellbelove
36a2c5b004 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/state_chart.h
#	test/test_state_chart.cpp
2018-09-10 20:46:39 +01:00
John Wellbelove
7175653c36 Merge remote-tracking branch 'origin/feature/light_weight_fsm' into development 2018-09-10 20:42:58 +01:00
John Wellbelove
9becaefdd8 Added start() and changed order of execution. 2018-09-10 20:42:32 +01:00
John Wellbelove
7eb0077a48 Merge remote-tracking branch 'origin/development'
# Conflicts:
#	include/etl/state_chart.h
2018-09-09 08:31:13 +01:00