From ccc9a04640e9e5930428a26680ed0b327a873df7 Mon Sep 17 00:00:00 2001 From: john_moore007 Date: Mon, 21 Aug 2023 15:20:22 +0100 Subject: [PATCH] RX routines added --- .gitignore | 2 + .vscode/arduino.json | 8 + .vscode/c_cpp_properties.json | 515 ++++++++++++++++++++++++++++++ Multiprotocol/DSM_Rx_cyrf6936.ino | 50 ++- Multiprotocol/Multiprotocol.h | 3 +- Multiprotocol/_Config.h | 2 +- 6 files changed, 572 insertions(+), 8 deletions(-) create mode 100644 .gitignore create mode 100644 .vscode/arduino.json create mode 100644 .vscode/c_cpp_properties.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..36c55fd --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# Ignore Arduino build output +vscode_build diff --git a/.vscode/arduino.json b/.vscode/arduino.json new file mode 100644 index 0000000..580d2d9 --- /dev/null +++ b/.vscode/arduino.json @@ -0,0 +1,8 @@ +{ + "configuration": "usb_support=disabled,debug_option=native", + "board": "multi4in1:STM32F1:multistm32f103cb", + "sketch": "Multiprotocol\\Multiprotocol.ino", + "output": "vscode_build", + "intelliSenseGen": "disable", + "port": "COM9" +} \ No newline at end of file diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..4a26c4a --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,515 @@ +{ + "version": 4, + "configurations": [ + { + "name": "Arduino", + "compilerPath": "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\tools\\xpack-arm-none-eabi-gcc\\8.3.1-1.4\\bin\\arm-none-eabi-g++", + "compilerArgs": [ + "-w", + "-std=gnu++11" + ], + "intelliSenseMode": "gcc-x64", + "includePath": [ + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\system\\libmaple", + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\system\\libmaple\\include", + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\system\\libmaple\\stm32f1\\include", + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\system\\libmaple\\usb\\stm32f1", + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\system\\libmaple\\usb\\usb_lib", + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\cores\\maple", + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\variants\\generic_stm32f103c", + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\libraries\\SPI\\src", + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\libraries\\EEPROM", + "c:\\users\\jmoore.amulethotkey\\appdata\\local\\arduino15\\packages\\multi4in1\\tools\\xpack-arm-none-eabi-gcc\\8.3.1-1.4\\arm-none-eabi\\include\\c++\\8.3.1", + "c:\\users\\jmoore.amulethotkey\\appdata\\local\\arduino15\\packages\\multi4in1\\tools\\xpack-arm-none-eabi-gcc\\8.3.1-1.4\\arm-none-eabi\\include\\c++\\8.3.1\\arm-none-eabi", + "c:\\users\\jmoore.amulethotkey\\appdata\\local\\arduino15\\packages\\multi4in1\\tools\\xpack-arm-none-eabi-gcc\\8.3.1-1.4\\arm-none-eabi\\include\\c++\\8.3.1\\backward", + "c:\\users\\jmoore.amulethotkey\\appdata\\local\\arduino15\\packages\\multi4in1\\tools\\xpack-arm-none-eabi-gcc\\8.3.1-1.4\\lib\\gcc\\arm-none-eabi\\8.3.1\\include", + "c:\\users\\jmoore.amulethotkey\\appdata\\local\\arduino15\\packages\\multi4in1\\tools\\xpack-arm-none-eabi-gcc\\8.3.1-1.4\\lib\\gcc\\arm-none-eabi\\8.3.1\\include-fixed", + "c:\\users\\jmoore.amulethotkey\\appdata\\local\\arduino15\\packages\\multi4in1\\tools\\xpack-arm-none-eabi-gcc\\8.3.1-1.4\\arm-none-eabi\\include" + ], + "forcedInclude": [ + "C:\\Users\\jmoore.AMULETHOTKEY\\AppData\\Local\\Arduino15\\packages\\multi4in1\\hardware\\STM32F1\\1.3.1\\cores\\maple\\Arduino.h", + "${workspaceFolder}\\Multiprotocol\\Multiprotocol.h", + "${workspaceFolder}\\Multiprotocol\\_Config.h", + "${workspaceFolder}\\Multiprotocol\\iface_cc2500.h", + "${workspaceFolder}\\Multiprotocol\\Multiprotocol.ino", + "${workspaceFolder}\\Multiprotocol\\SPI.ino", + "${workspaceFolder}\\Multiprotocol\\CYRF6936_SPI.ino", + "${workspaceFolder}\\Multiprotocol\\CC2500_SPI.ino", + "${workspaceFolder}\\Multiprotocol\\DSM.ino", + "${workspaceFolder}\\Multiprotocol\\Telemetry.ino", + "${workspaceFolder}\\Multiprotocol\\Arduino.ino", + "${workspaceFolder}\\Multiprotocol\\Multi_Protos.ino" + ], + "cStandard": "c11", + "cppStandard": "c++11", + "defines": [ + "DEBUG_LEVEL=DEBUG_NONE", + "BOARD_generic_stm32f103c", + "VECT_TAB_ADDR=0x8002000", + "ERROR_LED_PORT=GPIOB", + "ERROR_LED_PIN=1", + "F_CPU=72000000L", + "ARDUINO=10607", + "ARDUINO_MULTI_STM32_WITH_BOOT=131", + "ARDUINO_ARCH_STM32F1", + "SERIAL_USB", + "GENERIC_BOOTLOADER", + "ARDUINO_MULTI_DEBUG", + "MCU_STM32F103CB", + "__STM32F1__", + "MCU_STM32F103CB", + "__STM32F1__", + "__DBL_MIN_EXP__=(-1021)", + "__HQ_FBIT__=15", + "__FLT32X_MAX_EXP__=1024", + "__cpp_attributes=200809", + "__UINT_LEAST16_MAX__=0xffff", + "__ARM_SIZEOF_WCHAR_T=4", + "__ATOMIC_ACQUIRE=2", + "__SFRACT_IBIT__=0", + "__FLT_MIN__=1.1754943508222875e-38F", + "__GCC_IEC_559_COMPLEX=0", + "__cpp_aggregate_nsdmi=201304", + "__UFRACT_MAX__=0XFFFFP-16UR", + "__UINT_LEAST8_TYPE__=unsigned char", + "__DQ_FBIT__=63", + "__INTMAX_C(c)=c ## LL", + "__ULFRACT_FBIT__=32", + "__SACCUM_EPSILON__=0x1P-7HK", + "__CHAR_BIT__=8", + "__USQ_IBIT__=0", + "__UINT8_MAX__=0xff", + "__ACCUM_FBIT__=15", + "__WINT_MAX__=0xffffffffU", + "__FLT32_MIN_EXP__=(-125)", + "__cpp_static_assert=200410", + "__USFRACT_FBIT__=8", + "__ORDER_LITTLE_ENDIAN__=1234", + "__SIZE_MAX__=0xffffffffU", + "__ARM_ARCH_ISA_ARM=1", + "__WCHAR_MAX__=0xffffffffU", + "__LACCUM_IBIT__=32", + "__DBL_DENORM_MIN__=double(4.9406564584124654e-324L)", + "__GCC_ATOMIC_CHAR_LOCK_FREE=1", + "__GCC_IEC_559=0", + "__FLT32X_DECIMAL_DIG__=17", + "__FLT_EVAL_METHOD__=0", + "__cpp_binary_literals=201304", + "__LLACCUM_MAX__=0X7FFFFFFFFFFFFFFFP-31LLK", + "__FLT64_DECIMAL_DIG__=17", + "__GCC_ATOMIC_CHAR32_T_LOCK_FREE=1", + "__FRACT_FBIT__=15", + "__cpp_variadic_templates=200704", + "__UINT_FAST64_MAX__=0xffffffffffffffffULL", + "__SIG_ATOMIC_TYPE__=int", + "__UACCUM_FBIT__=16", + "__DBL_MIN_10_EXP__=(-307)", + "__FINITE_MATH_ONLY__=0", + "__ARMEL__=1", + "__cpp_variable_templates=201304", + "__LFRACT_IBIT__=0", + "__GNUC_PATCHLEVEL__=1", + "__FLT32_HAS_DENORM__=1", + "__LFRACT_MAX__=0X7FFFFFFFP-31LR", + "__UINT_FAST8_MAX__=0xffffffffU", + "__has_include(STR)=__has_include__(STR)", + "__DEC64_MAX_EXP__=385", + "__INT8_C(c)=c", + "__INT_LEAST8_WIDTH__=8", + "__UINT_LEAST64_MAX__=0xffffffffffffffffULL", + "__SA_FBIT__=15", + "__SHRT_MAX__=0x7fff", + "__LDBL_MAX__=1.7976931348623157e+308L", + "__FRACT_MAX__=0X7FFFP-15R", + "__UFRACT_FBIT__=16", + "__UFRACT_MIN__=0.0UR", + "__UINT_LEAST8_MAX__=0xff", + "__GCC_ATOMIC_BOOL_LOCK_FREE=1", + "__UINTMAX_TYPE__=long long unsigned int", + "__LLFRACT_EPSILON__=0x1P-63LLR", + "__DEC32_EPSILON__=1E-6DF", + "__FLT_EVAL_METHOD_TS_18661_3__=0", + "__CHAR_UNSIGNED__=1", + "__UINT32_MAX__=0xffffffffUL", + "__GXX_EXPERIMENTAL_CXX0X__=1", + "__ULFRACT_MAX__=0XFFFFFFFFP-32ULR", + "__TA_IBIT__=64", + "__LDBL_MAX_EXP__=1024", + "__WINT_MIN__=0U", + "__INT_LEAST16_WIDTH__=16", + "__ULLFRACT_MIN__=0.0ULLR", + "__SCHAR_MAX__=0x7f", + "__WCHAR_MIN__=0U", + "__INT64_C(c)=c ## LL", + "__DBL_DIG__=15", + "__GCC_ATOMIC_POINTER_LOCK_FREE=1", + "__LLACCUM_MIN__=(-0X1P31LLK-0X1P31LLK)", + "__SIZEOF_INT__=4", + "__SIZEOF_POINTER__=4", + "__GCC_ATOMIC_CHAR16_T_LOCK_FREE=1", + "__USACCUM_IBIT__=8", + "__USER_LABEL_PREFIX__", + "__STDC_HOSTED__=1", + "__LDBL_HAS_INFINITY__=1", + "__LFRACT_MIN__=(-0.5LR-0.5LR)", + "__HA_IBIT__=8", + "__FLT32_DIG__=6", + "__TQ_IBIT__=0", + "__FLT_EPSILON__=1.1920928955078125e-7F", + "__APCS_32__=1", + "__GXX_WEAK__=1", + "__SHRT_WIDTH__=16", + "__USFRACT_IBIT__=0", + "__LDBL_MIN__=2.2250738585072014e-308L", + "__FRACT_MIN__=(-0.5R-0.5R)", + "__DEC32_MAX__=9.999999E96DF", + "__cpp_threadsafe_static_init=200806", + "__DA_IBIT__=32", + "__ARM_SIZEOF_MINIMAL_ENUM=1", + "__FLT32X_HAS_INFINITY__=1", + "__INT32_MAX__=0x7fffffffL", + "__UQQ_FBIT__=8", + "__INT_WIDTH__=32", + "__SIZEOF_LONG__=4", + "__UACCUM_MAX__=0XFFFFFFFFP-16UK", + "__UINT16_C(c)=c", + "__PTRDIFF_WIDTH__=32", + "__DECIMAL_DIG__=17", + "__LFRACT_EPSILON__=0x1P-31LR", + "__FLT64_EPSILON__=2.2204460492503131e-16F64", + "__ULFRACT_MIN__=0.0ULR", + "__INTMAX_WIDTH__=64", + "__FLT64_MIN_EXP__=(-1021)", + "__has_include_next(STR)=__has_include_next__(STR)", + "__LDBL_HAS_QUIET_NAN__=1", + "__ULACCUM_IBIT__=32", + "__FLT64_MANT_DIG__=53", + "__UACCUM_EPSILON__=0x1P-16UK", + "__GNUC__=8", + "__ULLACCUM_MAX__=0XFFFFFFFFFFFFFFFFP-32ULLK", + "__GXX_RTTI=1", + "__cpp_delegating_constructors=200604", + "__HQ_IBIT__=0", + "__FLT_HAS_DENORM__=1", + "__SIZEOF_LONG_DOUBLE__=8", + "__BIGGEST_ALIGNMENT__=8", + "__STDC_UTF_16__=1", + "__FLT64_MAX_10_EXP__=308", + "__GNUC_STDC_INLINE__=1", + "__DQ_IBIT__=0", + "__FLT32_HAS_INFINITY__=1", + "__DBL_MAX__=double(1.7976931348623157e+308L)", + "__ULFRACT_IBIT__=0", + "__cpp_raw_strings=200710", + "__INT_FAST32_MAX__=0x7fffffff", + "__DBL_HAS_INFINITY__=1", + "__ACCUM_IBIT__=16", + "__DEC32_MIN_EXP__=(-94)", + "__THUMB_INTERWORK__=1", + "__INTPTR_WIDTH__=32", + "__LACCUM_MAX__=0X7FFFFFFFFFFFFFFFP-31LK", + "__FLT32X_HAS_DENORM__=1", + "__INT_FAST16_TYPE__=int", + "__LDBL_HAS_DENORM__=1", + "__cplusplus=201402L", + "__cpp_ref_qualifiers=200710", + "__DEC128_MAX__=9.999999999999999999999999999999999E6144DL", + "__INT_LEAST32_MAX__=0x7fffffffL", + "__ARM_PCS=1", + "__DEC32_MIN__=1E-95DF", + "__ACCUM_MAX__=0X7FFFFFFFP-15K", + "__DEPRECATED=1", + "__cpp_rvalue_references=200610", + "__DBL_MAX_EXP__=1024", + "__USACCUM_EPSILON__=0x1P-8UHK", + "__WCHAR_WIDTH__=32", + "__FLT32_MAX__=3.4028234663852886e+38F32", + "__DEC128_EPSILON__=1E-33DL", + "__SFRACT_MAX__=0X7FP-7HR", + "__FRACT_IBIT__=0", + "__PTRDIFF_MAX__=0x7fffffff", + "__UACCUM_MIN__=0.0UK", + "__UACCUM_IBIT__=16", + "__FLT32_HAS_QUIET_NAN__=1", + "__GNUG__=8", + "__LONG_LONG_MAX__=0x7fffffffffffffffLL", + "__SIZEOF_SIZE_T__=4", + "__ULACCUM_MAX__=0XFFFFFFFFFFFFFFFFP-32ULK", + "__cpp_rvalue_reference=200610", + "__cpp_nsdmi=200809", + "__SIZEOF_WINT_T__=4", + "__LONG_LONG_WIDTH__=64", + "__cpp_initializer_lists=200806", + "__FLT32_MAX_EXP__=128", + "__SA_IBIT__=16", + "__ULLACCUM_MIN__=0.0ULLK", + "__cpp_hex_float=201603", + "__GXX_ABI_VERSION=1013", + "__UTA_FBIT__=64", + "__SOFTFP__=1", + "__FLT_MIN_EXP__=(-125)", + "__USFRACT_MAX__=0XFFP-8UHR", + "__UFRACT_IBIT__=0", + "__cpp_lambdas=200907", + "__INT_FAST64_TYPE__=long long int", + "__FLT64_DENORM_MIN__=4.9406564584124654e-324F64", + "__DBL_MIN__=double(2.2250738585072014e-308L)", + "__FLT32X_EPSILON__=2.2204460492503131e-16F32x", + "__LACCUM_MIN__=(-0X1P31LK-0X1P31LK)", + "__ULLACCUM_FBIT__=32", + "__GXX_TYPEINFO_EQUALITY_INLINE=0", + "__FLT64_MIN_10_EXP__=(-307)", + "__ULLFRACT_EPSILON__=0x1P-64ULLR", + "__USES_INITFINI__=1", + "__DEC128_MIN__=1E-6143DL", + "__REGISTER_PREFIX__", + "__UINT16_MAX__=0xffff", + "__DBL_HAS_DENORM__=1", + "__ACCUM_MIN__=(-0X1P15K-0X1P15K)", + "__SQ_IBIT__=0", + "__FLT32_MIN__=1.1754943508222875e-38F32", + "__UINT8_TYPE__=unsigned char", + "__UHA_FBIT__=8", + "__NO_INLINE__=1", + "__SFRACT_MIN__=(-0.5HR-0.5HR)", + "__UTQ_FBIT__=128", + "__FLT_MANT_DIG__=24", + "__LDBL_DECIMAL_DIG__=17", + "__VERSION__=\"8.3.1 20190703 (release) [gcc-8-branch revision 273027]\"", + "__UINT64_C(c)=c ## ULL", + "__ULLFRACT_FBIT__=64", + "__cpp_unicode_characters=200704", + "__FRACT_EPSILON__=0x1P-15R", + "__ULACCUM_MIN__=0.0ULK", + "__UDA_FBIT__=32", + "__cpp_decltype_auto=201304", + "__LLACCUM_EPSILON__=0x1P-31LLK", + "__GCC_ATOMIC_INT_LOCK_FREE=1", + "__FLT32_MANT_DIG__=24", + "__FLOAT_WORD_ORDER__=__ORDER_LITTLE_ENDIAN__", + "__USFRACT_MIN__=0.0UHR", + "__ULLACCUM_IBIT__=32", + "__UQQ_IBIT__=0", + "__SCHAR_WIDTH__=8", + "__INT32_C(c)=c ## L", + "__DEC64_EPSILON__=1E-15DD", + "__ORDER_PDP_ENDIAN__=3412", + "__DEC128_MIN_EXP__=(-6142)", + "__UHQ_FBIT__=16", + "__LLACCUM_FBIT__=31", + "__FLT32_MAX_10_EXP__=38", + "__INT_FAST32_TYPE__=int", + "__UINT_LEAST16_TYPE__=short unsigned int", + "__INT16_MAX__=0x7fff", + "__cpp_rtti=199711", + "__SIZE_TYPE__=unsigned int", + "__UINT64_MAX__=0xffffffffffffffffULL", + "__UDQ_FBIT__=64", + "__INT8_TYPE__=signed char", + "__cpp_digit_separators=201309", + "__ELF__=1", + "__ULFRACT_EPSILON__=0x1P-32ULR", + "__LLFRACT_FBIT__=63", + "__FLT_RADIX__=2", + "__INT_LEAST16_TYPE__=short int", + "__LDBL_EPSILON__=2.2204460492503131e-16L", + "__UINTMAX_C(c)=c ## ULL", + "__SACCUM_MAX__=0X7FFFP-7HK", + "__SIG_ATOMIC_MAX__=0x7fffffff", + "__GCC_ATOMIC_WCHAR_T_LOCK_FREE=1", + "__VFP_FP__=1", + "__SIZEOF_PTRDIFF_T__=4", + "__FLT32X_MANT_DIG__=53", + "__LACCUM_EPSILON__=0x1P-31LK", + "__FLT32X_MIN_EXP__=(-1021)", + "__DEC32_SUBNORMAL_MIN__=0.000001E-95DF", + "__INT_FAST16_MAX__=0x7fffffff", + "__FLT64_DIG__=15", + "__UINT_FAST32_MAX__=0xffffffffU", + "__UINT_LEAST64_TYPE__=long long unsigned int", + "__USACCUM_MAX__=0XFFFFP-8UHK", + "__SFRACT_EPSILON__=0x1P-7HR", + "__FLT_HAS_QUIET_NAN__=1", + "__FLT_MAX_10_EXP__=38", + "__LONG_MAX__=0x7fffffffL", + "__DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL", + "__FLT_HAS_INFINITY__=1", + "__cpp_unicode_literals=200710", + "__USA_FBIT__=16", + "__UINT_FAST16_TYPE__=unsigned int", + "__DEC64_MAX__=9.999999999999999E384DD", + "__ARM_32BIT_STATE=1", + "__INT_FAST32_WIDTH__=32", + "__CHAR16_TYPE__=short unsigned int", + "__PRAGMA_REDEFINE_EXTNAME=1", + "__SIZE_WIDTH__=32", + "__INT_LEAST16_MAX__=0x7fff", + "__DEC64_MANT_DIG__=16", + "__INT64_MAX__=0x7fffffffffffffffLL", + "__UINT_LEAST32_MAX__=0xffffffffUL", + "__SACCUM_FBIT__=7", + "__FLT32_DENORM_MIN__=1.4012984643248171e-45F32", + "__GCC_ATOMIC_LONG_LOCK_FREE=1", + "__SIG_ATOMIC_WIDTH__=32", + "__INT_LEAST64_TYPE__=long long int", + "__INT16_TYPE__=short int", + "__INT_LEAST8_TYPE__=signed char", + "__SQ_FBIT__=31", + "__DEC32_MAX_EXP__=97", + "__ARM_ARCH_ISA_THUMB=1", + "__INT_FAST8_MAX__=0x7fffffff", + "__ARM_ARCH=4", + "__INTPTR_MAX__=0x7fffffff", + "__cpp_sized_deallocation=201309", + "__QQ_FBIT__=7", + "__cpp_range_based_for=200907", + "__UTA_IBIT__=64", + "__FLT64_HAS_QUIET_NAN__=1", + "__FLT32_MIN_10_EXP__=(-37)", + "__EXCEPTIONS=1", + "__LDBL_MANT_DIG__=53", + "__SFRACT_FBIT__=7", + "__SACCUM_MIN__=(-0X1P7HK-0X1P7HK)", + "__DBL_HAS_QUIET_NAN__=1", + "__FLT64_HAS_INFINITY__=1", + "__SIG_ATOMIC_MIN__=(-__SIG_ATOMIC_MAX__ - 1)", + "__cpp_return_type_deduction=201304", + "__INTPTR_TYPE__=int", + "__UINT16_TYPE__=short unsigned int", + "__WCHAR_TYPE__=unsigned int", + "__SIZEOF_FLOAT__=4", + "__USQ_FBIT__=32", + "__UINTPTR_MAX__=0xffffffffU", + "__INT_FAST64_WIDTH__=64", + "__DEC64_MIN_EXP__=(-382)", + "__cpp_decltype=200707", + "__FLT32_DECIMAL_DIG__=9", + "__INT_FAST64_MAX__=0x7fffffffffffffffLL", + "__GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1", + "__FLT_DIG__=6", + "__UINT_FAST64_TYPE__=long long unsigned int", + "__INT_MAX__=0x7fffffff", + "__LACCUM_FBIT__=31", + "__USACCUM_MIN__=0.0UHK", + "__UHA_IBIT__=8", + "__INT64_TYPE__=long long int", + "__FLT_MAX_EXP__=128", + "__UTQ_IBIT__=0", + "__DBL_MANT_DIG__=53", + "__cpp_inheriting_constructors=201511", + "__INT_LEAST64_MAX__=0x7fffffffffffffffLL", + "__DEC64_MIN__=1E-383DD", + "__WINT_TYPE__=unsigned int", + "__UINT_LEAST32_TYPE__=long unsigned int", + "__SIZEOF_SHORT__=2", + "__ULLFRACT_IBIT__=0", + "__LDBL_MIN_EXP__=(-1021)", + "__arm__=1", + "__FLT64_MAX__=1.7976931348623157e+308F64", + "__UDA_IBIT__=32", + "__WINT_WIDTH__=32", + "__INT_LEAST8_MAX__=0x7f", + "__FLT32X_MAX_10_EXP__=308", + "__LFRACT_FBIT__=31", + "__WCHAR_UNSIGNED__=1", + "__LDBL_MAX_10_EXP__=308", + "__ATOMIC_RELAXED=0", + "__DBL_EPSILON__=double(2.2204460492503131e-16L)", + "__UINT8_C(c)=c", + "__FLT64_MAX_EXP__=1024", + "__INT_LEAST32_TYPE__=long int", + "__SIZEOF_WCHAR_T__=4", + "__LLFRACT_MAX__=0X7FFFFFFFFFFFFFFFP-63LLR", + "__TQ_FBIT__=127", + "__INT_FAST8_TYPE__=int", + "__ULLACCUM_EPSILON__=0x1P-32ULLK", + "__UHQ_IBIT__=0", + "__ARM_FEATURE_COPROC=1", + "__LLACCUM_IBIT__=32", + "__FLT64_HAS_DENORM__=1", + "__FLT32_EPSILON__=1.1920928955078125e-7F32", + "__DBL_DECIMAL_DIG__=17", + "__STDC_UTF_32__=1", + "__INT_FAST8_WIDTH__=32", + "__DEC_EVAL_METHOD__=2", + "__FLT32X_MAX__=1.7976931348623157e+308F32x", + "__TA_FBIT__=63", + "__UDQ_IBIT__=0", + "__ORDER_BIG_ENDIAN__=4321", + "__cpp_runtime_arrays=198712", + "__UINT64_TYPE__=long long unsigned int", + "__ACCUM_EPSILON__=0x1P-15K", + "__UINT32_C(c)=c ## UL", + "__INTMAX_MAX__=0x7fffffffffffffffLL", + "__cpp_alias_templates=200704", + "__BYTE_ORDER__=__ORDER_LITTLE_ENDIAN__", + "__FLT_DENORM_MIN__=1.4012984643248171e-45F", + "__LLFRACT_IBIT__=0", + "__INT8_MAX__=0x7f", + "__LONG_WIDTH__=32", + "__UINT_FAST32_TYPE__=unsigned int", + "__CHAR32_TYPE__=long unsigned int", + "__FLT_MAX__=3.4028234663852886e+38F", + "__cpp_constexpr=201304", + "__USACCUM_FBIT__=8", + "__INT32_TYPE__=long int", + "__SIZEOF_DOUBLE__=8", + "__cpp_exceptions=199711", + "__FLT_MIN_10_EXP__=(-37)", + "__UFRACT_EPSILON__=0x1P-16UR", + "__FLT64_MIN__=2.2250738585072014e-308F64", + "__INT_LEAST32_WIDTH__=32", + "__INTMAX_TYPE__=long long int", + "__DEC128_MAX_EXP__=6145", + "__FLT32X_HAS_QUIET_NAN__=1", + "__ATOMIC_CONSUME=1", + "__GNUC_MINOR__=3", + "__INT_FAST16_WIDTH__=32", + "__UINTMAX_MAX__=0xffffffffffffffffULL", + "__DEC32_MANT_DIG__=7", + "__FLT32X_DENORM_MIN__=4.9406564584124654e-324F32x", + "__HA_FBIT__=7", + "__DBL_MAX_10_EXP__=308", + "__LDBL_DENORM_MIN__=4.9406564584124654e-324L", + "__INT16_C(c)=c", + "__cpp_generic_lambdas=201304", + "__STDC__=1", + "__ARM_ARCH_4T__=1", + "__FLT32X_DIG__=15", + "__PTRDIFF_TYPE__=int", + "__LLFRACT_MIN__=(-0.5LLR-0.5LLR)", + "__ATOMIC_SEQ_CST=5", + "__DA_FBIT__=31", + "__UINT32_TYPE__=long unsigned int", + "__FLT32X_MIN_10_EXP__=(-307)", + "__UINTPTR_TYPE__=unsigned int", + "__USA_IBIT__=16", + "__DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD", + "__ARM_EABI__=1", + "__DEC128_MANT_DIG__=34", + "__LDBL_MIN_10_EXP__=(-307)", + "__SIZEOF_LONG_LONG__=8", + "__ULACCUM_EPSILON__=0x1P-32ULK", + "__cpp_user_defined_literals=200809", + "__SACCUM_IBIT__=8", + "__GCC_ATOMIC_LLONG_LOCK_FREE=1", + "__FLT32X_MIN__=2.2250738585072014e-308F32x", + "__LDBL_DIG__=15", + "__FLT_DECIMAL_DIG__=9", + "__UINT_FAST16_MAX__=0xffffffffU", + "__GCC_ATOMIC_SHORT_LOCK_FREE=1", + "__INT_LEAST64_WIDTH__=64", + "__ULLFRACT_MAX__=0XFFFFFFFFFFFFFFFFP-64ULLR", + "__UINT_FAST8_TYPE__=unsigned int", + "__USFRACT_EPSILON__=0x1P-8UHR", + "__ULACCUM_FBIT__=32", + "__QQ_IBIT__=0", + "__cpp_init_captures=201304", + "__ATOMIC_ACQ_REL=4", + "__ATOMIC_RELEASE=3", + "USBCON" + ] + //"compileCommands": "${workspaceFolder}/Multiprotocol/build/vscode/compile_commands.json" + } + ] +} \ No newline at end of file diff --git a/Multiprotocol/DSM_Rx_cyrf6936.ino b/Multiprotocol/DSM_Rx_cyrf6936.ino index 68a2c51..0fa29b3 100644 --- a/Multiprotocol/DSM_Rx_cyrf6936.ino +++ b/Multiprotocol/DSM_Rx_cyrf6936.ino @@ -214,6 +214,15 @@ uint16_t DSM_RX_callback() uint8_t rx_status; static uint8_t read_retry=0; + if(sub_protocol == DSM_ERASE) + { + if(packet_count) + packet_count--; + else + BIND_DONE; + return 10000; // Nothing to do... + } + switch (phase) { case DSM_RX_BIND1: @@ -240,6 +249,10 @@ uint16_t DSM_RX_callback() { // store tx info into eeprom uint16_t temp = DSM_RX_EEPROM_OFFSET; + if (sub_protocol==DSM_CLONE) + { + temp = DSM_CLONE_EEPROM_OFFSET; + } debug("ID="); for(uint8_t i=0;i<4;i++) { @@ -261,11 +274,11 @@ uint16_t DSM_RX_callback() &0xF0 => false=1024, true=2048 */ DSM_rx_type=packet_in[12]; debugln(", num_ch=%d, type=%02X",num_ch, DSM_rx_type); - if(sub_protocol==DSM_CLONE) - { - debugln("Collecting TX MfgId"); - } eeprom_write_byte((EE_ADDR)temp, DSM_rx_type); + if (sub_protocol==DSM_CLONE) + { + eeprom_write_byte((EE_ADDR)++temp, num_ch); + } CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20); // Abort RX operation CYRF_SetTxRxMode(TX_EN); // Force end state TX CYRF_ConfigDataCode((const uint8_t *)"\x98\x88\x1B\xE4\x30\x79\x03\x84", 16); @@ -474,12 +487,31 @@ void DSM_RX_init() if (IS_BIND_IN_PROGRESS) { - packet_count=0; - phase = DSM_RX_BIND1; + if(sub_protocol == DSM_ERASE) + { + // Clear all cloned addresses + uint16_t addr = DSM_CLONE_EEPROM_OFFSET; + for(uint8_t i=0; i<7; i++) + { + eeprom_write_byte((EE_ADDR)(addr++), 0xFF); + } + packet_count = 100; + } + else + { + packet_count=0; + phase = DSM_RX_BIND1; + } } else { + uint16_t temp = DSM_RX_EEPROM_OFFSET; + if (sub_protocol==DSM_CLONE) + { + temp = DSM_CLONE_EEPROM_OFFSET; + } + debug("ID="); for(uint8_t i=0;i<4;i++) { @@ -488,6 +520,12 @@ void DSM_RX_init() } DSM_rx_type=eeprom_read_byte((EE_ADDR)temp); debugln(", type=%02X", DSM_rx_type); + if (sub_protocol==DSM_CLONE) + { + num_ch=eeprom_read_byte((EE_ADDR)++temp); + debugln(", channels=%02", num_ch); + } + phase = DSM_RX_DATA_PREP; } } diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index ce3975c..8db33f5 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -829,7 +829,8 @@ enum { #define FRSKYX2_CLONE_EEPROM_OFFSET 873 // (1) format + (3) TX ID, 4 bytes, end is 877 #define DSM_RX_EEPROM_OFFSET 877 // (4) TX ID + format, 5 bytes, end is 882 #define MOULDKG_EEPROM_OFFSET 882 // RX ID, 3 bytes per model, end is 882+64*3=1074 -//#define CONFIG_EEPROM_OFFSET 1074 // Current configuration of the multimodule +#define DSM_CLONE_EEPROM_OFFSET 1074 // (4) TX ID, (1) RX type, (1) No of channels, end is 1090 +//#define CONFIG_EEPROM_OFFSET 1090 // Current configuration of the multimodule /* STM32 Flash Size */ #ifndef DISABLE_FLASH_SIZE_CHECK diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 4f767b2..7e0a227 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -379,7 +379,7 @@ /*************************/ //In this section you can configure all details about PPM. //If you do not plan to use the PPM mode comment this line using "//" to save Flash space, you don't need to configure anything below in this case -#define ENABLE_PPM +//#define ENABLE_PPM /** TX END POINTS **/ //It is important for the module to know the endpoints of your radio.