Merge pull request #2228 from liamcottle/refactor/gat562-mesh-watch #610

Job	Run time
build (Heltec_v3_repeater)	2m 44s
build (PicoW_repeater)	2m 29s
build (wio-e5-mini_repeater)	1m 31s
build (RAK_4631_room_server)	2m 28s
build (LilyGo_Tlora_C6_repeater_)	1m 54s
build (Heltec_v3_room_server)	2m 44s
build (Heltec_v3_companion_radio_ble)	2m 55s
build (RAK_4631_repeater)	2m 16s
build (RAK_4631_companion_radio_ble)	2m 18s
	21m 19s

Provide feedback