From f05f1e9d82a4f9020ecabd91ad7e64ac584bda34 Mon Sep 17 00:00:00 2001 From: jgromes Date: Tue, 30 Jun 2020 10:44:22 +0200 Subject: [PATCH] [Si443x] Reworked driver exclusion --- src/modules/Si443x/Si4430.cpp | 3 +++ src/modules/Si443x/Si4430.h | 2 +- src/modules/Si443x/Si4431.cpp | 3 +++ src/modules/Si443x/Si4431.h | 2 +- src/modules/Si443x/Si4432.cpp | 3 +++ src/modules/Si443x/Si4432.h | 2 +- src/modules/Si443x/Si443x.cpp | 3 +++ src/modules/Si443x/Si443x.h | 2 +- 8 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/modules/Si443x/Si4430.cpp b/src/modules/Si443x/Si4430.cpp index c59f1ea7..3f31370c 100644 --- a/src/modules/Si443x/Si4430.cpp +++ b/src/modules/Si443x/Si4430.cpp @@ -1,4 +1,5 @@ #include "Si4430.h" +#if !defined(RADIOLIB_EXCLUDE_SI443X) Si4430::Si4430(Module* mod) : Si4432(mod) { @@ -32,3 +33,5 @@ int16_t Si4430::setOutputPower(int8_t power) { // set output power return(_mod->SPIsetRegValue(SI443X_REG_TX_POWER, (uint8_t)((power + 8) / 3), 2, 0)); } + +#endif diff --git a/src/modules/Si443x/Si4430.h b/src/modules/Si443x/Si4430.h index 7e7f8b36..815ec7ad 100644 --- a/src/modules/Si443x/Si4430.h +++ b/src/modules/Si443x/Si4430.h @@ -1,4 +1,4 @@ -#ifndef _RADIOLIB_SI4430_H +#if !defined(_RADIOLIB_SI4430_H) && !defined(RADIOLIB_EXCLUDE_SI443X) #define _RADIOLIB_SI4430_H #include "../../TypeDef.h" diff --git a/src/modules/Si443x/Si4431.cpp b/src/modules/Si443x/Si4431.cpp index 25c7baf9..54371858 100644 --- a/src/modules/Si443x/Si4431.cpp +++ b/src/modules/Si443x/Si4431.cpp @@ -1,4 +1,5 @@ #include "Si4431.h" +#if !defined(RADIOLIB_EXCLUDE_SI443X) Si4431::Si4431(Module* mod) : Si4432(mod) { @@ -25,3 +26,5 @@ int16_t Si4431::setOutputPower(int8_t power) { // set output power return(_mod->SPIsetRegValue(SI443X_REG_TX_POWER, (uint8_t)((power + 8) / 3), 2, 0)); } + +#endif diff --git a/src/modules/Si443x/Si4431.h b/src/modules/Si443x/Si4431.h index c033bcbd..5f8b3821 100644 --- a/src/modules/Si443x/Si4431.h +++ b/src/modules/Si443x/Si4431.h @@ -1,4 +1,4 @@ -#ifndef _RADIOLIB_SI4431_H +#if !defined(_RADIOLIB_SI4431_H) && !defined(RADIOLIB_EXCLUDE_SI443X) #define _RADIOLIB_SI4431_H #include "../../TypeDef.h" diff --git a/src/modules/Si443x/Si4432.cpp b/src/modules/Si443x/Si4432.cpp index 38d42863..0c9dee43 100644 --- a/src/modules/Si443x/Si4432.cpp +++ b/src/modules/Si443x/Si4432.cpp @@ -1,4 +1,5 @@ #include "Si4432.h" +#if !defined(RADIOLIB_EXCLUDE_SI443X) Si4432::Si4432(Module* mod) : Si443x(mod) { @@ -32,3 +33,5 @@ int16_t Si4432::setOutputPower(int8_t power) { // set output power return(_mod->SPIsetRegValue(SI443X_REG_TX_POWER, (uint8_t)((power + 1) / 3), 2, 0)); } + +#endif diff --git a/src/modules/Si443x/Si4432.h b/src/modules/Si443x/Si4432.h index 01dd92c5..4b1d0af6 100644 --- a/src/modules/Si443x/Si4432.h +++ b/src/modules/Si443x/Si4432.h @@ -1,4 +1,4 @@ -#ifndef _RADIOLIB_SI4432_H +#if !defined(_RADIOLIB_SI4432_H) && !defined(RADIOLIB_EXCLUDE_SI443X) #define _RADIOLIB_SI4432_H #include "../../TypeDef.h" diff --git a/src/modules/Si443x/Si443x.cpp b/src/modules/Si443x/Si443x.cpp index 099fb866..45734b3a 100644 --- a/src/modules/Si443x/Si443x.cpp +++ b/src/modules/Si443x/Si443x.cpp @@ -1,4 +1,5 @@ #include "Si443x.h" +#if !defined(RADIOLIB_EXCLUDE_SI443X) Si443x::Si443x(Module* mod) : PhysicalLayer(SI443X_FREQUENCY_STEP_SIZE, SI443X_MAX_PACKET_LENGTH) { _mod = mod; @@ -689,3 +690,5 @@ int16_t Si443x::directMode() { state = _mod->SPIsetRegValue(SI443X_REG_MODULATION_MODE_CONTROL_2, SI443X_MODULATION_NONE, 1, 0); return(state); } + +#endif diff --git a/src/modules/Si443x/Si443x.h b/src/modules/Si443x/Si443x.h index 1cfd2700..7fbe26b6 100644 --- a/src/modules/Si443x/Si443x.h +++ b/src/modules/Si443x/Si443x.h @@ -1,4 +1,4 @@ -#ifndef _RADIOLIB_SI443X_H +#if !defined(_RADIOLIB_SI443X_H) && !defined(RADIOLIB_EXCLUDE_SI443X) #define _RADIOLIB_SI443X_H #include "../../TypeDef.h"