Moved endpointmapping into a property file
Refactored the calculation not using a device as input but the 9 parameters
Added jUnit tests
Added jUnit tests