Add switching functionality for sensors.
Correct defines so they correspond with reality