lcd: Renamed 'i2clcd' library to 'lcd'

All other upm library directories match their corresponding library
name, the i2clcd was an outlier which caused problems for CMake and
testing.

    * Replaced usage of i2clcd with lcd
    * Renamed source files and examples
    * Updated examples to use correct class
    * Updated documentation where necessary (left changelog sections)

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2018-01-23 14:02:48 -08:00
parent f64060b9d2
commit 3cfea676e2
30 changed files with 47 additions and 47 deletions

View File

@ -41,7 +41,7 @@
# a110x.c Requires libupmc-a110x
# lcm1602-i2c.c Requires libupmc-lcm1602
# bmp280-bme280.c Requires libupmc-bmp280
# i2clcd-eboled.cxx Requires libupm-i2clcd
# lcd-eboled.cxx Requires libupm-lcd
#
#
function (add_example example_src)

View File

@ -198,8 +198,8 @@ add_example_with_path(Jhd1313m1_lcdSample jhd1313m1 jhd1313m1)
add_example_with_path(Jhd1313m1Sample jhd1313m1 jhd1313m1)
add_example_with_path(Lcm1602_i2cSample lcm1602 lcm1602)
add_example_with_path(Lcm1602_parallelSample lcm1602 lcm1602)
add_example_with_path(SSD1308_oledSample lcd i2clcd)
add_example_with_path(SSD1327_oledSample lcd i2clcd)
add_example_with_path(SSD1308_oledSample lcd lcd)
add_example_with_path(SSD1327_oledSample lcd lcd)
add_example_multiple_jars(BME280_Example bmp280 "bmp280;interfaces")
if(SWIG_VERSION VERSION_GREATER 3.0.8)

View File

@ -22,13 +22,13 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
public class I2CLCD_EBOLEDSample {
public class LCD_EBOLEDSample {
public static void main(String[] args) throws InterruptedException {
// ! [Interesting]
// Instantiate an Edison Block OLED using default values
upm_i2clcd.EBOLED lcd = new upm_i2clcd.EBOLED();
upm_lcd.EBOLED lcd = new upm_lcd.EBOLED();
lcd.clear();
lcd.setCursor(10, 15);

View File

@ -22,7 +22,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
public class I2CLCD_SSD1306Sample {
public class LCD_SSD1306Sample {
static private final int[] intel_logo = new int[]{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -85,7 +85,7 @@ public class I2CLCD_SSD1306Sample {
public static void main(String[] args) throws InterruptedException {
// ! [Interesting]
upm_i2clcd.SSD1306 lcd = new upm_i2clcd.SSD1306(0x0, 0x3D);
upm_lcd.SSD1306 lcd = new upm_lcd.SSD1306(0x0, 0x3D);
byte[] image = new byte[intel_logo.length];
for (int i = 0; i < intel_logo.length; i++)

View File

@ -76,7 +76,7 @@ public class SSD1308_oledSample {
public static void main(String[] args) throws InterruptedException {
// ! [Interesting]
upm_i2clcd.SSD1308 lcd = new upm_i2clcd.SSD1308(0);
upm_lcd.SSD1308 lcd = new upm_lcd.SSD1308(0);
byte[] image = new byte[IntelLogo.length];
for (int i = 0; i < IntelLogo.length; i++)

View File

@ -111,7 +111,7 @@ public class SSD1327_oledSample {
public static void main(String[] args) throws InterruptedException {
// ! [Interesting]
upm_i2clcd.SSD1327 lcd = new upm_i2clcd.SSD1327(0);
upm_lcd.SSD1327 lcd = new upm_lcd.SSD1327(0);
// If you don't set the display to be white, the seeed logo will appear
// jagged

View File

@ -25,7 +25,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
var lcdObj = require('jsupm_i2clcd');
var lcdObj = require('jsupm_lcd');
var oled = new lcdObj.EBOLED();
var sample = 0;

View File

@ -88,8 +88,8 @@ function exit()
process.exit(0);
}
// Load i2clcd module
var lcdObj = require('jsupm_i2clcd');
// Load lcd module
var lcdObj = require('jsupm_lcd');
var lcd = new lcdObj.SSD1306(0, 0x3C);
var next = 0;

View File

@ -22,8 +22,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
//Load i2clcd module
var LCD = require('jsupm_i2clcd');
//Load lcd module
var LCD = require('jsupm_lcd');
var myLcd = new LCD.SSD1308 (0, 0x3C);

View File

@ -22,8 +22,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
//Load i2clcd module
var LCD = require('jsupm_i2clcd');
//Load lcd module
var LCD = require('jsupm_lcd');
var myLcd = new LCD.SSD1327 (0, 0x3C);

View File

@ -24,7 +24,7 @@
from __future__ import print_function
import time, sys
from upm import pyupm_i2clcd as lcdObj
from upm import pyupm_lcd as lcdObj
def main():
# setup with default values

View File

@ -21,10 +21,10 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# Load i2clcd display module
# Load lcd display module
from __future__ import print_function
import time, signal, sys
from upm import pyupm_i2clcd as upmLCD
from upm import pyupm_lcd as upmLCD
def main():
myLCD = upmLCD.SSD1308(0, 0x3C);

View File

@ -21,10 +21,10 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# Load i2clcd display module
# Load lcd display module
from __future__ import print_function
import time, signal, sys
from upm import pyupm_i2clcd as upmLCD
from upm import pyupm_lcd as upmLCD
def main():
myLCD = upmLCD.SSD1327(0, 0x3C);