Moved fixData and calcData into combine.
Moved fixData and calcData into combine.

They're small and not used anywhere else, so keeping them in separate
functions only serves to increase complexity.

chiu/flot,resnick1223/flot,petrvacha/flot,lolifans/flot,chiu/flot,k-joseph/flot,chaveiro/flot,magora-suchkov/flot,TrainingPeaks/flot,ni-kismet/engineering-flot,resnick1223/flot,cipix2000/engineering-flot,chaveiro/flot,andig/flot,trask/flot,chaveiro/flot,chiu/flot,stanislavdavid/flot,wet-boew/flot,pepperdata/flot,sedran/flot,saike/flot,klarkc/flot,k-joseph/flot,wet-boew/flot,saike/flot,Sensirion/flot,mlitwiniuk/flot,stanislavdavid/flot,kongx73/flot,octavianCraciun/engineering-flot,andig/flot,cipix2000/flot,stanislavdavid/flot,cipix2000/flot,gdseller/flot,soenter/flot,resnick1223/flot,mlitwiniuk/flot,k-joseph/flot,mcanthony/flot,fashionsun/flot,andig/flot,flot/flot,MAMISHO/flot,mlitwiniuk/flot,colinhunt/flot,saike/flot,matong/flot,soenter/flot