Fixed mode query
Fixed mode battery
Merge branch 'Heltjara-status_fix'

Conflicts:
	revoco.c