Cleanup - remove unused defines. (#4353)

* Cleanup - remove unused defines.

There were a number of defined variables that were carried over
from old code. - Removed.
Also a typo. - Fixed fix.
Also duplicate definitions of the number of seconds in a day.
-deduplicated.

* Cleanup - remove unused defines.

There were a number of defined variables that were carried over
from old code. - Removed.
Also a typo. - Fixed fix.
Also duplicate definitions of the number of seconds in a day.
-deduplicated.

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
This commit is contained in:
Tom Fifield 2024-07-31 19:56:06 +08:00 committed by GitHub
parent 848b9773b9
commit 103ab0c242
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 4 additions and 19 deletions

View File

@ -13,7 +13,7 @@
#endif #endif
#ifndef BUTTON_TOUCH_MS #ifndef BUTTON_TOUCH_MS
#define BUTTON_TOCH_MS 400 #define BUTTON_TOUCH_MS 400
#endif #endif
class ButtonThread : public concurrency::OSThread class ButtonThread : public concurrency::OSThread

View File

@ -52,10 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Configuration // Configuration
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// If we are using the JTAG port for debugging, some pins must be left free for that (and things like GPS have to be disabled)
// we don't support jtag on the ttgo - access to gpio 12 is a PITA
#define REQUIRE_RADIO true // If true, we will fail to start if the radio is not found
/// Convert a preprocessor name into a quoted string /// Convert a preprocessor name into a quoted string
#define xstr(s) ystr(s) #define xstr(s) ystr(s)
#define ystr(s) #s #define ystr(s) #s

View File

@ -43,4 +43,4 @@ time_t gm_mktime(struct tm *tm);
#define SEC_PER_DAY 86400 #define SEC_PER_DAY 86400
#define SEC_PER_HOUR 3600 #define SEC_PER_HOUR 3600
#define SEC_PER_MIN 60 #define SEC_PER_MIN 60

View File

@ -204,9 +204,6 @@ extern NodeDB *nodeDB;
prefs.is_power_saving = True prefs.is_power_saving = True
*/ */
// Our delay functions check for this for times that should never expire
#define NODE_DELAY_FOREVER 0xffffffff
/// Sometimes we will have Position objects that only have a time, so check for /// Sometimes we will have Position objects that only have a time, so check for
/// valid lat/lon /// valid lat/lon
static inline bool hasValidPosition(const meshtastic_NodeInfoLite *n) static inline bool hasValidPosition(const meshtastic_NodeInfoLite *n)
@ -231,4 +228,4 @@ extern uint32_t error_address;
ModuleConfig_RangeTestConfig_size + ModuleConfig_SerialConfig_size + ModuleConfig_StoreForwardConfig_size + \ ModuleConfig_RangeTestConfig_size + ModuleConfig_SerialConfig_size + ModuleConfig_StoreForwardConfig_size + \
ModuleConfig_TelemetryConfig_size + ModuleConfig_size) ModuleConfig_TelemetryConfig_size + ModuleConfig_size)
// Please do not remove this comment, it makes trunk and compiler happy at the same time. // Please do not remove this comment, it makes trunk and compiler happy at the same time.

View File

@ -16,7 +16,6 @@
// In theory up to 27 dBm is possible, but the modules installed in most radios can cope with a max of 20. So BIG WARNING // In theory up to 27 dBm is possible, but the modules installed in most radios can cope with a max of 20. So BIG WARNING
// if you set power to something higher than 17 or 20 you might fry your board. // if you set power to something higher than 17 or 20 you might fry your board.
#define POWER_DEFAULT 17 // How much power to use if the user hasn't set a power level
#ifdef RADIOMASTER_900_BANDIT_NANO #ifdef RADIOMASTER_900_BANDIT_NANO
// Structure to hold DAC and DB values // Structure to hold DAC and DB values
typedef struct { typedef struct {

View File

@ -177,9 +177,6 @@ The band is from 902 to 928 MHz. It mentions channel number and its respective c
separated by 2.16 MHz with respect to the adjacent channels. Channel zero starts at 903.08 MHz center frequency. separated by 2.16 MHz with respect to the adjacent channels. Channel zero starts at 903.08 MHz center frequency.
*/ */
// 1kb was too small
#define RADIO_STACK_SIZE 4096
/** /**
* Calculate airtime per * Calculate airtime per
* https://www.rs-online.com/designspark/rel-assets/ds-assets/uploads/knowledge-items/application-notes-for-the-internet-of-things/LoRa%20Design%20Guide.pdf * https://www.rs-online.com/designspark/rel-assets/ds-assets/uploads/knowledge-items/application-notes-for-the-internet-of-things/LoRa%20Design%20Guide.pdf

View File

@ -27,10 +27,6 @@ RangeTestModule::RangeTestModule() : concurrency::OSThread("RangeTestModule") {}
uint32_t packetSequence = 0; uint32_t packetSequence = 0;
#define SEC_PER_DAY 86400
#define SEC_PER_HOUR 3600
#define SEC_PER_MIN 60
int32_t RangeTestModule::runOnce() int32_t RangeTestModule::runOnce()
{ {
#if defined(ARCH_ESP32) || defined(ARCH_NRF52) #if defined(ARCH_ESP32) || defined(ARCH_NRF52)
@ -295,4 +291,4 @@ bool RangeTestModuleRadio::appendFile(const meshtastic_MeshPacket &mp)
#endif #endif
return 1; return 1;
} }