Revise charging detection logic to exclude heating and treat that separately