Add brightness level API to OLED driver (#10772)
* Add brightness level API to OLED driver * Set default brightness to 255
This commit is contained in:
parent
b9ed9d33d3
commit
5cecc1ea1e
4 changed files with 41 additions and 3 deletions
|
@ -140,8 +140,8 @@ void oled_task_user(void) {
|
||||||
|---------------------------|-----------------|--------------------------------------------------------------------------------------------------------------------------|
|
|---------------------------|-----------------|--------------------------------------------------------------------------------------------------------------------------|
|
||||||
|`OLED_DISPLAY_ADDRESS` |`0x3C` |The i2c address of the OLED Display |
|
|`OLED_DISPLAY_ADDRESS` |`0x3C` |The i2c address of the OLED Display |
|
||||||
|`OLED_FONT_H` |`"glcdfont.c"` |The font code file to use for custom fonts |
|
|`OLED_FONT_H` |`"glcdfont.c"` |The font code file to use for custom fonts |
|
||||||
|`OLED_FONT_START` |`0` |The starting characer index for custom fonts |
|
|`OLED_FONT_START` |`0` |The starting character index for custom fonts |
|
||||||
|`OLED_FONT_END` |`223` |The ending characer index for custom fonts |
|
|`OLED_FONT_END` |`223` |The ending character index for custom fonts |
|
||||||
|`OLED_FONT_WIDTH` |`6` |The font width |
|
|`OLED_FONT_WIDTH` |`6` |The font width |
|
||||||
|`OLED_FONT_HEIGHT` |`8` |The font height (untested) |
|
|`OLED_FONT_HEIGHT` |`8` |The font height (untested) |
|
||||||
|`OLED_TIMEOUT` |`60000` |Turns off the OLED screen after 60000ms of keyboard inactivity. Helps reduce OLED Burn-in. Set to 0 to disable. |
|
|`OLED_TIMEOUT` |`60000` |Turns off the OLED screen after 60000ms of keyboard inactivity. Helps reduce OLED Burn-in. Set to 0 to disable. |
|
||||||
|
@ -149,6 +149,7 @@ void oled_task_user(void) {
|
||||||
|`OLED_SCROLL_TIMEOUT_RIGHT`|*Not defined* |Scroll timeout direction is right when defined, left when undefined. |
|
|`OLED_SCROLL_TIMEOUT_RIGHT`|*Not defined* |Scroll timeout direction is right when defined, left when undefined. |
|
||||||
|`OLED_IC` |`OLED_IC_SSD1306`|Set to `OLED_IC_SH1106` if you're using the SH1106 OLED controller. |
|
|`OLED_IC` |`OLED_IC_SSD1306`|Set to `OLED_IC_SH1106` if you're using the SH1106 OLED controller. |
|
||||||
|`OLED_COLUMN_OFFSET` |`0` |(SH1106 only.) Shift output to the right this many pixels.<br />Useful for 128x64 displays centered on a 132x64 SH1106 IC.|
|
|`OLED_COLUMN_OFFSET` |`0` |(SH1106 only.) Shift output to the right this many pixels.<br />Useful for 128x64 displays centered on a 132x64 SH1106 IC.|
|
||||||
|
|`OLED_BRIGHTNESS` |`255` |The default brightness level of the OLED, from 0 to 255. |
|
||||||
|
|
||||||
## 128x64 & Custom sized OLED Displays
|
## 128x64 & Custom sized OLED Displays
|
||||||
|
|
||||||
|
@ -304,6 +305,12 @@ bool oled_off(void);
|
||||||
// not
|
// not
|
||||||
bool is_oled_on(void);
|
bool is_oled_on(void);
|
||||||
|
|
||||||
|
// Sets the brightness level of the display
|
||||||
|
uint8_t oled_set_brightness(uint8_t level);
|
||||||
|
|
||||||
|
// Gets the current brightness level of the display
|
||||||
|
uint8_t oled_get_brightness(void);
|
||||||
|
|
||||||
// Basically it's oled_render, but with timeout management and oled_task_user calling!
|
// Basically it's oled_render, but with timeout management and oled_task_user calling!
|
||||||
void oled_task(void);
|
void oled_task(void);
|
||||||
|
|
||||||
|
|
|
@ -107,6 +107,7 @@ OLED_BLOCK_TYPE oled_dirty = 0;
|
||||||
bool oled_initialized = false;
|
bool oled_initialized = false;
|
||||||
bool oled_active = false;
|
bool oled_active = false;
|
||||||
bool oled_scrolling = false;
|
bool oled_scrolling = false;
|
||||||
|
uint8_t oled_brightness = OLED_BRIGHTNESS;
|
||||||
uint8_t oled_rotation = 0;
|
uint8_t oled_rotation = 0;
|
||||||
uint8_t oled_rotation_width = 0;
|
uint8_t oled_rotation_width = 0;
|
||||||
uint8_t oled_scroll_speed = 0; // this holds the speed after being remapped to ssd1306 internal values
|
uint8_t oled_scroll_speed = 0; // this holds the speed after being remapped to ssd1306 internal values
|
||||||
|
@ -193,7 +194,7 @@ bool oled_init(uint8_t rotation) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static const uint8_t PROGMEM display_setup2[] = {I2C_CMD, COM_PINS, OLED_COM_PINS, CONTRAST, 0x8F, PRE_CHARGE_PERIOD, 0xF1, VCOM_DETECT, 0x40, DISPLAY_ALL_ON_RESUME, NORMAL_DISPLAY, DEACTIVATE_SCROLL, DISPLAY_ON};
|
static const uint8_t PROGMEM display_setup2[] = {I2C_CMD, COM_PINS, OLED_COM_PINS, CONTRAST, OLED_BRIGHTNESS, PRE_CHARGE_PERIOD, 0xF1, VCOM_DETECT, 0x20, DISPLAY_ALL_ON_RESUME, NORMAL_DISPLAY, DEACTIVATE_SCROLL, DISPLAY_ON};
|
||||||
if (I2C_TRANSMIT_P(display_setup2) != I2C_STATUS_SUCCESS) {
|
if (I2C_TRANSMIT_P(display_setup2) != I2C_STATUS_SUCCESS) {
|
||||||
print("display_setup2 failed\n");
|
print("display_setup2 failed\n");
|
||||||
return false;
|
return false;
|
||||||
|
@ -550,6 +551,20 @@ bool oled_off(void) {
|
||||||
|
|
||||||
bool is_oled_on(void) { return oled_active; }
|
bool is_oled_on(void) { return oled_active; }
|
||||||
|
|
||||||
|
uint8_t oled_set_brightness(uint8_t level) {
|
||||||
|
uint8_t set_contrast[] = {I2C_CMD, CONTRAST, level};
|
||||||
|
if (oled_brightness != level) {
|
||||||
|
if (I2C_TRANSMIT(set_contrast) != I2C_STATUS_SUCCESS) {
|
||||||
|
print("set_brightness cmd failed\n");
|
||||||
|
return oled_brightness;
|
||||||
|
}
|
||||||
|
oled_brightness = level;
|
||||||
|
}
|
||||||
|
return oled_brightness;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t oled_get_brightness(void) { return oled_brightness; }
|
||||||
|
|
||||||
// Set the specific 8 lines rows of the screen to scroll.
|
// Set the specific 8 lines rows of the screen to scroll.
|
||||||
// 0 is the default for start, and 7 for end, which is the entire
|
// 0 is the default for start, and 7 for end, which is the entire
|
||||||
// height of the screen. For 128x32 screens, rows 4-7 are not used.
|
// height of the screen. For 128x32 screens, rows 4-7 are not used.
|
||||||
|
|
|
@ -141,6 +141,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#if !defined(OLED_FONT_HEIGHT)
|
#if !defined(OLED_FONT_HEIGHT)
|
||||||
# define OLED_FONT_HEIGHT 8
|
# define OLED_FONT_HEIGHT 8
|
||||||
#endif
|
#endif
|
||||||
|
// Default brightness level
|
||||||
|
#if !defined(OLED_BRIGHTNESS)
|
||||||
|
# define OLED_BRIGHTNESS 255
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !defined(OLED_TIMEOUT)
|
#if !defined(OLED_TIMEOUT)
|
||||||
# if defined(OLED_DISABLE_TIMEOUT)
|
# if defined(OLED_DISABLE_TIMEOUT)
|
||||||
|
@ -261,6 +265,12 @@ bool oled_off(void);
|
||||||
// not
|
// not
|
||||||
bool is_oled_on(void);
|
bool is_oled_on(void);
|
||||||
|
|
||||||
|
// Sets the brightness of the display
|
||||||
|
uint8_t oled_set_brightness(uint8_t level);
|
||||||
|
|
||||||
|
// Gets the current brightness of the display
|
||||||
|
uint8_t oled_get_brightness(void);
|
||||||
|
|
||||||
// Basically it's oled_render, but with timeout management and oled_task_user calling!
|
// Basically it's oled_render, but with timeout management and oled_task_user calling!
|
||||||
void oled_task(void);
|
void oled_task(void);
|
||||||
|
|
||||||
|
|
|
@ -144,6 +144,12 @@ static void dance_oled_finished(qk_tap_dance_state_t *state, void *user_data) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 4:
|
||||||
|
if (!state->pressed) {
|
||||||
|
// quadruple tap - step through brightness levels
|
||||||
|
oled_set_brightness(oled_get_brightness() + 0x10);
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue