PWM_fan: Use direct source UM reference

Identify and select the source usermod at build time; no need for
runtime lookup.

Author: willmmiles

usermods/PWM_fan/PWM_fan.cpp

@@ -44,12 +44,6 @@ class PWMFanUsermod : public Usermod {
     #endif
     bool lockFan = false;
 
-    #ifdef USERMOD_DALLASTEMPERATURE
-    UsermodTemperature* tempUM;
-    #elif defined(USERMOD_SHT)
-    ShtUsermod* tempUM;
-    #endif
-
     // configurable parameters
     int8_t  tachoPin          = TACHO_PIN;
     int8_t  pwmPin            = PWM_PIN;
@@ -158,11 +152,11 @@ class PWMFanUsermod : public Usermod {
     }
 
     float getActualTemperature(void) {
-      #if defined(USERMOD_DALLASTEMPERATURE) || defined(USERMOD_SHT)
-      if (tempUM != nullptr)
-        return tempUM->getTemperatureC();
+      #if defined(USERMOD_DALLASTEMPERATURE)
+      return temperature_mod.getTemperatureC();
+      #elif defined(USERMOD_SHT)
+      return sht_mod.getTemperatureC();
       #endif
-      return -127.0f;
     }
 
     void setFanPWMbasedOnTemperature(void) {
@@ -193,12 +187,6 @@ class PWMFanUsermod : public Usermod {
     // gets called once at boot. Do all initialization that doesn't depend on
     // network here
     void setup() override {
-      #ifdef USERMOD_DALLASTEMPERATURE   
-      // This Usermod requires Temperature usermod
-      tempUM = (UsermodTemperature*) UsermodManager::lookup(USERMOD_ID_TEMPERATURE);
-      #elif defined(USERMOD_SHT)
-      tempUM = (ShtUsermod*) UsermodManager::lookup(USERMOD_ID_SHT);
-      #endif
       initTacho();
       initPWMfan();
       updateFanSpeed((minPWMValuePct * 255) / 100); // inital fan speed

usermods/Temperature/Temperature.cpp

@@ -354,8 +354,6 @@ const char *UsermodTemperature::getTemperatureUnit() {
   return degC ? "°C" : "°F";
 }
 
-UsermodTemperature* UsermodTemperature::_instance = nullptr;
-
 // strings to reduce flash memory usage (used more than twice)
 const char UsermodTemperature::_name[]         PROGMEM = "Temperature";
 const char UsermodTemperature::_enabled[]      PROGMEM = "enabled";
@@ -372,12 +370,12 @@ const char UsermodTemperature::_data_fx[]      PROGMEM = "Temperature@Min,Max;;!
 static uint16_t mode_temperature() {
   float low  = roundf(mapf((float)SEGMENT.speed, 0.f, 255.f, -150.f, 150.f));    // default: 15°C, range: -15°C to 15°C
   float high = roundf(mapf((float)SEGMENT.intensity, 0.f, 255.f, 300.f, 600.f));  // default: 30°C, range 30°C to 60°C
-  float temp = constrain(UsermodTemperature::getInstance()->getTemperatureC()*10.f, low, high);   // get a little better resolution (*10)
+  float temp = constrain(temperature_mod.getTemperatureC()*10.f, low, high);   // get a little better resolution (*10)
   unsigned i = map(roundf(temp), (unsigned)low, (unsigned)high, 0, 248);
   SEGMENT.fill(SEGMENT.color_from_palette(i, false, false, 255));
   return FRAMETIME;
 }
 
 
-static UsermodTemperature temperature;
-REGISTER_USERMOD(temperature);
+UsermodTemperature temperature_mod;
+REGISTER_USERMOD(temperature_mod);

usermods/Temperature/UsermodTemperature.h

@@ -72,12 +72,9 @@ class UsermodTemperature : public Usermod {
     void publishHomeAssistantAutodiscovery();
 #endif
 
-    static UsermodTemperature* _instance; // to overcome nonstatic getTemperatureC() method and avoid UsermodManager::lookup(USERMOD_ID_TEMPERATURE);
-
   public:
 
-    UsermodTemperature() { _instance = this; }
-    static UsermodTemperature *getInstance() { return UsermodTemperature::_instance; }
+    UsermodTemperature() {  }
 
     /*
      * API calls te enable data exchange between WLED modules
@@ -108,3 +105,4 @@ class UsermodTemperature : public Usermod {
     void appendConfigData() override;
 };
 
+extern UsermodTemperature temperature_mod;

usermods/sht/ShtUsermod.h

@@ -69,3 +69,5 @@ class ShtUsermod : public Usermod
 
     uint16_t getId() { return USERMOD_ID_SHT; }
 };
+
+extern ShtUsermod sht_mod;

usermods/sht/sht.cpp

@@ -411,5 +411,5 @@ const char* ShtUsermod::getUnitString() {
   return unitOfTemp ? "°F" : "°C";
 }
 
-static ShtUsermod sht;
-REGISTER_USERMOD(sht);
+ShtUsermod sht_mod;
+REGISTER_USERMOD(sht_mod);