Merge remote-tracking branch 'origin/development'

# Conflicts: # CMakeLists.txt
ETLCPP · Mar 18, 2018 · d7f9d1a · d7f9d1a
1 parent 4277657
commit d7f9d1a
Show file tree

Hide file tree

Showing 165 changed files with 757 additions and 531 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,11 +28,11 @@ add_library(etl
   )
 target_include_directories(etl
   PUBLIC
-  src/
-  src/atomic
-  src/profiles
+  include/etl/
+  include/etl/atomic
+  include/etl/profiles
   PRIVATE
-  src/private
+  include/etl/private
   )
 
 if (${ETL_PROFILE} STREQUAL DEFAULT)

diff --git a/src/.vscode/settings.json → include/etl/.vscode/settings.json b/src/.vscode/settings.json → include/etl/.vscode/settings.json
diff --git a/src/algorithm.h → include/etl/algorithm.h b/src/algorithm.h → include/etl/algorithm.h
diff --git a/src/alignment.h → include/etl/alignment.h b/src/alignment.h → include/etl/alignment.h
diff --git a/src/array.h → include/etl/array.h b/src/array.h → include/etl/array.h
diff --git a/src/array_view.h → include/etl/array_view.h b/src/array_view.h → include/etl/array_view.h
diff --git a/src/array_wrapper.h → include/etl/array_wrapper.h b/src/array_wrapper.h → include/etl/array_wrapper.h
diff --git a/src/atomic.h → include/etl/atomic.h b/src/atomic.h → include/etl/atomic.h
diff --git a/src/atomic/atomic_arm.h → include/etl/atomic/atomic_arm.h b/src/atomic/atomic_arm.h → include/etl/atomic/atomic_arm.h
diff --git a/src/atomic/atomic_gcc.h → include/etl/atomic/atomic_gcc.h b/src/atomic/atomic_gcc.h → include/etl/atomic/atomic_gcc.h
diff --git a/src/atomic/atomic_windows.h → include/etl/atomic/atomic_windows.h b/src/atomic/atomic_windows.h → include/etl/atomic/atomic_windows.h
diff --git a/src/basic_string.h → include/etl/basic_string.h b/src/basic_string.h → include/etl/basic_string.h
diff --git a/src/binary.h → include/etl/binary.h b/src/binary.h → include/etl/binary.h
diff --git a/src/bitset.h → include/etl/bitset.h b/src/bitset.h → include/etl/bitset.h
diff --git a/src/bloom_filter.h → include/etl/bloom_filter.h b/src/bloom_filter.h → include/etl/bloom_filter.h
diff --git a/src/c/ecl_timer.h → include/etl/c/ecl_timer.h b/src/c/ecl_timer.h → include/etl/c/ecl_timer.h
diff --git a/src/callback.h → include/etl/callback.h b/src/callback.h → include/etl/callback.h
diff --git a/src/callback_timer.h → include/etl/callback_timer.h b/src/callback_timer.h → include/etl/callback_timer.h
@@ -40,7 +40,7 @@ SOFTWARE.
 #include "atomic.h"
 
 #undef ETL_FILE
-#define ETL_FILE "42"
+#define ETL_FILE "43"
 
 #if !defined(ETL_CALLBACK_TIMER_USE_ATOMIC_LOCK) && !defined(ETL_CALLBACK_TIMER_USE_INTERRUPT_LOCK)
   #error ETL_CALLBACK_TIMER_USE_ATOMIC_LOCK or ETL_CALLBACK_TIMER_USE_INTERRUPT_LOCK not defined

diff --git a/src/char_traits.h → include/etl/char_traits.h b/src/char_traits.h → include/etl/char_traits.h
diff --git a/src/checksum.h → include/etl/checksum.h b/src/checksum.h → include/etl/checksum.h
diff --git a/src/compare.h → include/etl/compare.h b/src/compare.h → include/etl/compare.h
diff --git a/src/constant.h → include/etl/constant.h b/src/constant.h → include/etl/constant.h
diff --git a/src/container.h → include/etl/container.h b/src/container.h → include/etl/container.h
diff --git a/src/crc16.h → include/etl/crc16.h b/src/crc16.h → include/etl/crc16.h
diff --git a/src/crc16_ccitt.h → include/etl/crc16_ccitt.h b/src/crc16_ccitt.h → include/etl/crc16_ccitt.h
diff --git a/src/crc16_kermit.h → include/etl/crc16_kermit.h b/src/crc16_kermit.h → include/etl/crc16_kermit.h
diff --git a/src/crc32.h → include/etl/crc32.h b/src/crc32.h → include/etl/crc32.h
diff --git a/src/crc64_ecma.h → include/etl/crc64_ecma.h b/src/crc64_ecma.h → include/etl/crc64_ecma.h
diff --git a/src/crc8_ccitt.h → include/etl/crc8_ccitt.h b/src/crc8_ccitt.h → include/etl/crc8_ccitt.h
diff --git a/src/cstring.h → include/etl/cstring.h b/src/cstring.h → include/etl/cstring.h
diff --git a/src/cyclic_value.h → include/etl/cyclic_value.h b/src/cyclic_value.h → include/etl/cyclic_value.h
diff --git a/src/debounce.h → include/etl/debounce.h b/src/debounce.h → include/etl/debounce.h
diff --git a/src/debug_count.h → include/etl/debug_count.h b/src/debug_count.h → include/etl/debug_count.h
diff --git a/src/deque.h → include/etl/deque.h b/src/deque.h → include/etl/deque.h
diff --git a/src/doxygen.h → include/etl/doxygen.h b/src/doxygen.h → include/etl/doxygen.h
diff --git a/src/endianness.h → include/etl/endianness.h b/src/endianness.h → include/etl/endianness.h
diff --git a/src/enum_type.h → include/etl/enum_type.h b/src/enum_type.h → include/etl/enum_type.h
diff --git a/src/error_handler.h → include/etl/error_handler.h b/src/error_handler.h → include/etl/error_handler.h
diff --git a/src/exception.h → include/etl/exception.h b/src/exception.h → include/etl/exception.h
diff --git a/include/etl/experimental/atomic.h b/include/etl/experimental/atomic.h
@@ -0,0 +1,56 @@
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2017 jwellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#ifndef __ETL_ATOMIC__
+#define __ETL_ATOMIC__
+
+#include "platform.h"
+
+#if ETL_ATOMIC_SUPPORTED == 1
+  #include <atomic>
+
+  namespace etl
+  {
+    typedef std::atomic<uint32_t> atomic_uint32_t;
+  }
+  #define ETL_CPP11_ATOMIC_AVAILABLE 1
+#elif defined(ETL_COMPILER_ARM)
+  #include "atomic/atomic_arm.h"
+  #define ETL_ETL_ATOMIC_AVAILABLE 1
+#elif defined(ETL_COMPILER_GCC)
+  #include "atomic/atomic_gcc.h"
+  #define ETL_ATOMIC_AVAILABLE 1
+#elif defined(ETL_COMPILER_MSVC)
+  #include "atomic/atomic_windows.h"
+  #define ETL_ATOMIC_AVAILABLE 1
+#else
+  #warning NO ATOMIC SUPPORT DEFINED!
+  #define ETL_ATOMIC_AVAILABLE 0
+#endif
+
+#endif
diff --git a/include/etl/experimental/spsc_queue.h b/include/etl/experimental/spsc_queue.h
@@ -0,0 +1,57 @@
+
+#include "platform.h"
+
+#include "atomic.h"
+
+struct spsc_queue_implementation
+{
+    enum
+    {
+        UNKNOWN,
+        STD_ATOMIC,
+        ETL_ATOMIC,
+        CMSIS_RTOS2,
+        FREERTOS,
+        GCC,
+        WIN32
+    };
+};
+
+template <typename T, const size_t IMPLEMENTATION = spsc_queue_implementation::UNKNOWN>
+class ispsc_queue;
+
+template <typename T, const size_t SIZE, const size_t IMPLEMENTATION = spsc_queue_implementation::UNKNOWN>
+class spsc_queue : public ispsc_queue;
+
+#if ETL_ATOMIC_AVAILABLE
+template <typename T>
+class ispsc_queue<T, spsc_queue_implementation::STD_ATOMIC>
+{
+
+};
+
+template <typename T, const size_t SIZE>
+class spsc_queue<T, SIZE, spsc_queue_implementation::STD_ATOMIC>
+  : public ispsc_queue<T, spsc_queue_implementation::STD_ATOMIC>
+{
+
+};
+#endif
+
+#if ETL_OPERATING_SYSTEM == ETL_CMSIS_RTOS2
+template <typename T, const size_t SIZE>
+class spsc_queue<T, SIZE, spsc_queue_implementation::CMSIS_RTOS2>
+  : public ispsc_queue<T, spsc_queue_implementation::CMSIS_RTOS2>
+{
+
+};
+#endif
+
+#if ETL_OPERATING_SYSTEM == ETL_FREERTOS
+template <typename T, const size_t SIZE>
+class spsc_queue<T, SIZE, spsc_queue_implementation::FREERTOS> 
+  : public ispsc_queue<T, spsc_queue_implementation::FREERTOS>
+{
+
+};
+#endif
diff --git a/src/factorial.h → include/etl/factorial.h b/src/factorial.h → include/etl/factorial.h
diff --git a/src/factory.h → include/etl/factory.h b/src/factory.h → include/etl/factory.h
diff --git a/src/fibonacci.h → include/etl/fibonacci.h b/src/fibonacci.h → include/etl/fibonacci.h
diff --git a/src/file_error_numbers.txt → include/etl/file_error_numbers.txt b/src/file_error_numbers.txt → include/etl/file_error_numbers.txt
@@ -39,3 +39,7 @@
 39 message_bus
 40 factory / variant_pool
 41 array_view
+42 string_view
+43 callback_timer
+44 message_timer
+45 type_lookup
diff --git a/src/fixed_iterator.h → include/etl/fixed_iterator.h b/src/fixed_iterator.h → include/etl/fixed_iterator.h
diff --git a/src/flat_map.h → include/etl/flat_map.h b/src/flat_map.h → include/etl/flat_map.h
diff --git a/src/flat_multimap.h → include/etl/flat_multimap.h b/src/flat_multimap.h → include/etl/flat_multimap.h
diff --git a/src/flat_multiset.h → include/etl/flat_multiset.h b/src/flat_multiset.h → include/etl/flat_multiset.h
diff --git a/src/flat_set.h → include/etl/flat_set.h b/src/flat_set.h → include/etl/flat_set.h
diff --git a/src/fnv_1.h → include/etl/fnv_1.h b/src/fnv_1.h → include/etl/fnv_1.h
diff --git a/src/forward_list.h → include/etl/forward_list.h b/src/forward_list.h → include/etl/forward_list.h
diff --git a/src/frame_check_sequence.h → include/etl/frame_check_sequence.h b/src/frame_check_sequence.h → include/etl/frame_check_sequence.h
diff --git a/src/fsm.h → include/etl/fsm.h b/src/fsm.h → include/etl/fsm.h
diff --git a/src/fsm_generator.h → include/etl/fsm_generator.h b/src/fsm_generator.h → include/etl/fsm_generator.h
diff --git a/src/function.h → include/etl/function.h b/src/function.h → include/etl/function.h
diff --git a/src/functional.h → include/etl/functional.h b/src/functional.h → include/etl/functional.h
diff --git a/src/generate.bat → include/etl/generate.bat b/src/generate.bat → include/etl/generate.bat
diff --git a/src/generate_fsm.bat → include/etl/generate_fsm.bat b/src/generate_fsm.bat → include/etl/generate_fsm.bat
diff --git a/src/generate_largest.bat → include/etl/generate_largest.bat b/src/generate_largest.bat → include/etl/generate_largest.bat
diff --git a/src/generate_message_router.bat → include/etl/generate_message_router.bat b/src/generate_message_router.bat → include/etl/generate_message_router.bat
diff --git a/src/generate_smallest.bat → include/etl/generate_smallest.bat b/src/generate_smallest.bat → include/etl/generate_smallest.bat
diff --git a/src/generate_type_lookup.bat → include/etl/generate_type_lookup.bat b/src/generate_type_lookup.bat → include/etl/generate_type_lookup.bat
diff --git a/src/generate_type_traits.bat → include/etl/generate_type_traits.bat b/src/generate_type_traits.bat → include/etl/generate_type_traits.bat
diff --git a/src/generate_variant_pool.bat → include/etl/generate_variant_pool.bat b/src/generate_variant_pool.bat → include/etl/generate_variant_pool.bat
diff --git a/src/hash.h → include/etl/hash.h b/src/hash.h → include/etl/hash.h
diff --git a/src/icache.h → include/etl/icache.h b/src/icache.h → include/etl/icache.h
diff --git a/src/ihash.h → include/etl/ihash.h b/src/ihash.h → include/etl/ihash.h
diff --git a/src/instance_count.h → include/etl/instance_count.h b/src/instance_count.h → include/etl/instance_count.h
diff --git a/src/integral_limits.h → include/etl/integral_limits.h b/src/integral_limits.h → include/etl/integral_limits.h
diff --git a/src/intrusive_forward_list.h → include/etl/intrusive_forward_list.h b/src/intrusive_forward_list.h → include/etl/intrusive_forward_list.h
diff --git a/src/intrusive_links.h → include/etl/intrusive_links.h b/src/intrusive_links.h → include/etl/intrusive_links.h
diff --git a/src/intrusive_list.h → include/etl/intrusive_list.h b/src/intrusive_list.h → include/etl/intrusive_list.h
diff --git a/src/intrusive_queue.h → include/etl/intrusive_queue.h b/src/intrusive_queue.h → include/etl/intrusive_queue.h
diff --git a/src/intrusive_stack.h → include/etl/intrusive_stack.h b/src/intrusive_stack.h → include/etl/intrusive_stack.h
diff --git a/src/io_port.h → include/etl/io_port.h b/src/io_port.h → include/etl/io_port.h
diff --git a/src/iterator.h → include/etl/iterator.h b/src/iterator.h → include/etl/iterator.h
diff --git a/src/jenkins.h → include/etl/jenkins.h b/src/jenkins.h → include/etl/jenkins.h
diff --git a/src/largest.h → include/etl/largest.h b/src/largest.h → include/etl/largest.h
diff --git a/src/largest_generator.h → include/etl/largest_generator.h b/src/largest_generator.h → include/etl/largest_generator.h
diff --git a/src/list.h → include/etl/list.h b/src/list.h → include/etl/list.h
diff --git a/src/log.h → include/etl/log.h b/src/log.h → include/etl/log.h
diff --git a/src/map.h → include/etl/map.h b/src/map.h → include/etl/map.h
diff --git a/src/memory.h → include/etl/memory.h b/src/memory.h → include/etl/memory.h
diff --git a/src/message.h → include/etl/message.h b/src/message.h → include/etl/message.h
diff --git a/src/message_bus.h → include/etl/message_bus.h b/src/message_bus.h → include/etl/message_bus.h
diff --git a/src/message_router.h → include/etl/message_router.h b/src/message_router.h → include/etl/message_router.h
diff --git a/src/message_router_generator.h → include/etl/message_router_generator.h b/src/message_router_generator.h → include/etl/message_router_generator.h
diff --git a/src/message_timer.h → include/etl/message_timer.h b/src/message_timer.h → include/etl/message_timer.h
@@ -43,7 +43,7 @@ SOFTWARE.
 #include "atomic.h"
 
 #undef ETL_FILE
-#define ETL_FILE "41"
+#define ETL_FILE "44"
 
 #if !defined(ETL_MESSAGE_TIMER_USE_ATOMIC_LOCK) && !defined(ETL_MESSAGE_TIMER_USE_INTERRUPT_LOCK)
   #error ETL_MESSAGE_TIMER_USE_ATOMIC_LOCK or ETL_MESSAGE_TIMER_USE_INTERRUPT_LOCK not defined

diff --git a/src/message_types.h → include/etl/message_types.h b/src/message_types.h → include/etl/message_types.h
diff --git a/src/multimap.h → include/etl/multimap.h b/src/multimap.h → include/etl/multimap.h
diff --git a/src/multiset.h → include/etl/multiset.h b/src/multiset.h → include/etl/multiset.h
diff --git a/src/murmur3.h → include/etl/murmur3.h b/src/murmur3.h → include/etl/murmur3.h
diff --git a/src/nullptr.h → include/etl/nullptr.h b/src/nullptr.h → include/etl/nullptr.h
diff --git a/src/numeric.h → include/etl/numeric.h b/src/numeric.h → include/etl/numeric.h
diff --git a/src/observer.h → include/etl/observer.h b/src/observer.h → include/etl/observer.h
diff --git a/src/optional.h → include/etl/optional.h b/src/optional.h → include/etl/optional.h
diff --git a/src/packet.h → include/etl/packet.h b/src/packet.h → include/etl/packet.h
diff --git a/src/parameter_type.h → include/etl/parameter_type.h b/src/parameter_type.h → include/etl/parameter_type.h
diff --git a/src/pearson.h → include/etl/pearson.h b/src/pearson.h → include/etl/pearson.h
diff --git a/src/platform.h → include/etl/platform.h b/src/platform.h → include/etl/platform.h
diff --git a/src/pool.h → include/etl/pool.h b/src/pool.h → include/etl/pool.h
diff --git a/src/power.h → include/etl/power.h b/src/power.h → include/etl/power.h
diff --git a/src/priority_queue.h → include/etl/priority_queue.h b/src/priority_queue.h → include/etl/priority_queue.h
diff --git a/src/private/ivectorpointer.h → include/etl/private/ivectorpointer.h b/src/private/ivectorpointer.h → include/etl/private/ivectorpointer.h
diff --git a/src/private/pvoidvector.h → include/etl/private/pvoidvector.h b/src/private/pvoidvector.h → include/etl/private/pvoidvector.h
diff --git a/src/private/vector_base.h → include/etl/private/vector_base.h b/src/private/vector_base.h → include/etl/private/vector_base.h
diff --git a/src/profiles/arduino_arm.h → include/etl/profiles/arduino_arm.h b/src/profiles/arduino_arm.h → include/etl/profiles/arduino_arm.h
diff --git a/src/profiles/armv5.h → include/etl/profiles/armv5.h b/src/profiles/armv5.h → include/etl/profiles/armv5.h
diff --git a/src/profiles/armv6.h → include/etl/profiles/armv6.h b/src/profiles/armv6.h → include/etl/profiles/armv6.h
diff --git a/src/profiles/cpp03.h → include/etl/profiles/cpp03.h b/src/profiles/cpp03.h → include/etl/profiles/cpp03.h
diff --git a/src/profiles/cpp11.h → include/etl/profiles/cpp11.h b/src/profiles/cpp11.h → include/etl/profiles/cpp11.h
diff --git a/src/profiles/cpp14.h → include/etl/profiles/cpp14.h b/src/profiles/cpp14.h → include/etl/profiles/cpp14.h
diff --git a/include/etl/profiles/etl_profile.h b/include/etl/profiles/etl_profile.h
@@ -0,0 +1,60 @@
+///\file
+
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2017 jwellbelove, scott-eddy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+#ifndef __ETL_PROFILE_H__
+#define __ETL_PROFILE_H__
+#ifdef PROFILE_MSVC 
+  #include "msvc_x86.h"
+#elif PROFILE_GCC_GENERIC
+  #include "gcc_generic.h"
+#elif PROFILE_GCC_LINUX_X86
+  #include "gcc_linux_x86.h"
+#elif PROFILE_GCC_WINDOWS_X86
+  #include "gcc_windows_x86.h"
+#elif PROFILE_ARM_V5_GENERIC
+  #include "armv5.h"
+#elif PROFILE_ARM_V6_GENERIC
+  #include "armv6.h"
+#elif PROFILE_ARDUINO
+  #include "arduino_arm.h"
+#elif PROFILE_TICC
+  #include "ticc.h"
+#elif PROFILE_CPP03_GENERIC
+  #include "cpp03.h"
+#elif PROFILE_CPP11_GENERIC
+  #include "cpp11.h"
+#elif PROFILE_CPP14_GENERIC
+  #include "cpp14.h"
+#elif PROFILE_CUSTOM
+  #include "custom_profile.h"
+#else 
+  #error Must provide a profile header file when buiding ETL. See https://www.etlcpp.com/setup.html
+#endif
+
+#endif // __ETL_PROFILE_H_
diff --git a/src/profiles/gcc_generic.h → include/etl/profiles/gcc_generic.h b/src/profiles/gcc_generic.h → include/etl/profiles/gcc_generic.h
diff --git a/src/profiles/gcc_linux_x86.h → include/etl/profiles/gcc_linux_x86.h b/src/profiles/gcc_linux_x86.h → include/etl/profiles/gcc_linux_x86.h
diff --git a/src/profiles/gcc_windows_x86.h → include/etl/profiles/gcc_windows_x86.h b/src/profiles/gcc_windows_x86.h → include/etl/profiles/gcc_windows_x86.h
diff --git a/src/profiles/msvc_x86.h → include/etl/profiles/msvc_x86.h b/src/profiles/msvc_x86.h → include/etl/profiles/msvc_x86.h
diff --git a/src/profiles/ticc.h → include/etl/profiles/ticc.h b/src/profiles/ticc.h → include/etl/profiles/ticc.h
diff --git a/src/queue.h → include/etl/queue.h b/src/queue.h → include/etl/queue.h
diff --git a/src/radix.h → include/etl/radix.h b/src/radix.h → include/etl/radix.h
diff --git a/src/random.h → include/etl/random.h b/src/random.h → include/etl/random.h
diff --git a/src/ratio.h → include/etl/ratio.h b/src/ratio.h → include/etl/ratio.h
diff --git a/src/reference_flat_map.h → include/etl/reference_flat_map.h b/src/reference_flat_map.h → include/etl/reference_flat_map.h
diff --git a/src/reference_flat_multimap.h → include/etl/reference_flat_multimap.h b/src/reference_flat_multimap.h → include/etl/reference_flat_multimap.h
diff --git a/src/reference_flat_multiset.h → include/etl/reference_flat_multiset.h b/src/reference_flat_multiset.h → include/etl/reference_flat_multiset.h
diff --git a/src/reference_flat_set.h → include/etl/reference_flat_set.h b/src/reference_flat_set.h → include/etl/reference_flat_set.h
diff --git a/src/scheduler.h → include/etl/scheduler.h b/src/scheduler.h → include/etl/scheduler.h
diff --git a/src/set.h → include/etl/set.h b/src/set.h → include/etl/set.h
diff --git a/src/smallest.h → include/etl/smallest.h b/src/smallest.h → include/etl/smallest.h
diff --git a/src/smallest_generator.h → include/etl/smallest_generator.h b/src/smallest_generator.h → include/etl/smallest_generator.h
diff --git a/src/sqrt.h → include/etl/sqrt.h b/src/sqrt.h → include/etl/sqrt.h
diff --git a/src/stack.h → include/etl/stack.h b/src/stack.h → include/etl/stack.h
diff --git a/src/static_assert.h → include/etl/static_assert.h b/src/static_assert.h → include/etl/static_assert.h
diff --git a/src/string_view.h → include/etl/string_view.h b/src/string_view.h → include/etl/string_view.h
diff --git a/src/task.h → include/etl/task.h b/src/task.h → include/etl/task.h
diff --git a/src/temp.h → include/etl/temp.h b/src/temp.h → include/etl/temp.h
diff --git a/src/timer.h → include/etl/timer.h b/src/timer.h → include/etl/timer.h
diff --git a/src/type_def.h → include/etl/type_def.h b/src/type_def.h → include/etl/type_def.h
diff --git a/src/type_lookup.h → include/etl/type_lookup.h b/src/type_lookup.h → include/etl/type_lookup.h
@@ -36,7 +36,7 @@ SOFTWARE.
 #include "static_assert.h"
 
 #undef ETL_FILE
-#define ETL_FILE "41"
+#define ETL_FILE "45"
 
 #if 0
 #error THIS HEADER IS A GENERATOR. DO NOT INCLUDE.

diff --git a/src/type_lookup_generator.h → include/etl/type_lookup_generator.h b/src/type_lookup_generator.h → include/etl/type_lookup_generator.h
@@ -36,7 +36,7 @@ SOFTWARE.
 #include "static_assert.h"
 
 #undef ETL_FILE
-#define ETL_FILE "41"
+#define ETL_FILE "45"
 
 /*[[[cog
 import cog

diff --git a/src/type_traits.h → include/etl/type_traits.h b/src/type_traits.h → include/etl/type_traits.h
diff --git a/src/type_traits_generator.h → include/etl/type_traits_generator.h b/src/type_traits_generator.h → include/etl/type_traits_generator.h
diff --git a/src/u16string.h → include/etl/u16string.h b/src/u16string.h → include/etl/u16string.h
diff --git a/src/u32string.h → include/etl/u32string.h b/src/u32string.h → include/etl/u32string.h
diff --git a/src/unordered_map.h → include/etl/unordered_map.h b/src/unordered_map.h → include/etl/unordered_map.h
diff --git a/src/unordered_multimap.h → include/etl/unordered_multimap.h b/src/unordered_multimap.h → include/etl/unordered_multimap.h
diff --git a/src/unordered_multiset.h → include/etl/unordered_multiset.h b/src/unordered_multiset.h → include/etl/unordered_multiset.h
diff --git a/src/unordered_set.h → include/etl/unordered_set.h b/src/unordered_set.h → include/etl/unordered_set.h
diff --git a/src/user_type.h → include/etl/user_type.h b/src/user_type.h → include/etl/user_type.h
diff --git a/src/utility.h → include/etl/utility.h b/src/utility.h → include/etl/utility.h
@@ -39,17 +39,6 @@ SOFTWARE.
 
 namespace etl
 {
-  //***************************************************************************
-  /// exchange
-  //***************************************************************************
-  template <typename T, typename U = T>
-  T exchange(T& object, U& new_value)
-  {
-    T old_value = object;
-    object = new_value;
-    return old_value;
-  }
-
   //***************************************************************************
   /// exchange (const)
   //***************************************************************************

diff --git a/src/variant.h → include/etl/variant.h b/src/variant.h → include/etl/variant.h
diff --git a/src/variant_pool.h → include/etl/variant_pool.h b/src/variant_pool.h → include/etl/variant_pool.h
diff --git a/src/variant_pool_generator.h → include/etl/variant_pool_generator.h b/src/variant_pool_generator.h → include/etl/variant_pool_generator.h
diff --git a/src/vector.h → include/etl/vector.h b/src/vector.h → include/etl/vector.h
diff --git a/src/version.h → include/etl/version.h b/src/version.h → include/etl/version.h
@@ -37,10 +37,10 @@ SOFTWARE.
 /// Definitions of the ETL version
 ///\ingroup utilities
 
-#define ETL_VERSION "10.21.2"
-#define ETL_VERSION_MAJOR 10
-#define ETL_VERSION_MINOR 21
-#define ETL_VERSION_PATCH  2
+#define ETL_VERSION "11.00.0"
+#define ETL_VERSION_MAJOR 11
+#define ETL_VERSION_MINOR  0
+#define ETL_VERSION_PATCH  0
 
 #endif
 
diff --git a/src/visitor.h → include/etl/visitor.h b/src/visitor.h → include/etl/visitor.h
diff --git a/src/wstring.h → include/etl/wstring.h b/src/wstring.h → include/etl/wstring.h
diff --git a/src/c/ecl_timer.c b/src/c/ecl_timer.c
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <stdint.h>
 #include <assert.h>
 
-#include "ecl_timer.h"
+#include "../../include/etl/c/ecl_timer.h"
 
 //*****************************************************************************
 // Internal timer list
@@ -326,7 +326,7 @@ ecl_timer_id_t ecl_timer_register(void             (*pcallback_)(),
 ecl_timer_result_t ecl_timer_unregister(ecl_timer_id_t id_)
 {
   assert(ecl.ptimers != 0);
-  
+
   ecl_timer_result_t result = ECL_TIMER_FAIL;
 
   if (id_ != ECL_TIMER_NO_TIMER)
@@ -376,7 +376,7 @@ ecl_timer_result_t ecl_timer_is_running()
 /// Clears the timer of data.
 //*******************************************
 void ecl_timer_clear()
-{ 
+{
   ecl_timer_list_clear();
 
   int i;
@@ -398,7 +398,7 @@ void ecl_timer_clear()
 ecl_timer_result_t ecl_timer_tick(uint32_t count)
 {
   assert(ecl.ptimers != 0);
-  
+
   if (ecl.enabled)
   {
     if (ECL_TIMER_PROCESSING_ENABLED)
@@ -452,7 +452,7 @@ ecl_timer_result_t ecl_timer_tick(uint32_t count)
 ecl_timer_result_t ecl_timer_start(ecl_timer_id_t id_, ecl_timer_start_t immediate_)
 {
   assert(ecl.ptimers != 0);
-  
+
   ecl_timer_result_t result = ECL_TIMER_FAIL;
 
   // Valid timer id?
@@ -490,7 +490,7 @@ ecl_timer_result_t ecl_timer_start(ecl_timer_id_t id_, ecl_timer_start_t immedia
 ecl_timer_result_t ecl_timer_stop(ecl_timer_id_t id_)
 {
   assert(ecl.ptimers != 0);
-  
+
   ecl_timer_result_t result = ECL_TIMER_FAIL;
 
   // Valid timer id?
@@ -520,7 +520,7 @@ ecl_timer_result_t ecl_timer_stop(ecl_timer_id_t id_)
 ecl_timer_result_t ecl_timer_set_period(ecl_timer_id_t id_, ecl_timer_time_t period_)
 {
   assert(ecl.ptimers != 0);
-  
+
   if (ecl_timer_stop(id_))
   {
     ecl.ptimers[id_].period = period_;
@@ -536,7 +536,7 @@ ecl_timer_result_t ecl_timer_set_period(ecl_timer_id_t id_, ecl_timer_time_t per
 ecl_timer_result_t ecl_timer_set_mode(ecl_timer_id_t id_, ecl_timer_mode_t repeating_)
 {
   assert(ecl.ptimers != 0);
-  
+
   if (ecl_timer_stop(id_))
   {
     ecl.ptimers[id_].repeating = repeating_;

diff --git a/src/private/pvoidvector.cpp b/src/private/pvoidvector.cpp
@@ -28,8 +28,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ******************************************************************************/
 
-#include "../platform.h"
-#include "pvoidvector.h"
+#include "../../include/etl/platform.h"
+#include "../../include/etl/private/pvoidvector.h"
 
 namespace etl
 {

diff --git a/support/Release notes.txt b/support/Release notes.txt
@@ -1,3 +1,9 @@
+===============================================================================
+11.00.0
+New directory structure.
+C & CPP files in src/
+H files in include/etl/
+
 ===============================================================================
 10.21.2
 Added version.h