Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-09-25 02:47:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/devel' into A_to_Nm

Browse Source
This commit is contained in:
PAJohnson
2020-06-22 13:38:47 -04:00
parent 8d259c141e 4100fff46a
commit fc5361a042
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/Tupfile.lua
+2 -2
View File
@@ -7,9 +7,9 @@ tup.include('build.lua')
-- On some systems this may return a python2 command if Python3 is not installed.
function find_python3()
success, python_version = run_now("python --version")
if success and string.match(python_version, "Python 3") then return "python" end
if success and string.match(python_version, "Python 3") then return "python -B" end
success, python_version = run_now("python3 --version")
if success and string.match(python_version, "Python 3") then return "python3" end
if success and string.match(python_version, "Python 3") then return "python3 -B" end
error("Python 3 not found.")
end
Firmware/fibre/cpp/include/fibre/cpp_utils.hpp
+1
View File
@@ -82,6 +82,7 @@ public:
#include <tuple>
#include <functional>
#include <unordered_map>
#include <ostream>
/* Backport features from C++14 and C++17 ------------------------------------*/