summaryrefslogtreecommitdiffhomepage
path: root/tracker-hatire
diff options
context:
space:
mode:
Diffstat (limited to 'tracker-hatire')
-rwxr-xr-x[-rw-r--r--]tracker-hatire/ftnoir_arduino_type.h8
-rwxr-xr-xtracker-hatire/ftnoir_tracker_hat.cpp12
-rw-r--r--tracker-hatire/ftnoir_tracker_hat.h12
-rw-r--r--tracker-hatire/ftnoir_tracker_hat_dialog.cpp12
-rw-r--r--tracker-hatire/ftnoir_tracker_hat_dialog.h12
-rwxr-xr-x[-rw-r--r--]tracker-hatire/ftnoir_tracker_hat_settings.cpp24
-rw-r--r--tracker-hatire/ftnoir_tracker_hat_settings.h12
7 files changed, 46 insertions, 46 deletions
diff --git a/tracker-hatire/ftnoir_arduino_type.h b/tracker-hatire/ftnoir_arduino_type.h
index 481e137b..06f3decf 100644..100755
--- a/tracker-hatire/ftnoir_arduino_type.h
+++ b/tracker-hatire/ftnoir_arduino_type.h
@@ -2,15 +2,15 @@
#include <QDataStream>
-// Arduino trame structure
+// Arduino frame structure
#pragma pack(push,2)
struct TArduinoData
{
- quint16 Begin; // Header trame 0xAAAA;
- quint16 Code; // 0->999 Num Trame >=2000 Info >=3000 Init >=5000 Start Command >=9000 Error
+ quint16 Begin; // Header frame 0xAAAA;
+ quint16 Code; // 0->999 Num frame >=2000 Info >=3000 Init >=5000 Start Command >=9000 Error
float Rot[3];
float Trans[3];
- quint16 End; // End trame 0x5555;
+ quint16 End; // End frame 0x5555;
} ;
#pragma pack(pop)
diff --git a/tracker-hatire/ftnoir_tracker_hat.cpp b/tracker-hatire/ftnoir_tracker_hat.cpp
index 48585f6c..879ea618 100755
--- a/tracker-hatire/ftnoir_tracker_hat.cpp
+++ b/tracker-hatire/ftnoir_tracker_hat.cpp
@@ -204,12 +204,12 @@ void hatire::applysettings(const TrackerSettings& settings)
bInvertZ = settings.InvertZ;
ts.bEnableLogging = settings.EnableLogging;
- iRollAxe= settings.RollAxe;
- iPitchAxe= settings.PitchAxe;
- iYawAxe= settings.YawAxe;
- iXAxe= settings.XAxe;
- iYAxe= settings.YAxe;
- iZAxe= settings.ZAxe;
+ iRollAxis= settings.RollAxis;
+ iPitchAxis= settings.PitchAxis;
+ iYawAxis= settings.YawAxis;
+ iXAxis= settings.XAxis;
+ iYAxis= settings.YAxis;
+ iZAxis= settings.ZAxis;
ts.iBaudRate=settings.pBaudRate;
ts.iDataBits=settings.pDataBits;
diff --git a/tracker-hatire/ftnoir_tracker_hat.h b/tracker-hatire/ftnoir_tracker_hat.h
index 4767d291..00ec26e2 100644
--- a/tracker-hatire/ftnoir_tracker_hat.h
+++ b/tracker-hatire/ftnoir_tracker_hat.h
@@ -62,12 +62,12 @@ private:
bool bInvertY;
bool bInvertZ;
- int iRollAxe;
- int iPitchAxe;
- int iYawAxe;
- int iXAxe;
- int iYAxe;
- int iZAxe;
+ int iRollAxis;
+ int iPitchAxis;
+ int iYawAxis;
+ int iXAxis;
+ int iYAxis;
+ int iZAxis;
volatile int CptError;
};
diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp
index 4ef83fb5..7d714d3a 100644
--- a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp
+++ b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp
@@ -97,12 +97,12 @@ TrackerControls::TrackerControls() : theTracker(NULL), settingsDirty(false), tim
ui.chkEnableLogging->setChecked(settings.EnableLogging);
- ui.cb_roll->setCurrentIndex(settings.RollAxe);
- ui.cb_pitch->setCurrentIndex(settings.PitchAxe);
- ui.cb_yaw->setCurrentIndex(settings.YawAxe);
- ui.cb_x->setCurrentIndex(settings.XAxe);
- ui.cb_y->setCurrentIndex(settings.YAxe);
- ui.cb_z->setCurrentIndex(settings.ZAxe);
+ ui.cb_roll->setCurrentIndex(settings.RollAxis);
+ ui.cb_pitch->setCurrentIndex(settings.PitchAxis);
+ ui.cb_yaw->setCurrentIndex(settings.YawAxis);
+ ui.cb_x->setCurrentIndex(settings.XAxis);
+ ui.cb_y->setCurrentIndex(settings.YAxis);
+ ui.cb_z->setCurrentIndex(settings.ZAxis);
ui.le_cmd_start->setText(settings.CmdStart);
ui.le_cmd_stop->setText(settings.CmdStop);
diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.h b/tracker-hatire/ftnoir_tracker_hat_dialog.h
index 7be31e37..62d60646 100644
--- a/tracker-hatire/ftnoir_tracker_hat_dialog.h
+++ b/tracker-hatire/ftnoir_tracker_hat_dialog.h
@@ -47,12 +47,12 @@ protected slots:
void set_diag_logging(bool val) { settings.EnableLogging = val; settings_changed(); }
- void set_rot_roll(int val) { settings.RollAxe = val; settings_changed(); }
- void set_rot_pitch(int val) { settings.PitchAxe = val; settings_changed(); }
- void set_rot_yaw(int val) { settings.YawAxe = val; settings_changed(); }
- void set_acc_x(int val) { settings.XAxe = val; settings_changed(); }
- void set_acc_y(int val) { settings.YAxe = val; settings_changed(); }
- void set_acc_z(int val) { settings.ZAxe = val; settings_changed(); }
+ void set_rot_roll(int val) { settings.RollAxis = val; settings_changed(); }
+ void set_rot_pitch(int val) { settings.PitchAxis = val; settings_changed(); }
+ void set_rot_yaw(int val) { settings.YawAxis = val; settings_changed(); }
+ void set_acc_x(int val) { settings.XAxis = val; settings_changed(); }
+ void set_acc_y(int val) { settings.YAxis = val; settings_changed(); }
+ void set_acc_z(int val) { settings.ZAxis = val; settings_changed(); }
void set_cmd_start(const QString &val) { settings.CmdStart = val; settings_changed(); }
void set_cmd_stop(const QString &val) { settings.CmdStop = val; settings_changed(); }
diff --git a/tracker-hatire/ftnoir_tracker_hat_settings.cpp b/tracker-hatire/ftnoir_tracker_hat_settings.cpp
index 02c99e75..8da5c1c6 100644..100755
--- a/tracker-hatire/ftnoir_tracker_hat_settings.cpp
+++ b/tracker-hatire/ftnoir_tracker_hat_settings.cpp
@@ -42,12 +42,12 @@ void TrackerSettings::load_ini()
InvertZ = iniFile.value( "InvertZ", 0 ).toBool();
- RollAxe=iniFile.value("RollAxe",1).toInt();
- PitchAxe=iniFile.value("PitchAxe",2).toInt();
- YawAxe=iniFile.value("YawAxe",0).toInt();
- XAxe=iniFile.value("XAxe",1).toInt();
- YAxe=iniFile.value("YAxe",2).toInt();
- ZAxe=iniFile.value("ZAxe",0).toInt();
+ RollAxis=iniFile.value("RollAxe",1).toInt();
+ PitchAxis=iniFile.value("PitchAxe",2).toInt();
+ YawAxis=iniFile.value("YawAxe",0).toInt();
+ XAxis=iniFile.value("XAxe",1).toInt();
+ YAxis=iniFile.value("YAxe",2).toInt();
+ ZAxis=iniFile.value("ZAxe",0).toInt();
CmdStart=iniFile.value ( "CmdStart").toString();
@@ -101,12 +101,12 @@ void TrackerSettings::save_ini() const
iniFile.setValue( "InvertY", InvertY );
iniFile.setValue( "InvertZ", InvertZ );
- iniFile.setValue ( "RollAxe", RollAxe );
- iniFile.setValue ( "PitchAxe", PitchAxe );
- iniFile.setValue ( "YawAxe",YawAxe );
- iniFile.setValue ( "XAxe", XAxe );
- iniFile.setValue ( "YAxe", YAxe );
- iniFile.setValue ( "ZAxe", ZAxe );
+ iniFile.setValue ( "RollAxe", RollAxis );
+ iniFile.setValue ( "PitchAxe", PitchAxis );
+ iniFile.setValue ( "YawAxe",YawAxis );
+ iniFile.setValue ( "XAxe", XAxis );
+ iniFile.setValue ( "YAxe", YAxis );
+ iniFile.setValue ( "ZAxe", ZAxis );
iniFile.setValue ( "CmdStart",CmdStart.toLatin1());
iniFile.setValue ( "CmdStop",CmdStop.toLatin1());
diff --git a/tracker-hatire/ftnoir_tracker_hat_settings.h b/tracker-hatire/ftnoir_tracker_hat_settings.h
index bed33200..06d54e34 100644
--- a/tracker-hatire/ftnoir_tracker_hat_settings.h
+++ b/tracker-hatire/ftnoir_tracker_hat_settings.h
@@ -28,12 +28,12 @@ struct TrackerSettings
bool InvertY;
bool InvertZ;
- int RollAxe;
- int PitchAxe;
- int YawAxe;
- int XAxe;
- int YAxe;
- int ZAxe;
+ int RollAxis;
+ int PitchAxis;
+ int YawAxis;
+ int XAxis;
+ int YAxis;
+ int ZAxis;
QString CmdStart;
QString CmdStop;