mirror of
https://github.com/eclipse/upm.git
synced 2025-07-06 03:41:13 +03:00
i2clcd: remove the helper functions i2Cmd, i2cData & i2cReg
Remove calls to I2C helper functions (i2Cmd, i2cData, i2cReg) and call the raw MRAA function directly instead and remove the helper functions from the I2CLcd class Signed-off-by: Wouter van Verre <wouter.van.verre@intel.com> Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Wouter van Verre
committed by
Mihai Tudor Panu
Mihai Tudor Panu
parent
bcdaccf68d
commit
ae0d99369b
@ -36,86 +36,96 @@ SSD1327::SSD1327(int bus_in, int addr_in) : I2CLcd(bus_in, addr_in)
|
||||
{
|
||||
mraa_result_t error = MRAA_SUCCESS;
|
||||
usleep(INIT_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control,
|
||||
0xFD); // Unlock OLED driver IC MCU interface from entering command. i.e: Accept commands
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xFD, LCD_CMD); // Unlock OLED driver IC MCU
|
||||
// interface from entering command.
|
||||
// i.e: Accept commands
|
||||
usleep(INIT_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0x12);
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x12, LCD_CMD);
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xAE); // Set display off
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xAE, LCD_CMD); // Set display off
|
||||
usleep(INIT_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0xA8); // set multiplex ratio
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xA8, LCD_CMD); // set multiplex ratio
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x5F); // 96
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x5F, LCD_CMD); // 96
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xA1); // set display start line
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xA1, LCD_CMD); // set display start line
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x00); //
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x00, LCD_CMD); //
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xA2); // set display offset
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xA2, LCD_CMD); // set display offset
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x60);
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x60, LCD_CMD);
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xA0); // set remap
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xA0, LCD_CMD); // set remap
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x46);
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x46, LCD_CMD);
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xAB); // set vdd internal
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xAB, LCD_CMD); // set vdd internal
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x01); //
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x01, LCD_CMD); //
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x81); // set contrasr
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x81, LCD_CMD); // set contrasr
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x53); // 100 nit
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x53, LCD_CMD); // 100 nit
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xB1); // Set Phase Length
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xB1, LCD_CMD); // Set Phase Length
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0X51); //
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0X51, LCD_CMD); //
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xB3); // Set Display Clock Divide Ratio/Oscillator Frequency
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control,
|
||||
0xB3,
|
||||
LCD_CMD); // Set Display Clock Divide Ratio/Oscillator
|
||||
// Frequency
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x01); //
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x01, LCD_CMD); //
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xB9); //
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xB9, LCD_CMD); //
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xBC); // set pre_charge voltage/VCOMH
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xBC, LCD_CMD); // set pre_charge
|
||||
// voltage/VCOMH
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x08); // (0x08);
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x08, LCD_CMD); // (0x08);
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xBE); // set VCOMH
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xBE, LCD_CMD); // set VCOMH
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0X07); // (0x07);
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0X07, LCD_CMD); // (0x07);
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xB6); // Set second pre-charge period
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xB6, LCD_CMD); // Set second pre-charge
|
||||
// period
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x01); //
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x01, LCD_CMD); //
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xD5); // enable second precharge and enternal vsl
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control,
|
||||
0xD5,
|
||||
LCD_CMD); // enable second precharge and enternal vsl
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0X62); // (0x62);
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0X62, LCD_CMD); // (0x62);
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xA4); // Set Normal Display Mode
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xA4, LCD_CMD); // Set Normal Display Mode
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x2E); // Deactivate Scroll
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x2E, LCD_CMD); // Deactivate Scroll
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0xAF); // Switch on display
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xAF, LCD_CMD); // Switch on display
|
||||
usleep(INIT_SLEEP);
|
||||
|
||||
// Row Address
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x75); // Set Row Address
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x75, LCD_CMD); // Set Row Address
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x00); // Start 0
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x00, LCD_CMD); // Start 0
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x5f); // End 95
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x5f, LCD_CMD); // End 95
|
||||
usleep(INIT_SLEEP);
|
||||
|
||||
// Column Address
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x15); // Set Column Address
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x15, LCD_CMD); // Set Column Address
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control,
|
||||
0x08); // Start from 8th Column of driver IC. This is 0th Column for OLED
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x08, LCD_CMD); // Start from 8th Column of
|
||||
// driver IC. This is 0th
|
||||
// Column for OLED
|
||||
usleep(INIT_SLEEP);
|
||||
error = i2Cmd(m_i2c_lcd_control, 0x37); // End at (8 + 47)th column. Each Column has 2
|
||||
// pixels(segments)
|
||||
error = mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x37, LCD_CMD); // End at (8 + 47)th
|
||||
// column. Each Column has 2
|
||||
// pixels(segments)
|
||||
usleep(INIT_SLEEP);
|
||||
|
||||
clear();
|
||||
@ -143,7 +153,7 @@ SSD1327::draw(uint8_t* data, int bytes)
|
||||
value |= (bitOne) ? grayHigh : 0x00;
|
||||
value |= (bitTwo) ? grayLow : 0x00;
|
||||
|
||||
i2cData(m_i2c_lcd_control, value);
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, value, LCD_DATA);
|
||||
usleep(CMD_SLEEP - 2000);
|
||||
}
|
||||
}
|
||||
@ -175,18 +185,19 @@ SSD1327::setCursor(int row, int column)
|
||||
mraa_result_t error = MRAA_SUCCESS;
|
||||
|
||||
// Column Address
|
||||
i2Cmd(m_i2c_lcd_control, 0x15); /* Set Column Address */
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x15, LCD_CMD); /* Set Column Address */
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0x08 + (column * 4)); /* Start Column: Start from 8 */
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x08 + (column * 4), LCD_CMD); /* Start Column:
|
||||
Start from 8 */
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0x37); /* End Column */
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x37, LCD_CMD); /* End Column */
|
||||
usleep(CMD_SLEEP);
|
||||
// Row Address
|
||||
i2Cmd(m_i2c_lcd_control, 0x75); /* Set Row Address */
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x75, LCD_CMD); /* Set Row Address */
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0x00 + (row * 8)); /* Start Row*/
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x00 + (row * 8), LCD_CMD); /* Start Row*/
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0x07 + (row * 8)); /* End Row*/
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x07 + (row * 8), LCD_CMD); /* End Row*/
|
||||
usleep(CMD_SLEEP);
|
||||
|
||||
return error;
|
||||
@ -243,7 +254,7 @@ SSD1327::writeChar(mraa_i2c_context ctx, uint8_t value)
|
||||
data |= (bitOne) ? grayHigh : 0x00;
|
||||
data |= (bitTwo) ? grayLow : 0x00;
|
||||
|
||||
i2cData(m_i2c_lcd_control, data);
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, data, LCD_DATA);
|
||||
usleep(CMD_SLEEP - 2000);
|
||||
}
|
||||
}
|
||||
@ -252,41 +263,43 @@ SSD1327::writeChar(mraa_i2c_context ctx, uint8_t value)
|
||||
mraa_result_t
|
||||
SSD1327::setNormalDisplay()
|
||||
{
|
||||
return i2Cmd(m_i2c_lcd_control, DISPLAY_CMD_SET_NORMAL); // set to normal display '1' is ON
|
||||
return mraa_i2c_write_byte_data(m_i2c_lcd_control,
|
||||
DISPLAY_CMD_SET_NORMAL,
|
||||
LCD_CMD); // set to normal display '1' is ON
|
||||
}
|
||||
|
||||
mraa_result_t
|
||||
SSD1327::setHorizontalMode()
|
||||
{
|
||||
i2Cmd(m_i2c_lcd_control, 0xA0); // remap to
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xA0, LCD_CMD); // remap to
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0x42); // horizontal mode
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x42, LCD_CMD); // horizontal mode
|
||||
usleep(CMD_SLEEP);
|
||||
|
||||
// Row Address
|
||||
i2Cmd(m_i2c_lcd_control, 0x75); // Set Row Address
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x75, LCD_CMD); // Set Row Address
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0x00); // Start 0
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x00, LCD_CMD); // Start 0
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0x5f); // End 95
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x5f, LCD_CMD); // End 95
|
||||
usleep(CMD_SLEEP);
|
||||
|
||||
// Column Address
|
||||
i2Cmd(m_i2c_lcd_control, 0x15); // Set Column Address
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x15, LCD_CMD); // Set Column Address
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control,
|
||||
0x08); // Start from 8th Column of driver IC. This is 0th Column for OLED
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x08, LCD_CMD); // Start from 8th Column of driver
|
||||
// IC. This is 0th Column for OLED
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control,
|
||||
0x37); // End at (8 + 47)th column. Each Column has 2 pixels(or segments)
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x37, LCD_CMD); // End at (8 + 47)th column. Each
|
||||
// Column has 2 pixels(or segments)
|
||||
usleep(CMD_SLEEP);
|
||||
}
|
||||
|
||||
mraa_result_t
|
||||
SSD1327::setVerticalMode()
|
||||
{
|
||||
i2Cmd(m_i2c_lcd_control, 0xA0); // remap to
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0xA0, LCD_CMD); // remap to
|
||||
usleep(CMD_SLEEP);
|
||||
i2Cmd(m_i2c_lcd_control, 0x46); // Vertical mode
|
||||
mraa_i2c_write_byte_data(m_i2c_lcd_control, 0x46, LCD_CMD); // Vertical mode
|
||||
usleep(CMD_SLEEP);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user