[STM32] an optimization of internal flash memory usage

Author: lyusupov

software/firmware/source/SoftRF/src/driver/GNSS.cpp

@@ -558,6 +558,7 @@ static byte ublox_version() {
             // uBlox 7  - page 153 : https://www.u-blox.com/sites/default/files/products/documents/u-blox7-V14_ReceiverDescriptionProtocolSpec_%28GPS.G7-SW-12001%29_Public.pdf
             // uBlox M8 - page 300 : https://www.u-blox.com/sites/default/files/products/documents/u-blox8-M8_ReceiverDescrProtSpec_%28UBX-13003221%29_Public.pdf
 
+#if !defined(EXCLUDE_LOG_GNSS_VERSION)
             Serial.print(F("INFO: GNSS module HW version: "));
             Serial.println((char *) &GNSSbuf[30]);
 
@@ -570,6 +571,7 @@ static byte ublox_version() {
               Serial.println((char *) &GNSSbuf[i]);
             }
 #endif
+#endif /* EXCLUDE_LOG_GNSS_VERSION */
 
             if (GNSSbuf[33] == '4')
               rval = GNSS_MODULE_U6;

software/firmware/source/SoftRF/src/driver/radio/radiolib.cpp

@@ -5259,6 +5259,7 @@ static void lr20xx_setup()
   float br, fdev, bw;
   switch (rl_protocol->modulation_type)
   {
+#if !defined(EXCLUDE_FANET) || defined(ENABLE_PROL)
   case RF_MODULATION_TYPE_LORA:
 #if RADIOLIB_DEBUG_BASIC
     Serial.print(F("[LR20XX] Initializing LoRa ... "));
@@ -5323,7 +5324,9 @@ static void lr20xx_setup()
     rl_state = radio_g4->explicitHeader();
     rl_state = radio_g4->setCRC(true);
     break;
+#endif /* EXCLUDE_FANET */
 
+#if !defined(EXCLUDE_ES1090)
   case RF_MODULATION_TYPE_PPM:
 #if RADIOLIB_DEBUG_BASIC
     Serial.print(F("[LR20XX] Initializing OOK ... "));
@@ -5444,6 +5447,7 @@ static void lr20xx_setup()
 
     rl_state = radio_g4->setOokDetectionThreshold(-80); /* TODO */
     break;
+#endif /* EXCLUDE_ES1090 */
 
   case RF_MODULATION_TYPE_2FSK:
   default:

software/firmware/source/SoftRF/src/platform/STM32.cpp

@@ -337,8 +337,12 @@ static void STM32_setup()
     hw_info.model = SOFTRF_MODEL_RETRO;
 
 #if !defined(ARDUINO_WisDuo_RAK3172_Evaluation_Board)
+#if !defined(EXCLUDE_BMP180)    || !defined(EXCLUDE_BMP280)    || \
+    !defined(EXCLUDE_BME680)    || !defined(EXCLUDE_BME280AUX) || \
+    !defined(EXCLUDE_MPL3115A2) || defined(USE_OLED)
     Wire.setSCL(SOC_GPIO_PIN_SCL);
     Wire.setSDA(SOC_GPIO_PIN_SDA);
+#endif
 #endif /* ARDUINO_WisDuo_RAK3172_Evaluation_Board */
 
 #if defined(ARDUINO_NUCLEO_L073RZ)
@@ -418,10 +422,6 @@ static void STM32_setup()
     stm32_board   = STM32_EBYTE_E80_900MBL_02;
     hw_info.model = SOFTRF_MODEL_RETRO_MK2;
 
-#if defined(EXCLUDE_BMP280) && !defined(USE_OLED)
-    Wire.begin();
-#endif /* BMP280 */
-
     if (STM32_probe_pin(SOC_GPIO_PIN_MODE_SW, INPUT_PULLUP) == LOW) {
       STM32_enforce_uav_mode = true;
     }
@@ -951,7 +951,12 @@ static void STM32_fini(int reason)
 #endif /* GENERIC_WL55CCUX || BLUEPILL_F103CB */
 
   Serial_GNSS_In.end();
+
+#if !defined(EXCLUDE_BMP180)    || !defined(EXCLUDE_BMP280)    || \
+    !defined(EXCLUDE_BME680)    || !defined(EXCLUDE_BME280AUX) || \
+    !defined(EXCLUDE_MPL3115A2) || defined(USE_OLED)
   Wire.end();
+#endif
 
 #if !defined(ARDUINO_WisDuo_RAK3172_Evaluation_Board)
   pinMode(SOC_GPIO_PIN_SDA,  INPUT_ANALOG);

software/firmware/source/SoftRF/src/platform/STM32.h

@@ -325,12 +325,12 @@ typedef struct stm32_backup_struct {
 #define EXCLUDE_LR11XX
 
 //#define EXCLUDE_LR20XX
-#define EXCLUDE_OGNTP
+//#define EXCLUDE_OGNTP
 #define EXCLUDE_P3I
-#define EXCLUDE_FANET
+//#define EXCLUDE_FANET
 //#define EXCLUDE_ES1090
 #define EXCLUDE_UAT978
-//#define ENABLE_ADSL
+#define ENABLE_ADSL
 
 #define EXCLUDE_CC1101
 #define EXCLUDE_SI443X
@@ -340,6 +340,12 @@ typedef struct stm32_backup_struct {
 
 #define USE_TIME_SLOTS
 
+/* trade performance for flash memory usage (-4 Kb) */
+#define cosf(x)                 cos  ((double) (x))
+#define sinf(x)                 sin  ((double) (x))
+//#define sqrtf(x)              sqrt ((double) (x))
+//#define atan2f(y,x)           atan2((double) (y), (double) (x))
+
 #endif /* USBCON */
 
 #elif defined(ARDUINO_GENERIC_WLE5CCUX)

software/firmware/source/libraries/adsb_encoder/adsb_encoder.cpp

@@ -91,6 +91,9 @@ unsigned int modes_crc(unsigned char *buf, size_t  len)
 	return rem;
 }
 
+#if defined(ARDUINO_ARCH_STM32) && defined(ARDUINO_BLUEPILL_F103CB)
+extern "C" int cprNLFunction(double lat);
+#endif /* ARDUINO_BLUEPILL_F103CB */
 
 int    CPR_NL(double lat)
 {
@@ -106,6 +109,9 @@ int    CPR_NL(double lat)
 	return static_cast<int>(floor(2.0*M_PI* 1.0 / (acos(1 - U / (T*T)))));
 #endif
 
+#if defined(ARDUINO_ARCH_STM32) && defined(ARDUINO_BLUEPILL_F103CB)
+	return cprNLFunction(lat);
+#else
 	if (lat < 0) lat = -lat;
 	if (lat < 10.47047130) return 59;
 	if (lat < 14.82817437) return 58;
@@ -166,7 +172,7 @@ int    CPR_NL(double lat)
 	if (lat < 86.53536998) return 3;
 	if (lat < 87.00000000) return 2;
 	else return 1;
-	
+#endif /* ARDUINO_BLUEPILL_F103CB */
 }
 
 int CPR_N(double lat, int odd)