It's not easier to just calculate the time elapsed for a percent of charge, and estimate the remaining time based on that info ?