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
+1 -1
View File
@@ -33,7 +33,7 @@ enum ModuleType {
MODULE_TYPE_R9M_PXX2,
MODULE_TYPE_R9M_LITE_PXX1,
MODULE_TYPE_R9M_LITE_PXX2,
MODULE_TYPE_R9M_LITE_PRO_PXX1,
MODULE_TYPE_R9M_LITE_PRO_PXX1, // Doesn't exist
MODULE_TYPE_R9M_LITE_PRO_PXX2,
MODULE_TYPE_SBUS,
MODULE_TYPE_XJT_LITE_PXX2,