fixed errors after previous merge. Now compiles.
fixed errors after previous merge. Now compiles.

etk29321/firmware,etk29321/firmware,BrewPi/firmware,BrewPi/firmware,glibersat/firmware,BrewPi/firmware,glibersat/firmware,etk29321/firmware,BrewPi/firmware,BrewPi/firmware,etk29321/firmware,glibersat/firmware,glibersat/firmware,etk29321/firmware,BrewPi/firmware,glibersat/firmware,BrewPi/firmware,glibersat/firmware,BrewPi/firmware,glibersat/firmware,etk29321/firmware