update docs

kerikun11 · Jun 13, 2020 · 2f97c91 · 2f97c91
1 parent 86d2394
commit 2f97c91
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -410,9 +410,10 @@ public:
    * @param v 並進速度
    * @param t 時刻
    * @param Ts 積分時間
+   * @param k_slip スリップ角定数
    */
   static void integrate(const AccelDesigner &ad, State &s, const float v,
-                        const float t, const float Ts);
+                        const float t, const float Ts, const float k_slip = 0);
   /**
    * @brief 情報の表示
    */
@@ -455,7 +456,8 @@ public:
    * @param t 現在時刻 [s]
    * @param Ts 積分時間 [s]
    */
-  void update(State &state, const float t, const float Ts) const;
+  void update(State &state, const float t, const float Ts,
+              const float k_slip = 0) const;
   /**
    * @brief 並進速度を取得
    */

diff --git a/include/ctrl/slalom.h b/include/ctrl/slalom.h
@@ -117,6 +117,7 @@ struct Shape {
    * @param v 並進速度 [m/s]
    * @param t 時刻 [s]
    * @param Ts 積分時間 [s]
+   * @param k_slip スリップ角定数
    */
   static void integrate(const AccelDesigner &ad, State &s, const float v,
                         const float t, const float Ts, const float k_slip = 0) {

diff --git a/pybind11/CMakeLists.txt b/pybind11/CMakeLists.txt
@@ -30,7 +30,7 @@ endif()
 # make a custom target to plot
 add_custom_target(${CUSTOM_TARGET_NAME}_plot
   COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}
-  ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/plot.py && echo $PYTHONPATH
+  ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/plot.py
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
   USES_TERMINAL
 )