diff --git a/.gitignore b/.gitignore index 0fbc8e6..9736899 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ src/* !src/*/ !src/README.md -src/RTD_PARAM.h \ No newline at end of file +RTD_PARAM.h \ No newline at end of file diff --git a/RFparam/RTD_PARAM.h b/RFparam/RTD_PARAM.h deleted file mode 100644 index 03c74f0..0000000 --- a/RFparam/RTD_PARAM.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#ifndef RTD_PARAM_H -#define RTD_PARAM_H - -namespace rtdRFparam -{ - constexpr uint8_t DST_1 = 0xC2; - constexpr uint8_t DST_2 = 0xA0; - constexpr uint8_t DST_3 = 0x03; - constexpr uint8_t DST_4 = 0xB1; - - constexpr uint8_t POWER = 3; - constexpr uint8_t CHANNEL = 37; - constexpr uint8_t RF_BAND = 10; - constexpr uint8_t CS_MODE = 5; -} - -#endif \ No newline at end of file diff --git a/src/com/ground/ground_setting.h b/src/com/ground/ground_setting.h new file mode 100644 index 0000000..da17c3c --- /dev/null +++ b/src/com/ground/ground_setting.h @@ -0,0 +1,19 @@ +#pragma once + +#ifndef Ground_Setting +#define Ground_Setting + +#include + +#include + +const int pin920Rx = 18; +const int pin920Tx = 19; +const int pin920Reset = 21; +const int pin920Wakeup = 22; +const int pin920Mode = 23; + +NEC920 nec920; +bool isNec920Setup = false; + +#endif diff --git a/src/com/ground/receive.h b/src/com/ground/receive.h index 07c32aa..fd61c0c 100644 --- a/src/com/ground/receive.h +++ b/src/com/ground/receive.h @@ -7,9 +7,9 @@ #include -#include "../../domain/setting.h" #include "../RFparam/RTD_PARAM.h" #include "com/gimbal/send.h" +#include "ground_setting.h" #define GroundPeriod 1 diff --git a/src/com/ground/send.h b/src/com/ground/send.h index dfe9d28..95465aa 100644 --- a/src/com/ground/send.h +++ b/src/com/ground/send.h @@ -7,9 +7,9 @@ #include -#include "../../domain/setting.h" -#include "../RFparam/RTD_PARAM.h" -#include "domain/setting.h" +// #include "../../domain/setting.h" +// #include "../RFparam/RTD_PARAM.h" +// #include "ground_setting.h" #define GroundSendPeriod 40 diff --git a/src/domain/setting.h b/src/domain/setting.h index b486a3e..249ce52 100644 --- a/src/domain/setting.h +++ b/src/domain/setting.h @@ -20,18 +20,9 @@ #define LEDPIN 18 #define SPIFREQ 5000000 -const int pin920Rx = 18; -const int pin920Tx = 19; -const int pin920Reset = 21; -const int pin920Wakeup = 22; -const int pin920Mode = 23; - SPICREATE::SPICreate SPIC1; SPICREATE::SPICreate SPIC2; -NEC920 nec920; -bool isNec920Setup = false; - uint8_t GroundMode = 0; uint8_t GimbalMode = 0;