Merge branch '2.3.1' into 2.3

# Conflicts:
#	CREDITS.txt
#	radio/src/gui/480x272/radio_hardware.cpp
This commit is contained in:
Kilrah
2019-10-05 11:41:48 +02:00
72 changed files with 544 additions and 419 deletions
@@ -199,6 +199,8 @@ uint32_t switchState(uint8_t index)
ADD_3POS_CASE(D, 3);
ADD_2POS_CASE(F);
ADD_2POS_CASE(H);
ADD_2POS_CASE(I);
ADD_2POS_CASE(J);
#else
ADD_3POS_CASE(D, 3);
ADD_3POS_CASE(E, 4);