Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: styropyr0/oled.h
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.3
Choose a base ref
...
head repository: styropyr0/oled.h
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 20, 2025

  1. Configured to support C++ compiler only

    @saurav-qwy
    saurav-qwy committed Feb 20, 2025
    Copy the full SHA
    62a5350 View commit details

  2. Merge pull request #33 from styropyr0/master 

    Configured to support C++ compiler only
    @styropyr0
    styropyr0 authored Feb 20, 2025
    Copy the full SHA
    21e568d View commit details
Showing with 9 additions and 3 deletions.
  1. +3 −0 Fragments.h
  2. +6 −3 SSD1306.h
3 changes: 3 additions & 0 deletions Fragments.h
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@

#include "SSD1306.h"

#ifdef __cplusplus

class Fragment;

/**
@@ -356,4 +358,5 @@ class Fragment
void detach();
};

#endif
#endif
9 changes: 6 additions & 3 deletions SSD1306.h
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@
#include <Arduino.h>
#include <Wire.h>

#ifdef __cplusplus

enum dimensions
{
WIDTH_128 = 0x80,
@@ -80,10 +82,10 @@ enum registryCommands

enum powerModes
{
LOW_POWER_MODE = 0x01, // Low power consumption, slow display, uses I2C STANDARD MODE (100kHz)
BALANCED_MODE = 0x02, // Balanced power consumption, balanced performance, uses I2C STANDARD FAST MODE (200kHz)
LOW_POWER_MODE = 0x01, // Low power consumption, slow display, uses I2C STANDARD MODE (100kHz)
BALANCED_MODE = 0x02, // Balanced power consumption, balanced performance, uses I2C STANDARD FAST MODE (200kHz)
PERFORMANCE_MODE = 0x03, // More power consumption, faster display, enables I2C FAST MODE (400kHz)
TURBO_MODE = 0x04 // I2C FAST MODE PLUS (1MHz). If your device doesn't support this mode, it will automatically switch to last selected mode.
TURBO_MODE = 0x04 // I2C FAST MODE PLUS (1MHz). If your device doesn't support this mode, it will automatically switch to last selected mode.
};

class OLED
@@ -306,4 +308,5 @@ class OLED
void drawFontPixel(uint8_t data, uint8_t x, uint8_t y);
};

#endif
#endif