firmware work on same file
merge with dev branch