I'm not sure if the firmware can be upgraded but I thought I would ask for a feature to be enabled. - When in surface mode (Watch mode) please enable the HR monitor feature. while this has no direct correlation to diving it does enable me to use the HR monitor when I am working out. thank you