Skip to content

Add 72x40 display #5546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andbad wants to merge 15 commits into
base: mega
Choose a base branch
from
+19 −6
Open

Add 72x40 display #5546

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
032c480
Update _P036_FrameOLED.ino
andbad May 12, 2026
c3c99dd
Add new display configuration for 72x40 resolution
andbad May 12, 2026
8bb8ce0
Add case for pix72x40 resolution handling
andbad May 12, 2026
6ca21c8
Update p036_resolution enum values
andbad May 12, 2026
dcc1e79
Add new display option '72x40' to OLed_helper
andbad May 12, 2026
f7e285b
Fix enum values for p036_resolution
andbad May 12, 2026
64de797
Reorder resolution options in OLED frame
andbad May 12, 2026
c40cdc8
Fix formatting of optionValues array in FrameOLED
andbad May 12, 2026
30c1118
Reorder display size options in OLed_helper.cpp
andbad May 12, 2026
c77e1f7
Remove and re-add 72x40 resolution configuration
andbad May 12, 2026
48641c7
Merge branch 'letscontrolit:mega' into andbad-72x40
andbad May 13, 2026
3aebc9c
Update OLedFormSizes call to include element count
andbad May 22, 2026
a8c6635
Update OLedFormSizes to use optionsSize parameter
andbad May 22, 2026
b7f74fa
Add default parameters to OLedFormSizes function
andbad May 22, 2026
4d6d2c1
Refactor FormSelectorOptions initialization
andbad May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/_P036_FrameOLED.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,9 @@ boolean Plugin_036(uint8_t function, struct EventStruct *event, String& string)
const int optionValues[] =
{ static_cast<int>(p036_resolution::pix128x64),
static_cast<int>(p036_resolution::pix128x32),
static_cast<int>(p036_resolution::pix64x48) };
OLedFormSizes(F("size"), optionValues, P036_RESOLUTION, true);
static_cast<int>(p036_resolution::pix64x48),
static_cast<int>(p036_resolution::pix72x40) };
OLedFormSizes(F("size"), optionValues, P036_RESOLUTION, NR_ELEMENTS(optionValues), true);
}

OLedFormRotation(F("rotate"), P036_ROTATE);
Expand Down
9 changes: 5 additions & 4 deletions src/src/Helpers/OLed_helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,14 @@ void OLedFormContrast(const __FlashStringHelper *id,
void OLedFormSizes(const __FlashStringHelper *id,
const int *values,
uint8_t selectedIndex,
uint8_t optionsSize,
bool reloadOnChange) {
const __FlashStringHelper *options3[] = {
F("128x64"),
F("128x32"),
F("64x48") };
FormSelectorOptions selector(NR_ELEMENTS(options3), options3, values);
selector.reloadonchange = reloadOnChange;
F("64x48"),
F("72x40") };
FormSelectorOptions selector(optionsSize, options3, values); selector.reloadonchange = reloadOnChange;
Comment thread
andbad marked this conversation as resolved.
Outdated
selector.addFormSelector(
F("Display Size"),
id,
Expand Down Expand Up @@ -128,4 +129,4 @@ bool OLedI2CAddressCheck(uint8_t function,
}
return success;
}
#endif
#endif
1 change: 1 addition & 0 deletions src/src/Helpers/OLed_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ void OLedFormContrast(const __FlashStringHelper *id,
void OLedFormSizes(const __FlashStringHelper *id,
const int *values,
uint8_t selectedIndex,
uint8_t optionsSize = 3,
bool reloadOnChange = false);
void OLedSetContrast(OLEDDisplay *_display,
const uint8_t& OLED_contrast);
Expand Down
8 changes: 8 additions & 0 deletions src/src/PluginStructs/P036_data_struct.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
};

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
3 changes: 2 additions & 1 deletion src/src/PluginStructs/P036_data_struct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ enum class eHeaderContent : uint8_t {
enum class p036_resolution : uint8_t {
pix128x64 = 0u,
pix128x32 = 1u,
pix64x48 = 2u
Comment thread
TD-er marked this conversation as resolved.
pix64x48 = 2u,
pix72x40 = 3u,
};

enum class ePageScrollSpeed : uint8_t {
Expand Down