Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Weather size fix (#2211)

Browse Source 
* Shrink weather size

* fix compiler warning
This commit is contained in:
Totoo 2024-07-29 10:46:45 +02:00 committed by GitHub
parent 765e3be55b
commit 05146638fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
firmware/baseband/fprotos/weatherprotos.hpp
View File

@ -38,37 +38,48 @@ So include here the .hpp, and add a new element to the protos vector in the cons
class WeatherProtos : public FProtoListGeneral { class WeatherProtos : public FProtoListGeneral {
public: public:
WeatherProtos(const WeatherProtos&) { WeatherProtos(); }; // won't use, but makes compiler happy
WeatherProtos& operator=(const WeatherProtos&) { return *this; } // won't use, but makes compiler happy
WeatherProtos() { WeatherProtos() {
// add protos // add protos
protos.push_back(std::make_unique<FProtoWeatherNexusTH>()); // 1 protos[FPW_NexusTH] = new FProtoWeatherNexusTH();
protos.push_back(std::make_unique<FProtoWeatherAcurite592TXR>()); // 2 protos[FPW_Acurite592TXR] = new FProtoWeatherAcurite592TXR();
protos.push_back(std::make_unique<FProtoWeatherAcurite606TX>()); // 3 protos[FPW_Acurite606TX] = new FProtoWeatherAcurite606TX();
protos.push_back(std::make_unique<FProtoWeatherAcurite609TX>()); // 4 protos[FPW_Acurite609TX] = new FProtoWeatherAcurite609TX();
protos.push_back(std::make_unique<FProtoWeatherAmbient>()); // 5 protos[FPW_Ambient] = new FProtoWeatherAmbient();
protos.push_back(std::make_unique<FProtoWeatherAuriolAhfl>()); // 6 protos[FPW_AuriolAhfl] = new FProtoWeatherAuriolAhfl();
protos.push_back(std::make_unique<FProtoWeatherAuriolTh>()); // 7 protos[FPW_AuriolTH] = new FProtoWeatherAuriolTh();
protos.push_back(std::make_unique<FProtoWeatherGTWT02>()); // 8 protos[FPW_GTWT02] = new FProtoWeatherGTWT02();
protos.push_back(std::make_unique<FProtoWeatherGTWT03>()); // 9 protos[FPW_GTWT03] = new FProtoWeatherGTWT03();
protos.push_back(std::make_unique<FProtoWeatherInfactory>()); // 10 protos[FPW_INFACTORY] = new FProtoWeatherInfactory();
protos.push_back(std::make_unique<FProtoWeatherLaCrosseTx>()); // 11 protos[FPW_LACROSSETX] = new FProtoWeatherLaCrosseTx();
protos.push_back(std::make_unique<FProtoWeatherLaCrosseTx141thbv2>()); // 12 protos[FPW_LACROSSETX141thbv2] = new FProtoWeatherLaCrosseTx141thbv2();
protos.push_back(std::make_unique<FProtoWeatherOregon2>()); // 13 protos[FPW_OREGON2] = new FProtoWeatherOregon2();
protos.push_back(std::make_unique<FProtoWeatherOregon3>()); // 14 protos[FPW_OREGON3] = new FProtoWeatherOregon3();
protos.push_back(std::make_unique<FProtoWeatherOregonV1>()); // 15 protos[FPW_OREGONv1] = new FProtoWeatherOregonV1();
protos.push_back(std::make_unique<FProtoWeatherThermoProTx4>()); // 16 protos[FPW_THERMOPROTX4] = new FProtoWeatherThermoProTx4();
protos.push_back(std::make_unique<FProtoWeatherTX8300>()); // 17 protos[FPW_TX_8300] = new FProtoWeatherTX8300();
protos.push_back(std::make_unique<FProtoWeatherWendoxW6726>()); // 18 protos[FPW_WENDOX_W6726] = new FProtoWeatherWendoxW6726();
protos.push_back(std::make_unique<FProtoWeatherAcurite986>()); // 19 protos[FPW_Acurite986] = new FProtoWeatherAcurite986();
protos.push_back(std::make_unique<FProtoWeatherKedsum>()); // 20 protos[FPW_KEDSUM] = new FProtoWeatherKedsum();
protos.push_back(std::make_unique<FProtoWeatherAcurite5in1>()); // 21 protos[FPW_Acurite5in1] = new FProtoWeatherAcurite5in1();
protos.push_back(std::make_unique<FProtoWeatherEmosE601x>()); // 22 protos[FPW_EmosE601x] = new FProtoWeatherEmosE601x();
// set callback for them // set callback for them
for (const auto& obj : protos) { for (uint8_t i = 0; i < FPW_COUNT; ++i) {
obj->setCallback(callbackTarget); protos[i]->setCallback(callbackTarget);
} }
} }
~WeatherProtos() { // not needed for current operation logic, but a bit more elegant :)
for (uint8_t i = 0; i < FPW_COUNT; ++i) {
if (protos[i] != NULL) {
free(protos[i]);
protos[i] = NULL;
}
}
};
static void callbackTarget(FProtoWeatherBase* instance) { static void callbackTarget(FProtoWeatherBase* instance) {
WeatherDataMessage packet_message{instance->getSensorType(), instance->getSensorId(), WeatherDataMessage packet_message{instance->getSensorType(), instance->getSensorId(),
instance->getTemp(), instance->getHumidity(), instance->getBattLow(), instance->getTemp(), instance->getHumidity(), instance->getBattLow(),
@ -77,13 +88,13 @@ class WeatherProtos : public FProtoListGeneral {
} }
void feed(bool level, uint32_t duration) { void feed(bool level, uint32_t duration) {
for (const auto& obj : protos) { for (uint8_t i = 0; i < FPW_COUNT; ++i) {
obj->feed(level, duration); if (protos[i] != NULL) protos[i]->feed(level, duration);
} }
} }
protected: protected:
std::vector<std::unique_ptr<FProtoWeatherBase>> protos{}; FProtoWeatherBase* protos[FPW_COUNT] = {NULL};
}; };
#endif #endif

4
firmware/baseband/fprotos/weathertypes.hpp
View File

@ -37,8 +37,8 @@ enum FPROTO_WEATHER_SENSOR {
FPW_Acurite986 = 19, FPW_Acurite986 = 19,
FPW_KEDSUM = 20, FPW_KEDSUM = 20,
FPW_Acurite5in1 = 21, FPW_Acurite5in1 = 21,
FPW_EmosE601x = 22 FPW_EmosE601x = 22,
FPW_COUNT // this must be the last
}; };
#endif #endif