Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move curvature_t to units namespace (#2444)

Browse Source 
Note: this is a breaking change.
This commit is contained in:
Prateek Machiraju
2020-03-23 01:57:52 -04:00
committed by GitHub
parent 303194b08b
commit 1c28b729ad
18 changed files with 52 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/cpp/trajectory/Trajectory.cpp
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2019-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -149,5 +149,5 @@ void frc::from_json(const wpi::json& json, Trajectory::State& state) {
units::meters_per_second_t{json.at("velocity").get<double>()};
state.acceleration =
units::meters_per_second_squared_t{json.at("acceleration").get<double>()};
state.curvature = frc::curvature_t{json.at("curvature").get<double>()};
state.curvature = units::curvature_t{json.at("curvature").get<double>()};
}