Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into houliston/sonar
Browse files Browse the repository at this point in the history
  • Loading branch information
TrentHouliston committed Sep 18, 2023
2 parents e09d66a + 4746ec5 commit 7674bef
Show file tree
Hide file tree
Showing 174 changed files with 1,152 additions and 355 deletions.
36 changes: 21 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
# Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]> 2014-2017 Trent
# Houliston <[email protected]>
#
# 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.
#[[
MIT License
Copyright (c) 2013 NUClear Contributors
This file is part of the NUClear codebase.
See https://github.com/Fastcode/NUClear for further info.
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.
]]
cmake_minimum_required(VERSION 3.15.0)

# Set the project after the build type as the Project command can change the build type
Expand Down
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
2014-2017 Trent Houliston <[email protected]>
Copyright (C) 2013-2023 NUClear Contributors

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:

Expand Down
21 changes: 21 additions & 0 deletions docs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
#[[
MIT License
Copyright (c) 2017 NUClear Contributors
This file is part of the NUClear codebase.
See https://github.com/Fastcode/NUClear for further info.
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.
]]
option(BUILD_DOCUMENTATION "Create and install the HTML based API documentation (requires Doxygen and Sphinx)" FALSE)

if(BUILD_DOCUMENTATION)
Expand Down
22 changes: 22 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
#[[
MIT License
Copyright (c) 2013 NUClear Contributors
This file is part of the NUClear codebase.
See https://github.com/Fastcode/NUClear for further info.
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.
]]

# Configure the two versions of the main header (in source vs nuclear_bits)
set(nuclear_include_base_directory "")
configure_file(nuclear.in ${PROJECT_BINARY_DIR}/include/nuclear)
Expand Down
8 changes: 6 additions & 2 deletions src/Environment.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2013 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/LogLevel.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2013 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/PowerPlant.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2013 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/PowerPlant.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2013 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/Reactor.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2013 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/clock.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2013 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/Fusion.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/Parse.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2013 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/BindFusion.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/GetFusion.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
7 changes: 6 additions & 1 deletion src/dsl/fusion/GroupFusion.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright (C) 2023 Alex Biddulph <[email protected]>
* MIT License
*
* Copyright (c) 2023 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/NoOp.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
7 changes: 6 additions & 1 deletion src/dsl/fusion/PoolFusion.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright (C) 2023 Alex Biddulph <[email protected]>
* MIT License
*
* Copyright (c) 2023 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/PostconditionFusion.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/PreconditionFusion.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/PriorityFusion.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2015 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/has_bind.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/has_get.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
7 changes: 6 additions & 1 deletion src/dsl/fusion/has_group.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright (C) 2023 Alex Biddulph <[email protected]>
* MIT License
*
* Copyright (c) 2023 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
7 changes: 6 additions & 1 deletion src/dsl/fusion/has_pool.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright (C) 2023 Alex Biddulph <[email protected]>
* MIT License
*
* Copyright (c) 2023 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/has_postcondition.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/has_precondition.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
8 changes: 6 additions & 2 deletions src/dsl/fusion/has_priority.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/*
* Copyright (C) 2013 Trent Houliston <[email protected]>, Jake Woods <[email protected]>
* 2014-2017 Trent Houliston <[email protected]>
* MIT License
*
* Copyright (c) 2014 NUClear Contributors
*
* This file is part of the NUClear codebase.
* See https://github.com/Fastcode/NUClear for further info.
*
* 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
Expand Down
Loading

0 comments on commit 7674bef

Please sign in to comment.