diff --git a/src/_P036_FrameOLED.ino b/src/_P036_FrameOLED.ino index 8eaa4dbc10..49dae85e51 100644 --- a/src/_P036_FrameOLED.ino +++ b/src/_P036_FrameOLED.ino @@ -305,7 +305,8 @@ boolean Plugin_036(uint8_t function, struct EventStruct *event, String& string) const int optionValues[] = { static_cast(p036_resolution::pix128x64), static_cast(p036_resolution::pix128x32), - static_cast(p036_resolution::pix64x48) }; + static_cast(p036_resolution::pix64x48), + static_cast(p036_resolution::pix72x40) }; OLedFormSizes(F("size"), optionValues, P036_RESOLUTION, true); } diff --git a/src/src/Helpers/OLed_helper.cpp b/src/src/Helpers/OLed_helper.cpp index 4835ad3664..21ac7b908e 100644 --- a/src/src/Helpers/OLed_helper.cpp +++ b/src/src/Helpers/OLed_helper.cpp @@ -70,7 +70,8 @@ void OLedFormSizes(const __FlashStringHelper *id, const __FlashStringHelper *options3[] = { F("128x64"), F("128x32"), - F("64x48") }; + F("64x48"), + F("72x40") }; FormSelectorOptions selector(NR_ELEMENTS(options3), options3, values); selector.reloadonchange = reloadOnChange; selector.addFormSelector( @@ -128,4 +129,4 @@ bool OLedI2CAddressCheck(uint8_t function, } return success; } -#endif \ No newline at end of file +#endif diff --git a/src/src/PluginStructs/P036_data_struct.cpp b/src/src/PluginStructs/P036_data_struct.cpp index ed50b507d5..fd7cd065bf 100644 --- a/src/src/PluginStructs/P036_data_struct.cpp +++ b/src/src/PluginStructs/P036_data_struct.cpp @@ -173,6 +173,10 @@ constexpr tSizeSettings SizeSettings[] = { { 64, 48, 32, // 64x48 3, // max. line count 32, 10 // WiFi indicator + }, + { 72, 40, 28, // 72x40 + 3, // max. line count + 28, 12 // WiFi indicator } }; @@ -1164,6 +1168,8 @@ tIndividualFontSettings P036_data_struct::CalculateIndividualFontSettings(uint8_ break; case p036_resolution::pix128x32: lSpace = -2; break; + case p036_resolution::pix72x40: lSpace = -1; + break; case p036_resolution::pix64x48: lSpace = -1; break; } @@ -1310,6 +1316,8 @@ tFontSettings P036_data_struct::CalculateFontSettings(uint8_t lDefaultLines) { break; case p036_resolution::pix64x48: result.Space = -1; break; + case p036_resolution::pix72x40: result.Space = -1; + break; } iFontIndex = NR_ELEMENTS(FontSizes) - 1; } diff --git a/src/src/PluginStructs/P036_data_struct.h b/src/src/PluginStructs/P036_data_struct.h index 7f864ef1d9..54cfafffe1 100644 --- a/src/src/PluginStructs/P036_data_struct.h +++ b/src/src/PluginStructs/P036_data_struct.h @@ -188,7 +188,8 @@ enum class eHeaderContent : uint8_t { enum class p036_resolution : uint8_t { pix128x64 = 0u, pix128x32 = 1u, - pix64x48 = 2u + pix64x48 = 2u, + pix72x40 = 3u, }; enum class ePageScrollSpeed : uint8_t {