Merge branch '2.3' into 3djc/2.3-synced

# Conflicts:
#	CREDITS.txt
#	radio/src/targets/sky9x/board.h
This commit is contained in:
3djc
2021-01-08 17:50:20 +01:00
25 changed files with 390 additions and 268 deletions
+3 -2
View File
@@ -178,8 +178,9 @@ enum ModuleSubtypeMulti {
MODULE_SUBTYPE_MULTI_REALACC,
MODULE_SUBTYPE_MULTI_OMP,
MODULE_SUBTYPE_MULTI_MLINK, //75
MODULE_SUBTYPE_MULTI_WFLYRF,
MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_WFLYRF
MODULE_SUBTYPE_MULTI_WFLY2,
MODULE_SUBTYPE_MULTI_E016HV2,
MODULE_SUBTYPE_MULTI_LAST = MODULE_SUBTYPE_MULTI_E016HV2
};
#define MODULE_SUBTYPE_MULTI_XN297DP 63-3