Splitted total_calories vs total_fat_calories watt calc

Due to problem with undefined total_fat_calories (only available when
New Leaf profile has been uploaded to device, otherwise 0 or undefined)