Add rotation logic to text() method #37
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The text() method did not account for rotations when checking if a character could be rendered to the framebuf. This change adjusts frame_width and frame_height checks taking rotation setting into account. Tested working with SH1107 128 x 64 OLED Featherwing.
mdroberts1243
changed the title
|
I've put an Adafruit_framebuf driver for the SH1107 128x64 OLED Featherwing: https://github.com/mdroberts1243/mdroberts1243_CircuitPython_SH1107_I2C It was used to test this change. |
makermelissa
approved these changes
Sep 22, 2020
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Sep 22, 2020
Updating https://github.com/adafruit/Adafruit_CircuitPython_PN532 to 2.3.0 from 2.2.1: > Merge pull request adafruit/Adafruit_CircuitPython_PN532#41 from dunkmann00/performance-and-sleep Updating https://github.com/adafruit/Adafruit_CircuitPython_SharpMemoryDisplay to 1.2.3 from 1.2.2: > Update adafruit_sharpmemorydisplay.py Updating https://github.com/adafruit/Adafruit_CircuitPython_FeatherWing to 1.13.0 from 1.12.0: > Merge pull request adafruit/Adafruit_CircuitPython_FeatherWing#64 from FoamyGuy/keyboard_featherwing Updating https://github.com/adafruit/Adafruit_CircuitPython_framebuf to 1.4.3 from 1.4.2: > Merge pull request adafruit/Adafruit_CircuitPython_framebuf#37 from mdroberts1243/master Updating https://github.com/adafruit/Adafruit_CircuitPython_MatrixPortal to 1.5.1 from 1.5.0: > Merge pull request adafruit/Adafruit_CircuitPython_MatrixPortal#20 from makermelissa/master Updating https://github.com/adafruit/Adafruit_CircuitPython_Pixel_Framebuf to 1.1.1 from 1.1.0: > Merge pull request adafruit/Adafruit_CircuitPython_Pixel_Framebuf#3 from makermelissa/main Updating https://github.com/adafruit/Adafruit_CircuitPython_Bundle/circuitpython_library_list.md to NA from NA: > Added the following libraries: Adafruit_CircuitPython_74HC595, Adafruit_CircuitPython_ADS1x15, Adafruit_CircuitPython_ADT7410, Adafruit_CircuitPython_ADXL34x, Adafruit_CircuitPython_AHTx0, Adafruit_CircuitPython_AM2320, Adafruit_CircuitPython_AMG88xx, Adafruit_CircuitPython_APDS9960, Adafruit_CircuitPython_AS726x, Adafruit_CircuitPython_AS7341, Adafruit_CircuitPython_ATECC, Adafruit_CircuitPython_BD3491FS, Adafruit_CircuitPython_BH1750, Adafruit_CircuitPython_BluefruitSPI, Adafruit_CircuitPython_BME280, Adafruit_CircuitPython_BME680, Adafruit_CircuitPython_BMP280, Adafruit_CircuitPython_BMP3XX, Adafruit_CircuitPython_BNO055, Adafruit_CircuitPython_CAP1188, Adafruit_CircuitPython_CCS811, Adafruit_CircuitPython_CharLCD, Adafruit_CircuitPython_CircuitPlayground, Adafruit_CircuitPython_CLUE, Adafruit_CircuitPython_Crickit, Adafruit_CircuitPython_DHT, Adafruit_CircuitPython_DisplayIO_SSD1305, Adafruit_CircuitPython_DisplayIO_SSD1306, Adafruit_CircuitPython_DotStar, Adafruit_CircuitPython_DPS310, Adafruit_CircuitPython_DRV2605, Adafruit_CircuitPython_DS1307, Adafruit_CircuitPython_DS1841, Adafruit_CircuitPython_DS18X20, Adafruit_CircuitPython_DS2413, Adafruit_CircuitPython_DS3231, Adafruit_CircuitPython_DS3502, Adafruit_CircuitPython_DymoScale, Adafruit_CircuitPython_EPD, Adafruit_CircuitPython_ESP_ATcontrol, Adafruit_CircuitPython_ESP32SPI, Adafruit_CircuitPython_Fingerprint, Adafruit_CircuitPython_FocalTouch, Adafruit_CircuitPython_FONA, Adafruit_CircuitPython_FRAM, Adafruit_CircuitPython_FXAS21002C, Adafruit_CircuitPython_FXOS8700, Adafruit_CircuitPython_GPS, Adafruit_CircuitPython_HCSR04, Adafruit_CircuitPython_HT16K33, Adafruit_CircuitPython_HTS221, Adafruit_CircuitPython_HTU21D, Adafruit_CircuitPython_HX8357, Adafruit_CircuitPython_ICM20X, Adafruit_CircuitPython_IL0373, Adafruit_CircuitPython_IL0398, Adafruit_CircuitPython_IL91874, Adafruit_CircuitPython_ILI9341, Adafruit_CircuitPython_INA219, Adafruit_CircuitPython_INA260, Adafruit_CircuitPython_IRRemote, Adafruit_CircuitPython_IS31FL3731, Adafruit_CircuitPython_L3GD20, Adafruit_CircuitPython_LIDARLite, Adafruit_CircuitPython_LIS2MDL, Adafruit_CircuitPython_LIS331, Adafruit_CircuitPython_LIS3DH, Adafruit_CircuitPython_LIS3MDL, Adafruit_CircuitPython_LPS2X, Adafruit_CircuitPython_LPS35HW, Adafruit_CircuitPython_LSM303, Adafruit_CircuitPython_LSM303_Accel, Adafruit_CircuitPython_LSM303DLH_Mag, Adafruit_CircuitPython_LSM6DS, Adafruit_CircuitPython_LSM9DS0, Adafruit_CircuitPython_LSM9DS1, Adafruit_CircuitPython_MatrixKeypad, Adafruit_CircuitPython_MAX31855, Adafruit_CircuitPython_MAX31856, Adafruit_CircuitPython_MAX31865, Adafruit_CircuitPython_MAX7219, Adafruit_CircuitPython_MAX9744, Adafruit_CircuitPython_MCP230xx, Adafruit_CircuitPython_MCP3xxx, Adafruit_CircuitPython_MCP4725, Adafruit_CircuitPython_MCP4728, Adafruit_CircuitPython_MCP9600, Adafruit_CircuitPython_MCP9808, Adafruit_CircuitPython_MLX90393, Adafruit_CircuitPython_MLX90614, Adafruit_CircuitPython_MLX90640, Adafruit_CircuitPython_MMA8451, Adafruit_CircuitPython_MPL115A2, Adafruit_CircuitPython_MPL3115A2, Adafruit_CircuitPython_MPR121, Adafruit_CircuitPython_MPRLS, Adafruit_CircuitPython_MPU6050, Adafruit_CircuitPython_MS8607, Adafruit_CircuitPython_MSA301, Adafruit_CircuitPython_NeoPixel, Adafruit_CircuitPython_NeoPixel_SPI, Adafruit_CircuitPython_NeoTrellis, Adafruit_CircuitPython_Nunchuk, Adafruit_CircuitPython_PCA9685, Adafruit_CircuitPython_PCD8544, Adafruit_CircuitPython_PCF8523, Adafruit_CircuitPython_PCF8591, Adafruit_CircuitPython_PCT2075, Adafruit_CircuitPython_Pixie, Adafruit_CircuitPython_PM25, Adafruit_CircuitPython_PN532, Adafruit_CircuitPython_PyPortal, Adafruit_CircuitPython_RA8875, Adafruit_CircuitPython_RFM69, Adafruit_CircuitPython_RFM9x, Adafruit_CircuitPython_RGB_Display, Adafruit_CircuitPython_RockBlock, Adafruit_CircuitPython_RPLIDAR, Adafruit_CircuitPython_SD, Adafruit_CircuitPython_Seesaw, Adafruit_CircuitPython_SGP30, Adafruit_CircuitPython_SharpMemoryDisplay, Adafruit_CircuitPython_SHT31D, Adafruit_CircuitPython_SHTC3, Adafruit_CircuitPython_SI4713, Adafruit_CircuitPython_SI5351, Adafruit_CircuitPython_SI7021, Adafruit_CircuitPython_SSD1305, Adafruit_CircuitPython_SSD1306, Adafruit_CircuitPython_SSD1322, Adafruit_CircuitPython_SSD1325, Adafruit_CircuitPython_SSD1327, Adafruit_CircuitPython_SSD1331, Adafruit_CircuitPython_SSD1351, Adafruit_CircuitPython_SSD1608, Adafruit_CircuitPython_SSD1675, Adafruit_CircuitPython_ST7735, Adafruit_CircuitPython_ST7735R, Adafruit_CircuitPython_ST7789, Adafruit_CircuitPython_STMPE610, Adafruit_CircuitPython_TC74, Adafruit_CircuitPython_TCA9548A, Adafruit_CircuitPython_TCS34725, Adafruit_CircuitPython_TFmini, Adafruit_CircuitPython_Thermal_Printer, Adafruit_CircuitPython_Thermistor, Adafruit_CircuitPython_TLC5947, Adafruit_CircuitPython_TLC59711, Adafruit_CircuitPython_TLV493D, Adafruit_CircuitPython_TMP006, Adafruit_CircuitPython_TMP007, Adafruit_CircuitPython_Touchscreen, Adafruit_CircuitPython_TPA2016, Adafruit_CircuitPython_Trellis, Adafruit_CircuitPython_TrellisM4, Adafruit_CircuitPython_TSL2561, Adafruit_CircuitPython_TSL2591, Adafruit_CircuitPython_US100, Adafruit_CircuitPython_VC0706, Adafruit_CircuitPython_VCNL4010, Adafruit_CircuitPython_VCNL4040, Adafruit_CircuitPython_VEML6070, Adafruit_CircuitPython_VEML6075, Adafruit_CircuitPython_VEML7700, Adafruit_CircuitPython_VL53L0X, Adafruit_CircuitPython_VL6180X, Adafruit_CircuitPython_VS1053, Adafruit_CircuitPython_Wiznet5k, Adafruit_CircuitPython_WS2801, Adafruit_CircuitPython_AWS_IOT, Adafruit_CircuitPython_GC_IOT_Core, Adafruit_CircuitPython_AdafruitIO, Adafruit_CircuitPython_AirLift, Adafruit_CircuitPython_AVRprog, Adafruit_CircuitPython_AzureIoT, Adafruit_CircuitPython_binascii, Adafruit_CircuitPython_BitbangIO, Adafruit_CircuitPython_Bitmap_Font, Adafruit_CircuitPython_BitmapSaver, Adafruit_CircuitPython_BLE, Adafruit_CircuitPython_BLE_BroadcastNet, Adafruit_CircuitPython_BLE_Radio, Adafruit_CircuitPython_BLE_Adafruit, Adafruit_CircuitPython_BLE_Apple_Media, Adafruit_CircuitPython_BLE_Apple_Notification_Center, Adafruit_CircuitPython_BLE_BerryMed_Pulse_Oximeter, Adafruit_CircuitPython_BLE_Cycling_Speed_and_Cadence, Adafruit_CircuitPython_BLE_Eddystone, Adafruit_CircuitPython_BLE_Heart_Rate, Adafruit_CircuitPython_BLE_iBBQ, Adafruit_CircuitPython_BLE_Magic_Light, Adafruit_CircuitPython_BLE_MIDI, Adafruit_CircuitPython_BoardTest, Adafruit_CircuitPython_BusDevice, Adafruit_CircuitPython_CursorControl, Adafruit_CircuitPython_Debouncer, Adafruit_CircuitPython_Debug_I2C, Adafruit_CircuitPython_Display_Button, Adafruit_CircuitPython_Display_Shapes, Adafruit_CircuitPython_Display_Text, Adafruit_CircuitPython_Display_Notification, Adafruit_CircuitPython_FancyLED, Adafruit_CircuitPython_FeatherWing, Adafruit_CircuitPython_framebuf, Adafruit_CircuitPython_Gizmo, Adafruit_CircuitPython_hashlib, Adafruit_CircuitPython_HID, Adafruit_CircuitPython_Hue, Adafruit_CircuitPython_ImageLoad, Adafruit_CircuitPython_JWT, Adafruit_CircuitPython_LED_Animation, Adafruit_CircuitPython_LIFX, Adafruit_CircuitPython_Logging, Adafruit_CircuitPython_MatrixPortal, Adafruit_CircuitPython_MIDI, Adafruit_CircuitPython_miniesptool, Adafruit_CircuitPython_MiniMQTT, Adafruit_CircuitPython_miniQR, Adafruit_CircuitPython_Motor, Adafruit_CircuitPython_MotorKit, Adafruit_CircuitPython_NTP, Adafruit_CircuitPython_OneWire, Adafruit_CircuitPython_Pixel_Framebuf, Adafruit_CircuitPython_ProgressBar, Adafruit_CircuitPython_PyBadger, Adafruit_CircuitPython_PYOA, Adafruit_CircuitPython_Pypixelbuf, Adafruit_CircuitPython_Register, Adafruit_CircuitPython_Requests, Adafruit_CircuitPython_RGBLED, Adafruit_CircuitPython_RSA, Adafruit_CircuitPython_RTTTL, Adafruit_CircuitPython_ServoKit, Adafruit_CircuitPython_SimpleIO, Adafruit_CircuitPython_Slideshow, Adafruit_CircuitPython_TinyLoRa, Adafruit_CircuitPython_turtle, Adafruit_CircuitPython_Waveform, Adafruit_CircuitPython_WSGI
|
Hi MakerMelissa, Thanks for processing this! I was wondering how to contribute my framebuf driver for the FeatherWIng SH1107 128x64 OLED. Since this is a new driver, I can't just do a PR. https://github.com/mdroberts1243/mdroberts1243_CircuitPython_SH1107_I2C Would appreciate your suggestions! |
|
Hi. You may want to do a new library. Take a look at this guide: https://learn.adafruit.com/creating-and-sharing-a-circuitpython-library |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The text() method did not account for rotations when checking if a character could be rendered to the framebuf. For example it would clip characters that exceeded the native width of the device (e.g. 64 wide for the SH1107 OLED) even though you had set rotation to use it horizontally (128) wide.
This change adjusts frame_width and frame_height checks, taking rotation setting into account.
Tested working with SH1107 128 x 64 OLED Featherwing in horizontal orientation on my own framebuf driver.