rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3339 from betaflight/revert-3327-bfdev-configurable-oled-display 

Revert "Configurable OLED display bus and address"
This commit is contained in:
Michael Keller 2017-06-23 20:17:21 +12:00 committed by GitHub
parent 9c2e1ddf46 20260aa8e2
commit 691260f38d
5 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/config/parameter_group_ids.h
View File

@ -107,8 +107,7 @@
#define PG_SONAR_CONFIG 516
#define PG_ESC_SENSOR_CONFIG 517
#define PG_I2C_CONFIG 518
#define PG_OLED_DISPLAY_CONFIG 519
#define PG_BETAFLIGHT_END 519
#define PG_BETAFLIGHT_END 518
// OSD configuration (subject to change)

7
src/main/drivers/bus_i2c.h
View File

@ -45,13 +45,6 @@ typedef enum I2CDevice {
#define I2CDEV_COUNT 4
#endif
// Macro to convert CLI bus number to I2CDevice.
#define I2C_CFG_TO_DEV(x) ((x) - 1)
// I2C device address range in 8-bit address mode
#define I2C_ADDR8_MIN 8
#define I2C_ADDR8_MAX 119
typedef struct i2cConfig_s {
ioTag_t ioTagScl[I2CDEV_COUNT];
ioTag_t ioTagSda[I2CDEV_COUNT];

25
src/main/drivers/display_ug2864hsweg01.c
View File

@ -24,31 +24,16 @@
#include "display_ug2864hsweg01.h"
#include "config/parameter_group.h"
#include "config/parameter_group_ids.h"
#ifdef USE_I2C_OLED_DISPLAY
#if !defined(OLED_I2C_INSTANCE)
#if defined(I2C_DEVICE)
#define OLED_I2C_INSTANCE I2C_DEVICE
#else
#define OLED_I2C_INSTANCE I2CINVALID
#define OLED_I2C_INSTANCE I2C_NONE
#endif
#endif
#define OLED_address 0x3C // OLED at address 0x3C in 7bit
PG_REGISTER_WITH_RESET_TEMPLATE(oledDisplayConfig_t, oledDisplayConfig, PG_OLED_DISPLAY_CONFIG, 0);
PG_RESET_TEMPLATE(oledDisplayConfig_t, oledDisplayConfig,
.bus = OLED_I2C_INSTANCE,
.address = OLED_address,
);
static I2CDevice i2cBus = I2CINVALID; // XXX Protect against direct call to i2cWrite and i2cRead
static uint8_t i2cAddress;
#define INVERSE_CHAR_FORMAT 0x7f // 0b01111111
#define NORMAL_CHAR_FORMAT 0x00 // 0b00000000
@ -191,14 +176,16 @@ static const uint8_t multiWiiFont[][5] = { // Refer to "Times New Roman" Font Da
{ 0x7A, 0x7E, 0x7E, 0x7E, 0x7A }, // (131) - 0x00C8 Vertical Bargraph - 6 (full)
};
#define OLED_address 0x3C // OLED at address 0x3C in 7bit
static bool i2c_OLED_send_cmd(uint8_t command)
{
return i2cWrite(i2cBus, i2cAddress, 0x80, command);
return i2cWrite(OLED_I2C_INSTANCE, OLED_address, 0x80, command);
}
static bool i2c_OLED_send_byte(uint8_t val)
{
return i2cWrite(i2cBus, i2cAddress, 0x40, val);
return i2cWrite(OLED_I2C_INSTANCE, OLED_address, 0x40, val);
}
void i2c_OLED_clear_display(void)
@ -270,8 +257,6 @@ void i2c_OLED_send_string(const char *string)
*/
bool ug2864hsweg01InitI2C(void)
{
i2cBus = I2C_CFG_TO_DEV(oledDisplayConfig()->bus);
i2cAddress = oledDisplayConfig()->address;
// Set display OFF
if (!i2c_OLED_send_cmd(0xAE)) {

9
src/main/drivers/display_ug2864hsweg01.h
View File

@ -17,15 +17,6 @@
#pragma once
#include "drivers/bus_i2c.h"
typedef struct oledDisplayConfig_s {
I2CDevice bus;
uint8_t address;
} oledDisplayConfig_t;
PG_DECLARE(oledDisplayConfig_t, oledDisplayConfig);
#define SCREEN_WIDTH 128
#define SCREEN_HEIGHT 64

5
src/main/fc/settings.c
View File

@ -37,7 +37,6 @@
#include "config/parameter_group_ids.h"
#include "drivers/light_led.h"
#include "drivers/display_ug2864hsweg01.h"
#include "fc/config.h"
#include "fc/controlrate_profile.h"
@ -720,10 +719,6 @@ const clivalue_t valueTable[] = {
{ "esc_sensor_halfduplex", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_ESC_SENSOR_CONFIG, offsetof(escSensorConfig_t, halfDuplex) },
#endif
{ "led_inversion", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, ((1 << STATUS_LED_NUMBER) - 1) }, PG_STATUS_LED_CONFIG, offsetof(statusLedConfig_t, inversion) },
#ifdef USE_I2C_OLED_DISPLAY
{ "oled_display_i2c_bus", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, I2CDEV_COUNT }, PG_OLED_DISPLAY_CONFIG, offsetof(oledDisplayConfig_t, bus) },
{ "oled_display_i2c_addr", VAR_UINT8 | MASTER_VALUE, .config.minmax = { I2C_ADDR8_MIN, I2C_ADDR8_MAX }, PG_OLED_DISPLAY_CONFIG, offsetof(oledDisplayConfig_t, bus) },
#endif
};
const uint16_t valueTableEntryCount = ARRAYLEN(valueTable);