added new triggers for energy request and storage detection, close #1897