summaryrefslogtreecommitdiff
path: root/i/marvin/src/es/es.cc
diff options
context:
space:
mode:
Diffstat (limited to 'i/marvin/src/es/es.cc')
-rw-r--r--i/marvin/src/es/es.cc36
1 files changed, 22 insertions, 14 deletions
diff --git a/i/marvin/src/es/es.cc b/i/marvin/src/es/es.cc
index 8bc90ec..ab73b3e 100644
--- a/i/marvin/src/es/es.cc
+++ b/i/marvin/src/es/es.cc
@@ -32,7 +32,7 @@
/// Constructeur
Es::Es (const Config & config)
: proto_ (*this), log_ ("Es"), lcdKeyPressed_ (-1),
- front_sensor_ (false), jack_ (false), colorModeBlue_ (false)
+ front_sensor_ (false), jackIn_ (false), colorModeBlue_ (false)
{
// Récupération des valeurs de configuration dans le fichier
loadConfig (config);
@@ -73,7 +73,6 @@ Es::loadConfig (const Config & config)
rvbSniffClearLimit_ = config.get<int> ("es.rvb_sniff_clear_limit");
rvbSensorMaskStat_ = config.get<int> ("es.rvb_sensor_mask_stat");
rvbSensorStat_ = config.get<int> ("es.rvb_sensor_stat");
- rvbSniffRefMask_ = config.get<int> ("es.rvb_sniff_ref_mask");
rvbSniffMaskStat_ = config.get<int> ("es.rvb_sniff_mask_stat");
rvbSniffStat_ = config.get<int> ("es.rvb_sniff_stat");
rvbSniffFrontStat_ = config.get<int> ("es.rvb_sniff_front_stat");
@@ -90,7 +89,6 @@ Es::reset (void)
// First, enable all sensors
setRVBSensorsConfig (rvbSensorFalseIC_, rvbSensorMaxOv_);
- enableAllSensors (true);
// Send configurations
setMainStat (mainStat_);
@@ -104,11 +102,7 @@ Es::reset (void)
setRVBSniffFrontStat (rvbSniffFrontStat_);
lcdGetKey (lcdKeyStat_);
- // We want to reference some sensors
- // XXX We should wait !
- setRefColor (rvbSniffRefMask_);
- // Disable useless sensors
- enableAllSensors (false);
+ enableAllSensors (true);
}
/// Stat for the main ()
@@ -133,6 +127,20 @@ Es::setAckStat (int freq)
proto_.send ('F', "b", ackFreq_);
}
+/// Get the state of the jack
+bool
+Es::isJackOut (void)
+{
+ return !jackIn_;
+}
+
+/// Get the color mode of the button
+bool
+Es::isColorModeBlue (void)
+{
+ return colorModeBlue_;
+}
+
// Envoie de la config des sensors RVB
void Es::setRVBSensorsConfig(int false_ic, int max_ov)
{
@@ -152,7 +160,7 @@ void Es::setRVBSensorsStat(int mask_captor, int freq)
}
// règle la couleur actuelle comme référente
-void Es::setRefColor(int mask_captor, int mode)
+void Es::refColor(int mask_captor, int mode)
{
proto_.send ('r', "wb", mask_captor, mode);
}
@@ -373,22 +381,22 @@ void Es::receive(char command, const Proto::Frame & frame)
switch (value)
{
case 0:
- jack_ = colorModeBlue_ = false;
+ jackIn_ = colorModeBlue_ = false;
break;
case 1:
- jack_ = true;
+ jackIn_ = true;
colorModeBlue_ = false;
break;
case 2:
- jack_ = false;
+ jackIn_ = false;
colorModeBlue_ = true;
break;
case 3:
- jack_ = colorModeBlue_ = true;
+ jackIn_ = colorModeBlue_ = true;
break;
}
log_ ("Others", Log::debug) << "Color mode " << (colorModeBlue_ ? "Blue" : "Red")
- << (jack_ ? ", jack in..." : ", jack out !!!");
+ << (jackIn_ ? ", jack in..." : ", jack out !!!");
}
break;
/* LCD */