wn/TeensyPwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
wn 2015-02-14 19:28:58 +01:00
parent 655f9021e6
commit 53d707f5ef
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TeensyPwm.cpp
View File

@ -10,7 +10,11 @@
<<<<<<< local
volatile float U_des = 12.0;
=======
volatile float u_des = 14.0; volatile float u_des = 14.0;
>>>>>>> other