oops! fix ac/battery detection for new /sys paths
nicer macros