Merge branch 'kk_isonfix' into 'devel'

PowerSupplyChannel::isOn now returns something.

See merge request berkeleylab/labRemote!193

src/libPS/IPowerSupply.cpp

@@ -72,6 +72,7 @@ void IPowerSupply::turnOffAll()
 bool IPowerSupply::isOn(unsigned channel)
 {
   logger(logWARNING) << "isOn() not implemented for this PS.";
+  return false;
 }
 
 void IPowerSupply::setCurrentProtect(double cur, unsigned channel)

src/libPS/PowerSupplyChannel.cpp

@@ -54,7 +54,7 @@ void PowerSupplyChannel::turnOff()
 { m_ps->turnOff(m_channel); }
 
 bool PowerSupplyChannel::isOn()
-{ m_ps->isOn(m_channel); }
+{ return m_ps->isOn(m_channel); }
 
 void PowerSupplyChannel::setCurrentLevel(double cur)
 { m_ps->setCurrentLevel(cur, m_channel); }