Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

to_lab Integration candidate: Caelum-rc4+dev12 #125

Merged
merged 3 commits into from
Jul 8, 2022
Merged

to_lab Integration candidate: Caelum-rc4+dev12 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8d38a9
Fix #123, update cmake_minimum_required
jphickey Jun 28, 2022
f8e4c9d
Merge pull request #124 from jphickey/fix-123-update-cmake-min
dzbaker Jun 29, 2022
8b00374
Bump to v2.5.0-rc4+dev23
dzbaker Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6.4)
cmake_minimum_required(VERSION 3.5)
project(CFS_TO_LAB C)

# Include source directory for table use
Expand Down
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ To send telemetry to the "ground" or UDP/IP port, edit the subscription table in

## Version History

### Development Build: v2.5.0-rc4+dev23
- Update cmake mimimum required to something more recent
- See <https://github.com/nasa/to_lab/pull/124>

### Development Build: v2.5.0-rc4+dev21

- Remove registration of empty EVS filters
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/to_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#define TO_LAB_VERSION_H

/* Development Build Macro Definitions */
#define TO_LAB_BUILD_NUMBER 21 /*!< Development Build: Number of commits since baseline */
#define TO_LAB_BUILD_NUMBER 23 /*!< Development Build: Number of commits since baseline */
#define TO_LAB_BUILD_BASELINE \
"v2.5.0-rc4" /*!< Development Build: git tag that is the base for the current development */

Expand Down