Minor bugs

git-svn-id: svn+ssh://thomaspietrzak.com/var/svn/rep@85 47cf9a05-e0a8-4ed5-9e9b-101a649bc004

diff --git a/TactonDebug/MagicCircle/magiccircle.ui b/TactonDebug/MagicCircle/magiccircle.ui
index b6829a595b6cb8c8e044d8d07426ff263cecc547..acbe50ce548f41a377d79d54ca6651456d5924a6 100644 (file)
--- a/TactonDebug/MagicCircle/magiccircle.ui
+++ b/TactonDebug/MagicCircle/magiccircle.ui
@@ -87,7 +87,7 @@
          <number>4</number>\r
         </property>\r
         <property name="maximum">\r
-         <number>360</number>\r
+         <number>720</number>\r
         </property>\r
         <property name="value">\r
          <number>360</number>\r

diff --git a/TactonDebug/TactonDebug.suo b/TactonDebug/TactonDebug.suo
index 95b4378c954488ffa5127b2099bacfe008f036a3..97614358c81678c44645334c11155984788c1cc5 100644 (file)
Binary files a/TactonDebug/TactonDebug.suo and b/TactonDebug/TactonDebug.suo differ

diff --git a/TactonLibrary.suo b/TactonLibrary.suo
index fc693ea9da458169cd32dd130bb656e193ca8ac3..e0587c7bb029e66b609ec372846e0e3c1e8fe524 100644 (file)
Binary files a/TactonLibrary.suo and b/TactonLibrary.suo differ

diff --git a/TactonPlayer/TactonPlayer.cpp b/TactonPlayer/TactonPlayer.cpp
index 975fcebbb30edd9fb1626f917697f55fc14732f9..08687215c71e499ecd231365ceaa1d1eac728191 100644 (file)
--- a/TactonPlayer/TactonPlayer.cpp
+++ b/TactonPlayer/TactonPlayer.cpp
@@ -131,7 +131,7 @@ void TactonPlayer::setFrequency(unsigned int frequency)
        _comport->WriteData(buffer, 3);\r
 }\r
 \r
-void TactonPlayer::setAmplitudes(unsigned int nbtactors, unsigned char *amplitudes)\r
+void TactonPlayer::setAmplitudes(unsigned char nbtactors, unsigned char *amplitudes)\r
 {\r
        if (!_comport)\r
                return;\r

diff --git a/TactonPlayer/TactonPlayer.hpp b/TactonPlayer/TactonPlayer.hpp
index a7dd0ce78d197f19228c238bde5e98e9fb8ca944..a5be7775b6439728aeeb30cbf651e5003527d586 100644 (file)
--- a/TactonPlayer/TactonPlayer.hpp
+++ b/TactonPlayer/TactonPlayer.hpp
@@ -32,7 +32,7 @@ class TactonPlayer
                        EXPORTED void schedule(unsigned char index, unsigned long timestamp);\r
 \r
                        //sets an amplitude for each vibrator\r
-                       EXPORTED void setAmplitudes(unsigned int nbtactors, unsigned char *amplitudes);\r
+                       EXPORTED void setAmplitudes(unsigned char nbtactors, unsigned char *amplitudes);\r
                        //sets a frequency for all vibrator\r
                        EXPORTED void setFrequency(unsigned int frequency);\r
                        //stop any vibration\r