From 356b1dd43c89a412f97c4a8afdfaddd652a0d705 Mon Sep 17 00:00:00 2001 From: Kiveisha Yevgeniy Date: Tue, 3 Jun 2014 16:23:26 +0000 Subject: [PATCH 1/5] servo: Added new module servo Signed-off-by: Kiveisha Yevgeniy --- examples/CMakeLists.txt | 3 ++ examples/es08a.cxx | 68 +++++++++++++++++++++++++++++++ src/CMakeLists.txt | 1 + src/servo/CMakeLists.txt | 4 ++ src/servo/es08a.cxx | 39 ++++++++++++++++++ src/servo/es08a.h | 40 ++++++++++++++++++ src/servo/jsupm_es08a.i | 7 ++++ src/servo/pyupm_es08a.i | 8 ++++ src/servo/servo.cxx | 88 ++++++++++++++++++++++++++++++++++++++++ src/servo/servo.h | 58 ++++++++++++++++++++++++++ 10 files changed, 316 insertions(+) create mode 100644 examples/es08a.cxx create mode 100644 src/servo/CMakeLists.txt create mode 100644 src/servo/es08a.cxx create mode 100644 src/servo/es08a.h create mode 100644 src/servo/jsupm_es08a.i create mode 100644 src/servo/pyupm_es08a.i create mode 100644 src/servo/servo.cxx create mode 100644 src/servo/servo.h diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 44ffc368..ddaf11bf 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -8,6 +8,7 @@ add_executable (led-bar led-bar.cxx) add_executable (seg-lcd 4digitdisplay.cxx) add_executable (nrf_transmitter nrf_transmitter.cxx) add_executable (nrf_receiver nrf_receiver.cxx) +add_executable (es08a es08a.cxx) include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l) include_directories (${PROJECT_SOURCE_DIR}/src/grove) @@ -16,6 +17,7 @@ include_directories (${PROJECT_SOURCE_DIR}/src/buzzer) include_directories (${PROJECT_SOURCE_DIR}/src/ledbar) include_directories (${PROJECT_SOURCE_DIR}/src/4digitdisplay) include_directories (${PROJECT_SOURCE_DIR}/src/nrf24l01) +include_directories (${PROJECT_SOURCE_DIR}/src/servo) target_link_libraries (compass hmc5883l ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (groveled grove ${CMAKE_THREAD_LIBS_INIT}) @@ -27,3 +29,4 @@ target_link_libraries (led-bar ledbar ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (seg-lcd 4digitdisplay ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (nrf_transmitter nrf24l01 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (nrf_receiver nrf24l01 ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (es08a servo ${CMAKE_THREAD_LIBS_INIT}) diff --git a/examples/es08a.cxx b/examples/es08a.cxx new file mode 100644 index 00000000..c82bb255 --- /dev/null +++ b/examples/es08a.cxx @@ -0,0 +1,68 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include "es08a.h" +#include +#include + +int running = 0; + +void +sig_handler(int signo) +{ + printf("got signal\n"); + if (signo == SIGINT) { + printf("exiting application\n"); + running = 1; + } +} + +int +main(int argc, char **argv) +{ + upm::ES08A *servo = new upm::ES08A(5); + + signal(SIGINT, sig_handler); + + int clock = 0; + while (!running) { + for (int i = 0; i < 18; i++) { + servo->setAngle (clock); + clock += 10; + } + + for (int i = 0; i < 18; i++) { + servo->setAngle (clock); + clock -= 10; + } + } + + std::cout << "exiting application" << std::endl; + + delete servo; + + return 0; +} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 87264f59..7089684c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,3 +5,4 @@ add_subdirectory (buzzer) add_subdirectory (ledbar) add_subdirectory (4digitdisplay) add_subdirectory (nrf24l01) +add_subdirectory (servo) diff --git a/src/servo/CMakeLists.txt b/src/servo/CMakeLists.txt new file mode 100644 index 00000000..1bd9e5dc --- /dev/null +++ b/src/servo/CMakeLists.txt @@ -0,0 +1,4 @@ +set (libname "servo") +add_library (servo SHARED servo.cxx es08a.cxx) +include_directories (${MAA_INCLUDE_DIR}) +target_link_libraries (servo ${MAA_LIBRARIES}) diff --git a/src/servo/es08a.cxx b/src/servo/es08a.cxx new file mode 100644 index 00000000..01ecd82b --- /dev/null +++ b/src/servo/es08a.cxx @@ -0,0 +1,39 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include + +#include "es08a.h" + +using namespace upm; + +ES08A::ES08A (int pin) : Servo(pin) { + m_name = "ES08A"; + m_maxAngle = 180.0; +} + +ES08A::~ES08A() { + +} diff --git a/src/servo/es08a.h b/src/servo/es08a.h new file mode 100644 index 00000000..c17dbc62 --- /dev/null +++ b/src/servo/es08a.h @@ -0,0 +1,40 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +#pragma once + +#include +#include "servo.h" + +namespace upm { + +#define MIN_PULSE_WIDTH 600 +#define MAX_PULSE_WIDTH 2500 + +class ES08A : public Servo { + public: + ES08A (int pin); + ~ES08A (); +}; + +} diff --git a/src/servo/jsupm_es08a.i b/src/servo/jsupm_es08a.i new file mode 100644 index 00000000..00e51d80 --- /dev/null +++ b/src/servo/jsupm_es08a.i @@ -0,0 +1,7 @@ +%module jsupm_es08a + +%{ + #include "es08a.h" +%} + +%include "es08a.h" diff --git a/src/servo/pyupm_es08a.i b/src/servo/pyupm_es08a.i new file mode 100644 index 00000000..3262ba3b --- /dev/null +++ b/src/servo/pyupm_es08a.i @@ -0,0 +1,8 @@ +%module pyupm_es08a + +%feature("autodoc", "3"); + +%include "es08a.h" +%{ + #include "es08a.h" +%} diff --git a/src/servo/servo.cxx b/src/servo/servo.cxx new file mode 100644 index 00000000..c117a9b4 --- /dev/null +++ b/src/servo/servo.cxx @@ -0,0 +1,88 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include + +#include "servo.h" + +using namespace upm; + +Servo::Servo (int pin) { + maa_result_t error = MAA_SUCCESS; + + m_maxAngle = 180.0; + m_servoPin = pin; + m_pwmServoContext = maa_pwm_init (m_servoPin); +} + +Servo::~Servo () { + +} + +/* + * X = between (MIN_PULSE_WIDTH , MAX_PULSE_WIDTH) + * + * X usec + * _______ + * |_______________________________________ + * 20000 usec + * + * Max period can be only 7968750(nses) which is ~8(msec) + * so the servo wil not work as expected. + * */ +maa_result_t Servo::setAngle (int angle) { + if (m_pwmServoContext == NULL) { + std::cout << "PWM context is NULL" << std::endl; + return MAA_ERROR_UNSPECIFIED; + } + + maa_pwm_enable (m_pwmServoContext, 1); + for (int cycles = 0; cycles < 128; cycles++) { + maa_pwm_period_us (m_pwmServoContext, MAX_PERIOD); + maa_pwm_pulsewidth_us (m_pwmServoContext, calcPulseTraveling(angle)); + } + maa_pwm_enable (m_pwmServoContext, 0); + + std::cout << "angle = " << angle << " ,pulse = " << calcPulseTraveling(angle) << std::endl; +} + +/* + * Calculating relative pulse time to the value. + * */ +int Servo::calcPulseTraveling (int value) { + // if bigger than the boundaries + if (value > m_maxAngle) { + return MAX_PULSE_WIDTH; + } + + // if less than the boundaries + if (value < 0) { + return MIN_PULSE_WIDTH; + } + + // the conversion + return (int) ((float)MIN_PULSE_WIDTH + ((float)value / m_maxAngle) * ((float)MAX_PULSE_WIDTH - (float)MIN_PULSE_WIDTH)); +} diff --git a/src/servo/servo.h b/src/servo/servo.h new file mode 100644 index 00000000..430a4968 --- /dev/null +++ b/src/servo/servo.h @@ -0,0 +1,58 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +#pragma once + +#include +#include + +namespace upm { + +#define MIN_PULSE_WIDTH 600 +#define MAX_PULSE_WIDTH 2500 +#define MAX_PERIOD 7968 + +#define HIGH 1 +#define LOW 0 + +class Servo { + public: + Servo (int pin); + ~Servo(); + maa_result_t setAngle (int angle); + + std::string name() + { + return m_name; + } + protected: + int calcPulseTraveling (int value); + + std::string m_name; + int m_servoPin; + float m_maxAngle; + maa_pwm_context m_pwmServoContext; + // maa_gpio_context m_servoPinCtx; +}; + +} From 23d847e3800646035c8b492f600a790c8fc87c71 Mon Sep 17 00:00:00 2001 From: Kiveisha Yevgeniy Date: Wed, 4 Jun 2014 14:57:19 +0000 Subject: [PATCH 2/5] hcsr04: Added new sonar module (not working properly yet) Signed-off-by: Kiveisha Yevgeniy --- examples/CMakeLists.txt | 3 ++ examples/hcsr04.cxx | 61 +++++++++++++++++++++++++ src/CMakeLists.txt | 1 + src/hcsr04/CMakeLists.txt | 4 ++ src/hcsr04/hcsr04.cxx | 94 +++++++++++++++++++++++++++++++++++++++ src/hcsr04/hcsr04.h | 66 +++++++++++++++++++++++++++ src/hcsr04/jsupm_hcsr04.i | 7 +++ src/hcsr04/pyupm_hcsr04.i | 8 ++++ 8 files changed, 244 insertions(+) create mode 100644 examples/hcsr04.cxx create mode 100644 src/hcsr04/CMakeLists.txt create mode 100644 src/hcsr04/hcsr04.cxx create mode 100644 src/hcsr04/hcsr04.h create mode 100644 src/hcsr04/jsupm_hcsr04.i create mode 100644 src/hcsr04/pyupm_hcsr04.i diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index ddaf11bf..79572e3d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -9,6 +9,7 @@ add_executable (seg-lcd 4digitdisplay.cxx) add_executable (nrf_transmitter nrf_transmitter.cxx) add_executable (nrf_receiver nrf_receiver.cxx) add_executable (es08a es08a.cxx) +add_executable (son-hcsr04 hcsr04.cxx) include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l) include_directories (${PROJECT_SOURCE_DIR}/src/grove) @@ -18,6 +19,7 @@ include_directories (${PROJECT_SOURCE_DIR}/src/ledbar) include_directories (${PROJECT_SOURCE_DIR}/src/4digitdisplay) include_directories (${PROJECT_SOURCE_DIR}/src/nrf24l01) include_directories (${PROJECT_SOURCE_DIR}/src/servo) +include_directories (${PROJECT_SOURCE_DIR}/src/hcsr04) target_link_libraries (compass hmc5883l ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (groveled grove ${CMAKE_THREAD_LIBS_INIT}) @@ -30,3 +32,4 @@ target_link_libraries (seg-lcd 4digitdisplay ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (nrf_transmitter nrf24l01 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (nrf_receiver nrf24l01 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (es08a servo ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (son-hcsr04 hcsr04 ${CMAKE_THREAD_LIBS_INIT}) diff --git a/examples/hcsr04.cxx b/examples/hcsr04.cxx new file mode 100644 index 00000000..4cf454c1 --- /dev/null +++ b/examples/hcsr04.cxx @@ -0,0 +1,61 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include "hcsr04.h" +#include +#include +#include + +upm::HCSR04 *sonar = NULL; + +void +sig_handler(int signo) +{ + printf("got signal\n"); + if (signo == SIGINT) { + printf("exiting application\n"); + sonar->m_doWork = 1; + } +} + +void +interrupt (void) { + sonar->ackEdgeDetected (); +} + +int +main(int argc, char **argv) +{ + sonar = new upm::HCSR04(5, 7, &interrupt); + signal(SIGINT, sig_handler); + + printf ("width = %d\n", sonar->getDistance()); + std::cout << "exiting application" << std::endl; + + delete sonar; + + return 0; +} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7089684c..51edb876 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,3 +6,4 @@ add_subdirectory (ledbar) add_subdirectory (4digitdisplay) add_subdirectory (nrf24l01) add_subdirectory (servo) +add_subdirectory (hcsr04) diff --git a/src/hcsr04/CMakeLists.txt b/src/hcsr04/CMakeLists.txt new file mode 100644 index 00000000..0b40430a --- /dev/null +++ b/src/hcsr04/CMakeLists.txt @@ -0,0 +1,4 @@ +set (libname "hcsr04") +add_library (hcsr04 SHARED hcsr04.cxx) +include_directories (${MAA_INCLUDE_DIR}) +target_link_libraries (hcsr04 ${MAA_LIBRARIES}) diff --git a/src/hcsr04/hcsr04.cxx b/src/hcsr04/hcsr04.cxx new file mode 100644 index 00000000..1eb1054f --- /dev/null +++ b/src/hcsr04/hcsr04.cxx @@ -0,0 +1,94 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include +#include +#include + +#include "hcsr04.h" + +using namespace upm; + +HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void)) { + maa_result_t error = MAA_SUCCESS; + m_name = "HCSR04"; + + m_pwmTriggerCtx = maa_pwm_init (triggerPin); + if (m_pwmTriggerCtx == NULL) { + std::cout << "PWM context is NULL" << std::endl; + exit (1); + } + + maa_init(); + m_echoPinCtx = maa_gpio_init(echoPin); + if (m_echoPinCtx == NULL) { + fprintf (stderr, "Are you sure that pin%d you requested is valid on your platform?", echoPin); + exit (1); + } + + maa_gpio_dir(m_echoPinCtx, MAA_GPIO_IN); + gpio_edge_t edge = MAA_GPIO_EDGE_BOTH; + maa_gpio_isr (m_echoPinCtx, edge, fptr); +} + +HCSR04::~HCSR04 () { + maa_result_t error = MAA_SUCCESS; + + maa_pwm_close (m_pwmTriggerCtx); + error = maa_gpio_close (m_echoPinCtx); + if (error != MAA_SUCCESS) { + maa_result_print (error); + } +} + +int +HCSR04::getDistance () { + maa_pwm_enable (m_pwmTriggerCtx, 1); + maa_pwm_period_us (m_pwmTriggerCtx, MAX_PERIOD); + maa_pwm_pulsewidth_us (m_pwmTriggerCtx, TRIGGER_PULSE); + maa_pwm_enable (m_pwmTriggerCtx, 0); + + m_doWork = 0; + m_InterruptCounter = 0; + while (!m_doWork) { + sleep (1); + } + + return m_FallingTimeStamp - m_RisingTimeStamp; +} + +void +HCSR04::ackEdgeDetected () { + struct timeval timer; + gettimeofday(&timer, NULL); + + ++m_InterruptCounter; + if (!(m_InterruptCounter % 2)) { + m_FallingTimeStamp = 1000000 * timer.tv_sec + timer.tv_usec; + m_doWork = 1; + } else { + m_RisingTimeStamp = 1000000 * timer.tv_sec + timer.tv_usec; + } +} diff --git a/src/hcsr04/hcsr04.h b/src/hcsr04/hcsr04.h new file mode 100644 index 00000000..f94776c5 --- /dev/null +++ b/src/hcsr04/hcsr04.h @@ -0,0 +1,66 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ +#pragma once + +#include +#include +#include +#include +#include + +#define HIGH 1 +#define LOW 0 + +#define MAX_PERIOD 7968 +#define TRIGGER_PULSE 10 + +namespace upm { + +class HCSR04 { + public: + HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void)); + ~HCSR04 (); + int getDistance (); + void ackEdgeDetected (); + + uint8_t m_doWork; + + std::string name() + { + return m_name; + } + + private: + maa_pwm_context m_pwmTriggerCtx; + maa_gpio_context m_echoPinCtx; + + uint8_t m_waitEcho; + long m_RisingTimeStamp; + long m_FallingTimeStamp; + uint8_t m_InterruptCounter; + + std::string m_name; +}; + +} diff --git a/src/hcsr04/jsupm_hcsr04.i b/src/hcsr04/jsupm_hcsr04.i new file mode 100644 index 00000000..808c3779 --- /dev/null +++ b/src/hcsr04/jsupm_hcsr04.i @@ -0,0 +1,7 @@ +%module jsupm_hcsr04 + +%{ + #include "hcsr04.h" +%} + +%include "hcsr04.h" diff --git a/src/hcsr04/pyupm_hcsr04.i b/src/hcsr04/pyupm_hcsr04.i new file mode 100644 index 00000000..175e983f --- /dev/null +++ b/src/hcsr04/pyupm_hcsr04.i @@ -0,0 +1,8 @@ +%module pyupm_hcsr04 + +%feature("autodoc", "3"); + +%include "hcsr04.h" +%{ + #include "hcsr04.h" +%} From 039b1381946da8c35e023c1c129d4551ede5d8ea Mon Sep 17 00:00:00 2001 From: Kiveisha Yevgeniy Date: Thu, 5 Jun 2014 13:02:49 +0000 Subject: [PATCH 3/5] ssd1308: Added new oled display Signed-off-by: Kiveisha Yevgeniy --- examples/CMakeLists.txt | 2 + examples/oled-1308.cxx | 116 +++++++++++++++++++++++++++ src/lcd/CMakeLists.txt | 2 +- src/lcd/jsupm_ssd1308.i | 7 ++ src/lcd/pyupm_ssd1308.i | 8 ++ src/lcd/ssd1308.cxx | 172 +++++++++++++++++++++++++++++++++++++++ src/lcd/ssd1308.h | 173 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 479 insertions(+), 1 deletion(-) create mode 100644 examples/oled-1308.cxx create mode 100644 src/lcd/jsupm_ssd1308.i create mode 100644 src/lcd/pyupm_ssd1308.i create mode 100644 src/lcd/ssd1308.cxx create mode 100644 src/lcd/ssd1308.h diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 79572e3d..d110d3ce 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -10,6 +10,7 @@ add_executable (nrf_transmitter nrf_transmitter.cxx) add_executable (nrf_receiver nrf_receiver.cxx) add_executable (es08a es08a.cxx) add_executable (son-hcsr04 hcsr04.cxx) +add_executable (oled-1308 oled-1308.cxx) include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l) include_directories (${PROJECT_SOURCE_DIR}/src/grove) @@ -33,3 +34,4 @@ target_link_libraries (nrf_transmitter nrf24l01 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (nrf_receiver nrf24l01 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (es08a servo ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (son-hcsr04 hcsr04 ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (oled-1308 i2clcd ${CMAKE_THREAD_LIBS_INIT}) diff --git a/examples/oled-1308.cxx b/examples/oled-1308.cxx new file mode 100644 index 00000000..aa38e69f --- /dev/null +++ b/examples/oled-1308.cxx @@ -0,0 +1,116 @@ +/* + * Author: Yevgeniy Kiveish + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "ssd1308.h" + +#define DEVICE_ADDRESS 0x3C +#define BUS_NUMBER 0x0 + +static uint8_t SeeedLogo[] ={ +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x60, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, +0xff, 0xfc, 0x00, 0x00, 0x00, 0x80, 0xf0, 0x20, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x60, 0xe0, 0xc0, +0xc0, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x60, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, +0xc0, 0xe0, 0x60, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x60, 0xe0, 0xc0, 0xc0, +0x80, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xc0, 0xc0, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, +0x00, 0xc0, 0xc0, 0xe0, 0x60, 0xc0, 0xc0, 0x80, 0x00, 0xc0, 0xf0, 0xf0, 0xf0, 0xc0, 0x00, 0xc0, +0xc0, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xc0, 0xc0, +0xf8, 0xf8, 0x00, 0xd8, 0xd8, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0x60, 0xc0, 0xc0, 0x80, 0x00, +0x00, 0x03, 0x0f, 0x1e, 0x3c, 0x70, 0xe3, 0xcf, 0x9f, 0x30, 0x00, 0x00, 0x00, 0x00, 0x70, 0xbf, +0xcf, 0xe3, 0x70, 0x78, 0x3e, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x33, 0x77, 0x66, 0x66, 0x66, 0x6c, +0x7d, 0x18, 0x00, 0x1f, 0x3f, 0x76, 0x66, 0x66, 0x66, 0x76, 0x37, 0x07, 0x00, 0x0f, 0x3f, 0x7f, +0x66, 0x66, 0x66, 0x66, 0x77, 0x27, 0x07, 0x00, 0x1f, 0x3f, 0x76, 0x66, 0x66, 0x66, 0x76, 0x37, +0x07, 0x00, 0x0f, 0x3f, 0x71, 0x60, 0x60, 0x60, 0x60, 0x31, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, +0x11, 0x37, 0x67, 0x66, 0x66, 0x6c, 0x7d, 0x38, 0x00, 0x00, 0x3f, 0x7f, 0x3f, 0x00, 0x00, 0x1f, +0x3f, 0x70, 0x60, 0x60, 0x70, 0x7f, 0x7f, 0x00, 0x0f, 0x3f, 0x71, 0x60, 0x60, 0x60, 0x60, 0x31, +0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x06, 0x1f, 0x3b, 0x60, 0x60, 0x60, 0x60, 0x71, 0x3f, 0x1f, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, +0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x48, 0x48, 0x48, 0xb0, 0x00, 0xc0, 0x20, +0x20, 0x20, 0xc0, 0x00, 0xc0, 0x20, 0x20, 0x20, 0xc0, 0x00, 0x40, 0xa0, 0xa0, 0xa0, 0x20, 0x00, +0x00, 0x20, 0xf0, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xf8, 0x08, +0x08, 0x00, 0xc0, 0x20, 0x20, 0x20, 0xf8, 0x00, 0xc0, 0xa0, 0xa0, 0xa0, 0xc0, 0x00, 0x20, 0xa0, +0xa0, 0xa0, 0xc0, 0x00, 0x40, 0xa0, 0xa0, 0xa0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x48, 0x48, 0x48, 0x08, 0x00, 0x20, 0x40, 0x80, 0x40, +0x20, 0x00, 0x00, 0x20, 0xf0, 0x20, 0x20, 0x00, 0xc0, 0xa0, 0xa0, 0xa0, 0xc0, 0x00, 0xe0, 0x00, +0x20, 0x20, 0xc0, 0x00, 0xc0, 0x20, 0x20, 0x20, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x02, 0x02, 0x01, 0x00, 0x01, 0x02, +0x02, 0x02, 0x01, 0x00, 0x01, 0x02, 0x02, 0x02, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x00, +0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x03, 0x02, +0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x03, 0x00, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x02, +0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x00, 0x00, 0x08, 0x06, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x02, 0x82, 0x02, 0x00, 0x02, 0x01, 0x01, 0x01, +0x02, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x03, 0x00, +0x00, 0x00, 0x03, 0x00, 0x01, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x82, 0x8c, 0x60, 0x1c, 0x02, 0x00, 0x1c, 0x22, 0x22, 0x22, 0x1c, 0x00, 0x1e, +0x20, 0x20, 0x00, 0x3e, 0x00, 0x00, 0x3e, 0x04, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x3e, 0x04, 0x02, 0x02, 0x00, 0x1c, 0x2a, 0x2a, 0x2a, 0x0c, 0x00, 0x12, 0x2a, 0x2a, +0x2a, 0x1c, 0x20, 0x1c, 0x22, 0x22, 0x22, 0x14, 0x00, 0x3f, 0x00, 0x02, 0x02, 0x3c, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + + +int +main(int argc, char **argv) +{ + upm::SSD1308 *lcd = new upm::SSD1308 (BUS_NUMBER, DEVICE_ADDRESS); + + /* + * Simple print hello world + */ + // lcd->setCursor (0, 0); + // lcd->write ("Hello World"); + + /* + * Simple print hello world + */ + lcd->clear (); + lcd->draw (SeeedLogo, 1024); + + lcd->close (); +} diff --git a/src/lcd/CMakeLists.txt b/src/lcd/CMakeLists.txt index b77b6f05..5108da42 100644 --- a/src/lcd/CMakeLists.txt +++ b/src/lcd/CMakeLists.txt @@ -1,4 +1,4 @@ set (libname "i2clcd") -add_library (i2clcd SHARED iiclcd.cxx lcm1602.cxx jhd1313m1.cxx) +add_library (i2clcd SHARED iiclcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx) include_directories (${MAA_INCLUDE_DIR}) target_link_libraries (i2clcd ${MAA_LIBRARIES}) diff --git a/src/lcd/jsupm_ssd1308.i b/src/lcd/jsupm_ssd1308.i new file mode 100644 index 00000000..d5a4f189 --- /dev/null +++ b/src/lcd/jsupm_ssd1308.i @@ -0,0 +1,7 @@ +%module jsupm_ssd1308 + +%{ + #include "ssd1308.h" +%} + +%include "ssd1308.h" diff --git a/src/lcd/pyupm_ssd1308.i b/src/lcd/pyupm_ssd1308.i new file mode 100644 index 00000000..aa0f0435 --- /dev/null +++ b/src/lcd/pyupm_ssd1308.i @@ -0,0 +1,8 @@ +%module pyupm_ssd1308 + +%feature("autodoc", "3"); + +%include "ssd1308.h" +%{ + #include "ssd1308.h" +%} diff --git a/src/lcd/ssd1308.cxx b/src/lcd/ssd1308.cxx new file mode 100644 index 00000000..2456efb8 --- /dev/null +++ b/src/lcd/ssd1308.cxx @@ -0,0 +1,172 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include + +#include "ssd1308.h" + +using namespace upm; + +SSD1308::SSD1308 (int bus_in, int addr_in) : IICLcd (bus_in, addr_in) { + i2Cmd (m_i2c_lcd_control, DISPLAY_CMD_OFF); // display off + printf ("NO_GDB :: DISPLAY_CMD_OFF \n"); + usleep (4500); + i2Cmd (m_i2c_lcd_control, DISPLAY_CMD_ON); // display on + usleep (4500); + setNormalDisplay (); // set to normal display '1' is ON + + clear (); + setAddressingMode (PAGE); +} + +SSD1308::~SSD1308 () { + +} + +maa_result_t +SSD1308::draw (uint8_t *data, int bytes) { + maa_result_t error = MAA_SUCCESS; + + setAddressingMode (HORIZONTAL); + for (int idx = 0; idx < bytes; idx++) { + i2cData (m_i2c_lcd_control, data[idx]); + } + + return error; +} + +/* + * ************** + * virtual area + * ************** + */ +maa_result_t +SSD1308::write (std::string msg) { + maa_result_t error = MAA_SUCCESS; + uint8_t data[2] = {0x40, 0}; + + setAddressingMode (PAGE); + for (std::string::size_type i = 0; i < msg.size(); ++i) { + writeChar (m_i2c_lcd_control, msg[i]); + } + + return error; +} + +maa_result_t +SSD1308::setCursor (int row, int column) { + maa_result_t error = MAA_SUCCESS; + + error = i2Cmd (m_i2c_lcd_control, BASE_PAGE_START_ADDR + row); // set page address + error = i2Cmd (m_i2c_lcd_control, BASE_LOW_COLUMN_ADDR + (8 * column & 0x0F)); // set column lower address + error = i2Cmd (m_i2c_lcd_control, BASE_HIGH_COLUMN_ADDR + ((8 * column >> 4) & 0x0F)); // set column higher address + + return error; +} + +maa_result_t +SSD1308::clear () { + maa_result_t error = MAA_SUCCESS; + uint8_t columnIdx, rowIdx; + + i2Cmd (m_i2c_lcd_control, DISPLAY_CMD_OFF); // display off + for(rowIdx = 0; rowIdx < 8; rowIdx++) { + setCursor (rowIdx, 0); + + // clear all columns + for(columnIdx = 0; columnIdx < 16; columnIdx++) { + writeChar (m_i2c_lcd_control, ' '); + } + } + i2Cmd (m_i2c_lcd_control, DISPLAY_CMD_ON); // display on + home (); + + return MAA_SUCCESS; +} + +maa_result_t +SSD1308::home () { + return setCursor (0, 0); +} + +/* + * ************** + * private area + * ************** + */ +maa_result_t +SSD1308::i2cReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t value) { + maa_result_t error = MAA_SUCCESS; + + uint8_t data[2] = { addr, value }; + error = maa_i2c_address (ctx, deviceAdress); + error = maa_i2c_write (ctx, data, 2); + + return error; +} + +maa_result_t +SSD1308::i2Cmd (maa_i2c_context ctx, uint8_t value) { + maa_result_t error = MAA_SUCCESS; + + uint8_t data[2] = { 0x80, value }; + error = maa_i2c_address (ctx, m_lcd_control_address); + error = maa_i2c_write (ctx, data, 2); + + return error; +} + +maa_result_t +SSD1308::i2cData (maa_i2c_context ctx, uint8_t value) { + maa_result_t error = MAA_SUCCESS; + + uint8_t data[2] = { 0x40, value }; + error = maa_i2c_address (ctx, m_lcd_control_address); + error = maa_i2c_write (ctx, data, 2); + + return error; +} + +maa_result_t +SSD1308::writeChar (maa_i2c_context ctx, uint8_t value) { + if (value < 0x20 || value > 0x7F) { + value = 0x20; // space + } + + for (uint8_t idx = 0; idx < 8; idx++) { + i2cData (m_i2c_lcd_control, BasicFont[value - 32][idx]); + } +} + +maa_result_t +SSD1308::setNormalDisplay () { + return i2Cmd (m_i2c_lcd_control, DISPLAY_CMD_SET_NORMAL); // set to normal display '1' is ON +} + +maa_result_t +SSD1308::setAddressingMode (displayAddressingMode mode) { + i2Cmd (m_i2c_lcd_control, DISPLAY_CMD_MEM_ADDR_MODE); //set addressing mode + i2Cmd (m_i2c_lcd_control, mode); //set page addressing mode +} diff --git a/src/lcd/ssd1308.h b/src/lcd/ssd1308.h new file mode 100644 index 00000000..a3f18816 --- /dev/null +++ b/src/lcd/ssd1308.h @@ -0,0 +1,173 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#pragma once + +#include +#include "iiclcd.h" + +namespace upm { + +#define DISPLAY_CMD_OFF 0xAE +#define DISPLAY_CMD_ON 0xAF + +#define BASE_LOW_COLUMN_ADDR 0x00 +#define BASE_HIGH_COLUMN_ADDR 0x10 +#define BASE_PAGE_START_ADDR 0xB0 +#define DISPLAY_CMD_MEM_ADDR_MODE 0x20 + +#define DISPLAY_CMD_SET_NORMAL 0xA6 + +const uint8_t BasicFont[][8] = +{ + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x5F,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x07,0x00,0x07,0x00,0x00,0x00}, + {0x00,0x14,0x7F,0x14,0x7F,0x14,0x00,0x00}, + {0x00,0x24,0x2A,0x7F,0x2A,0x12,0x00,0x00}, + {0x00,0x23,0x13,0x08,0x64,0x62,0x00,0x00}, + {0x00,0x36,0x49,0x55,0x22,0x50,0x00,0x00}, + {0x00,0x00,0x05,0x03,0x00,0x00,0x00,0x00}, + {0x00,0x1C,0x22,0x41,0x00,0x00,0x00,0x00}, + {0x00,0x41,0x22,0x1C,0x00,0x00,0x00,0x00}, + {0x00,0x08,0x2A,0x1C,0x2A,0x08,0x00,0x00}, + {0x00,0x08,0x08,0x3E,0x08,0x08,0x00,0x00}, + {0x00,0xA0,0x60,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x08,0x08,0x08,0x08,0x08,0x00,0x00}, + {0x00,0x60,0x60,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x20,0x10,0x08,0x04,0x02,0x00,0x00}, + {0x00,0x3E,0x51,0x49,0x45,0x3E,0x00,0x00}, + {0x00,0x00,0x42,0x7F,0x40,0x00,0x00,0x00}, + {0x00,0x62,0x51,0x49,0x49,0x46,0x00,0x00}, + {0x00,0x22,0x41,0x49,0x49,0x36,0x00,0x00}, + {0x00,0x18,0x14,0x12,0x7F,0x10,0x00,0x00}, + {0x00,0x27,0x45,0x45,0x45,0x39,0x00,0x00}, + {0x00,0x3C,0x4A,0x49,0x49,0x30,0x00,0x00}, + {0x00,0x01,0x71,0x09,0x05,0x03,0x00,0x00}, + {0x00,0x36,0x49,0x49,0x49,0x36,0x00,0x00}, + {0x00,0x06,0x49,0x49,0x29,0x1E,0x00,0x00}, + {0x00,0x00,0x36,0x36,0x00,0x00,0x00,0x00}, + {0x00,0x00,0xAC,0x6C,0x00,0x00,0x00,0x00}, + {0x00,0x08,0x14,0x22,0x41,0x00,0x00,0x00}, + {0x00,0x14,0x14,0x14,0x14,0x14,0x00,0x00}, + {0x00,0x41,0x22,0x14,0x08,0x00,0x00,0x00}, + {0x00,0x02,0x01,0x51,0x09,0x06,0x00,0x00}, + {0x00,0x32,0x49,0x79,0x41,0x3E,0x00,0x00}, + {0x00,0x7E,0x09,0x09,0x09,0x7E,0x00,0x00}, + {0x00,0x7F,0x49,0x49,0x49,0x36,0x00,0x00}, + {0x00,0x3E,0x41,0x41,0x41,0x22,0x00,0x00}, + {0x00,0x7F,0x41,0x41,0x22,0x1C,0x00,0x00}, + {0x00,0x7F,0x49,0x49,0x49,0x41,0x00,0x00}, + {0x00,0x7F,0x09,0x09,0x09,0x01,0x00,0x00}, + {0x00,0x3E,0x41,0x41,0x51,0x72,0x00,0x00}, + {0x00,0x7F,0x08,0x08,0x08,0x7F,0x00,0x00}, + {0x00,0x41,0x7F,0x41,0x00,0x00,0x00,0x00}, + {0x00,0x20,0x40,0x41,0x3F,0x01,0x00,0x00}, + {0x00,0x7F,0x08,0x14,0x22,0x41,0x00,0x00}, + {0x00,0x7F,0x40,0x40,0x40,0x40,0x00,0x00}, + {0x00,0x7F,0x02,0x0C,0x02,0x7F,0x00,0x00}, + {0x00,0x7F,0x04,0x08,0x10,0x7F,0x00,0x00}, + {0x00,0x3E,0x41,0x41,0x41,0x3E,0x00,0x00}, + {0x00,0x7F,0x09,0x09,0x09,0x06,0x00,0x00}, + {0x00,0x3E,0x41,0x51,0x21,0x5E,0x00,0x00}, + {0x00,0x7F,0x09,0x19,0x29,0x46,0x00,0x00}, + {0x00,0x26,0x49,0x49,0x49,0x32,0x00,0x00}, + {0x00,0x01,0x01,0x7F,0x01,0x01,0x00,0x00}, + {0x00,0x3F,0x40,0x40,0x40,0x3F,0x00,0x00}, + {0x00,0x1F,0x20,0x40,0x20,0x1F,0x00,0x00}, + {0x00,0x3F,0x40,0x38,0x40,0x3F,0x00,0x00}, + {0x00,0x63,0x14,0x08,0x14,0x63,0x00,0x00}, + {0x00,0x03,0x04,0x78,0x04,0x03,0x00,0x00}, + {0x00,0x61,0x51,0x49,0x45,0x43,0x00,0x00}, + {0x00,0x7F,0x41,0x41,0x00,0x00,0x00,0x00}, + {0x00,0x02,0x04,0x08,0x10,0x20,0x00,0x00}, + {0x00,0x41,0x41,0x7F,0x00,0x00,0x00,0x00}, + {0x00,0x04,0x02,0x01,0x02,0x04,0x00,0x00}, + {0x00,0x80,0x80,0x80,0x80,0x80,0x00,0x00}, + {0x00,0x01,0x02,0x04,0x00,0x00,0x00,0x00}, + {0x00,0x20,0x54,0x54,0x54,0x78,0x00,0x00}, + {0x00,0x7F,0x48,0x44,0x44,0x38,0x00,0x00}, + {0x00,0x38,0x44,0x44,0x28,0x00,0x00,0x00}, + {0x00,0x38,0x44,0x44,0x48,0x7F,0x00,0x00}, + {0x00,0x38,0x54,0x54,0x54,0x18,0x00,0x00}, + {0x00,0x08,0x7E,0x09,0x02,0x00,0x00,0x00}, + {0x00,0x18,0xA4,0xA4,0xA4,0x7C,0x00,0x00}, + {0x00,0x7F,0x08,0x04,0x04,0x78,0x00,0x00}, + {0x00,0x00,0x7D,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x80,0x84,0x7D,0x00,0x00,0x00,0x00}, + {0x00,0x7F,0x10,0x28,0x44,0x00,0x00,0x00}, + {0x00,0x41,0x7F,0x40,0x00,0x00,0x00,0x00}, + {0x00,0x7C,0x04,0x18,0x04,0x78,0x00,0x00}, + {0x00,0x7C,0x08,0x04,0x7C,0x00,0x00,0x00}, + {0x00,0x38,0x44,0x44,0x38,0x00,0x00,0x00}, + {0x00,0xFC,0x24,0x24,0x18,0x00,0x00,0x00}, + {0x00,0x18,0x24,0x24,0xFC,0x00,0x00,0x00}, + {0x00,0x00,0x7C,0x08,0x04,0x00,0x00,0x00}, + {0x00,0x48,0x54,0x54,0x24,0x00,0x00,0x00}, + {0x00,0x04,0x7F,0x44,0x00,0x00,0x00,0x00}, + {0x00,0x3C,0x40,0x40,0x7C,0x00,0x00,0x00}, + {0x00,0x1C,0x20,0x40,0x20,0x1C,0x00,0x00}, + {0x00,0x3C,0x40,0x30,0x40,0x3C,0x00,0x00}, + {0x00,0x44,0x28,0x10,0x28,0x44,0x00,0x00}, + {0x00,0x1C,0xA0,0xA0,0x7C,0x00,0x00,0x00}, + {0x00,0x44,0x64,0x54,0x4C,0x44,0x00,0x00}, + {0x00,0x08,0x36,0x41,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x41,0x36,0x08,0x00,0x00,0x00,0x00}, + {0x00,0x02,0x01,0x01,0x02,0x01,0x00,0x00}, + {0x00,0x02,0x05,0x05,0x02,0x00,0x00,0x00} +}; + +typedef enum { + HORIZONTAL = 0, + VERTICAL = 1, + PAGE = 2 +} displayAddressingMode; + +class SSD1308 : public IICLcd { + public: + /** SSD1308 Constructor. + * Calls MAA initialisation functions. + * @param bus i2c bus to use + * @param address the slave address the lcd is registered on. + */ + SSD1308 (int bus, int address); + ~SSD1308 (); + maa_result_t draw(uint8_t *data, int bytes); + + // virtual methods + maa_result_t write (std::string msg); + maa_result_t setCursor (int row, int column); + maa_result_t clear (); + maa_result_t home (); + + private: + maa_result_t i2Cmd (maa_i2c_context ctx, uint8_t value); + maa_result_t i2cReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t data); + maa_result_t i2cData (maa_i2c_context ctx, uint8_t value); + maa_result_t writeChar (maa_i2c_context ctx, uint8_t value); + maa_result_t setNormalDisplay (); + maa_result_t setAddressingMode (displayAddressingMode mode); + }; +} From 3ce441f0a89770b19f2c674b94bd3036069155b7 Mon Sep 17 00:00:00 2001 From: Kiveisha Yevgeniy Date: Thu, 5 Jun 2014 15:20:40 +0000 Subject: [PATCH 4/5] lcd: changed the OOO generalisation. Signed-off-by: Kiveisha Yevgeniy --- src/lcd/iiclcd.cxx | 33 +++++++++++++++++++++ src/lcd/iiclcd.h | 11 +++++-- src/lcd/jhd1313m1.cxx | 69 +++++++++++-------------------------------- src/lcd/jhd1313m1.h | 3 -- src/lcd/lcm1602.cxx | 2 +- src/lcd/ssd1308.cxx | 33 --------------------- src/lcd/ssd1308.h | 5 +--- 7 files changed, 61 insertions(+), 95 deletions(-) diff --git a/src/lcd/iiclcd.cxx b/src/lcd/iiclcd.cxx index aec56f12..a2d39e42 100644 --- a/src/lcd/iiclcd.cxx +++ b/src/lcd/iiclcd.cxx @@ -51,3 +51,36 @@ maa_result_t IICLcd::close() { return maa_i2c_stop(m_i2c_lcd_control); } + +maa_result_t +IICLcd::i2cReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t value) { + maa_result_t error = MAA_SUCCESS; + + uint8_t data[2] = { addr, value }; + error = maa_i2c_address (ctx, deviceAdress); + error = maa_i2c_write (ctx, data, 2); + + return error; +} + +maa_result_t +IICLcd::i2Cmd (maa_i2c_context ctx, uint8_t value) { + maa_result_t error = MAA_SUCCESS; + + uint8_t data[2] = { LCD_CMD, value }; + error = maa_i2c_address (ctx, m_lcd_control_address); + error = maa_i2c_write (ctx, data, 2); + + return error; +} + +maa_result_t +IICLcd::i2cData (maa_i2c_context ctx, uint8_t value) { + maa_result_t error = MAA_SUCCESS; + + uint8_t data[2] = { LCD_DATA, value }; + error = maa_i2c_address (ctx, m_lcd_control_address); + error = maa_i2c_write (ctx, data, 2); + + return error; +} diff --git a/src/lcd/iiclcd.h b/src/lcd/iiclcd.h index c36a9e17..fa12fd58 100644 --- a/src/lcd/iiclcd.h +++ b/src/lcd/iiclcd.h @@ -35,8 +35,8 @@ namespace upm { #define LCD_DISPLAYCONTROL 0x08 #define LCD_CURSORSHIFT 0x10 #define LCD_FUNCTIONSET 0x20 -#define LCD_SETCGRAMADDR 0x40 -#define LCD_SETDDRAMADDR 0x80 +#define LCD_DATA 0x40 +#define LCD_CMD 0x80 #define LCD_BACKLIGHT 0x08 #define LCD_NOBACKLIGHT 0x00 @@ -70,11 +70,16 @@ namespace upm { class IICLcd { public: IICLcd (int bus, int lcdAddress); - virtual maa_result_t write (std::string msg) = 0; maa_result_t write (int x, int y, std::string msg); + + virtual maa_result_t write (std::string msg) = 0; virtual maa_result_t setCursor (int row, int column) = 0; virtual maa_result_t clear () = 0; virtual maa_result_t home () = 0; + virtual maa_result_t i2Cmd (maa_i2c_context ctx, uint8_t value); + virtual maa_result_t i2cReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t data); + virtual maa_result_t i2cData (maa_i2c_context ctx, uint8_t value); + maa_result_t close(); std::string name() { diff --git a/src/lcd/jhd1313m1.cxx b/src/lcd/jhd1313m1.cxx index eb114e97..9eed420d 100644 --- a/src/lcd/jhd1313m1.cxx +++ b/src/lcd/jhd1313m1.cxx @@ -41,29 +41,29 @@ Jhd1313m1::Jhd1313m1 (int bus, int lcdAddress, int rgbAddress) : IICLcd(bus, lcd } usleep(50000); - cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE); + i2Cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE); usleep(4500); - cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE); + i2Cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE); usleep(4500); - cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE); + i2Cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE); usleep(4500); - cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE); + i2Cmd (m_i2c_lcd_control, LCD_FUNCTIONSET | LCD_2LINE); - cmd (m_i2c_lcd_control, LCD_DISPLAYCONTROL | LCD_DISPLAYON); + i2Cmd (m_i2c_lcd_control, LCD_DISPLAYCONTROL | LCD_DISPLAYON); clear (); usleep(4500); - cmd (m_i2c_lcd_control, LCD_ENTRYMODESET | - LCD_ENTRYLEFT | - LCD_ENTRYSHIFTDECREMENT); + i2Cmd (m_i2c_lcd_control, LCD_ENTRYMODESET | + LCD_ENTRYLEFT | + LCD_ENTRYSHIFTDECREMENT); - setReg (m_i2c_lcd_rgb, m_rgb_address, 0, 0); - setReg (m_i2c_lcd_rgb, m_rgb_address, 1, 0); - setReg (m_i2c_lcd_rgb, m_rgb_address, 0x08, 0xAA); + i2cReg (m_i2c_lcd_rgb, m_rgb_address, 0, 0); + i2cReg (m_i2c_lcd_rgb, m_rgb_address, 1, 0); + i2cReg (m_i2c_lcd_rgb, m_rgb_address, 0x08, 0xAA); - setReg (m_i2c_lcd_rgb, m_rgb_address, 0x04, 255); - setReg (m_i2c_lcd_rgb, m_rgb_address, 0x03, 255); - setReg (m_i2c_lcd_rgb, m_rgb_address, 0x02, 255); + i2cReg (m_i2c_lcd_rgb, m_rgb_address, 0x04, 255); + i2cReg (m_i2c_lcd_rgb, m_rgb_address, 0x03, 255); + i2cReg (m_i2c_lcd_rgb, m_rgb_address, 0x02, 255); } Jhd1313m1::~Jhd1313m1() { @@ -80,9 +80,7 @@ Jhd1313m1::write (std::string msg) { maa_result_t error = MAA_SUCCESS; uint8_t data[2] = {0x40, 0}; for (std::string::size_type i = 0; i < msg.size(); ++i) { - data[1] = msg[i]; - error = maa_i2c_address (m_i2c_lcd_control, m_lcd_control_address); - error = maa_i2c_write (m_i2c_lcd_control, data, 2); + error = i2cData (m_i2c_lcd_control, msg[i]); } return error; @@ -91,50 +89,19 @@ Jhd1313m1::write (std::string msg) { maa_result_t Jhd1313m1::setCursor (int row, int column) { maa_result_t error = MAA_SUCCESS; - int row_addr[] = { 0x80, 0xc0, 0x14, 0x54}; uint8_t offset = ((column % 16) + row_addr[row]); - - uint8_t data[2] = { 0x80, offset }; - error = maa_i2c_address (m_i2c_lcd_control, m_lcd_control_address); - error = maa_i2c_write (m_i2c_lcd_control, data, 2); + error = i2Cmd (m_i2c_lcd_control, offset); return error; } maa_result_t Jhd1313m1::clear () { - return cmd (m_i2c_lcd_control, LCD_CLEARDISPLAY); + return i2Cmd (m_i2c_lcd_control, LCD_CLEARDISPLAY); } maa_result_t Jhd1313m1::home () { - return cmd (m_i2c_lcd_control, LCD_RETURNHOME); -} - -/* - * ************** - * private area - * ************** - */ -maa_result_t -Jhd1313m1::setReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t value) { - maa_result_t error = MAA_SUCCESS; - - uint8_t data[2] = { addr, value }; - error = maa_i2c_address (ctx, deviceAdress); - error = maa_i2c_write (ctx, data, 2); - - return error; -} - -maa_result_t -Jhd1313m1::cmd (maa_i2c_context ctx, uint8_t value) { - maa_result_t error = MAA_SUCCESS; - - uint8_t data[2] = { 0x80, value }; - error = maa_i2c_address (ctx, m_lcd_control_address); - error = maa_i2c_write (ctx, data, 2); - - return error; + return i2Cmd (m_i2c_lcd_control, LCD_RETURNHOME); } diff --git a/src/lcd/jhd1313m1.h b/src/lcd/jhd1313m1.h index 436e5c9b..9b60c8fe 100644 --- a/src/lcd/jhd1313m1.h +++ b/src/lcd/jhd1313m1.h @@ -38,9 +38,6 @@ class Jhd1313m1 : public IICLcd { maa_result_t home (); private: - maa_result_t cmd (maa_i2c_context ctx, uint8_t value); - maa_result_t setReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t data); - int m_rgb_address; maa_i2c_context m_i2c_lcd_rgb; }; diff --git a/src/lcd/lcm1602.cxx b/src/lcd/lcm1602.cxx index 6ec488b4..fe396687 100644 --- a/src/lcd/lcm1602.cxx +++ b/src/lcd/lcm1602.cxx @@ -85,7 +85,7 @@ Lcm1602::setCursor (int row, int column) { int row_addr[] = { 0x80, 0xc0, 0x14, 0x54}; uint8_t offset = ((column % 16) + row_addr[row]); - return send (LCD_SETDDRAMADDR | offset, 0); + return send (LCD_CMD | offset, 0); } maa_result_t diff --git a/src/lcd/ssd1308.cxx b/src/lcd/ssd1308.cxx index 2456efb8..6aef5ae5 100644 --- a/src/lcd/ssd1308.cxx +++ b/src/lcd/ssd1308.cxx @@ -116,39 +116,6 @@ SSD1308::home () { * private area * ************** */ -maa_result_t -SSD1308::i2cReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t value) { - maa_result_t error = MAA_SUCCESS; - - uint8_t data[2] = { addr, value }; - error = maa_i2c_address (ctx, deviceAdress); - error = maa_i2c_write (ctx, data, 2); - - return error; -} - -maa_result_t -SSD1308::i2Cmd (maa_i2c_context ctx, uint8_t value) { - maa_result_t error = MAA_SUCCESS; - - uint8_t data[2] = { 0x80, value }; - error = maa_i2c_address (ctx, m_lcd_control_address); - error = maa_i2c_write (ctx, data, 2); - - return error; -} - -maa_result_t -SSD1308::i2cData (maa_i2c_context ctx, uint8_t value) { - maa_result_t error = MAA_SUCCESS; - - uint8_t data[2] = { 0x40, value }; - error = maa_i2c_address (ctx, m_lcd_control_address); - error = maa_i2c_write (ctx, data, 2); - - return error; -} - maa_result_t SSD1308::writeChar (maa_i2c_context ctx, uint8_t value) { if (value < 0x20 || value > 0x7F) { diff --git a/src/lcd/ssd1308.h b/src/lcd/ssd1308.h index a3f18816..280198ed 100644 --- a/src/lcd/ssd1308.h +++ b/src/lcd/ssd1308.h @@ -156,16 +156,13 @@ class SSD1308 : public IICLcd { ~SSD1308 (); maa_result_t draw(uint8_t *data, int bytes); - // virtual methods + // pure virtual methods maa_result_t write (std::string msg); maa_result_t setCursor (int row, int column); maa_result_t clear (); maa_result_t home (); private: - maa_result_t i2Cmd (maa_i2c_context ctx, uint8_t value); - maa_result_t i2cReg (maa_i2c_context ctx, int deviceAdress, int addr, uint8_t data); - maa_result_t i2cData (maa_i2c_context ctx, uint8_t value); maa_result_t writeChar (maa_i2c_context ctx, uint8_t value); maa_result_t setNormalDisplay (); maa_result_t setAddressingMode (displayAddressingMode mode); From 557f63edf675774ab16d5faa0edf2df94c4d9b69 Mon Sep 17 00:00:00 2001 From: Kiveisha Yevgeniy Date: Fri, 6 Jun 2014 12:27:43 +0000 Subject: [PATCH 5/5] ssd1327: Added new lcd module. Signed-off-by: Kiveisha Yevgeniy --- examples/CMakeLists.txt | 2 + examples/oled-1327.cxx | 126 ++++++++++++++++++ src/lcd/CMakeLists.txt | 2 +- src/lcd/jsupm_ssd1327.i | 7 + src/lcd/pyupm_ssd1327.i | 8 ++ src/lcd/ssd1327.cxx | 276 ++++++++++++++++++++++++++++++++++++++++ src/lcd/ssd1327.h | 175 +++++++++++++++++++++++++ 7 files changed, 595 insertions(+), 1 deletion(-) create mode 100644 examples/oled-1327.cxx create mode 100644 src/lcd/jsupm_ssd1327.i create mode 100644 src/lcd/pyupm_ssd1327.i create mode 100644 src/lcd/ssd1327.cxx create mode 100644 src/lcd/ssd1327.h diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d110d3ce..eff80df3 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -11,6 +11,7 @@ add_executable (nrf_receiver nrf_receiver.cxx) add_executable (es08a es08a.cxx) add_executable (son-hcsr04 hcsr04.cxx) add_executable (oled-1308 oled-1308.cxx) +add_executable (oled-1327 oled-1327.cxx) include_directories (${PROJECT_SOURCE_DIR}/src/hmc5883l) include_directories (${PROJECT_SOURCE_DIR}/src/grove) @@ -35,3 +36,4 @@ target_link_libraries (nrf_receiver nrf24l01 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (es08a servo ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (son-hcsr04 hcsr04 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (oled-1308 i2clcd ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (oled-1327 i2clcd ${CMAKE_THREAD_LIBS_INIT}) diff --git a/examples/oled-1327.cxx b/examples/oled-1327.cxx new file mode 100644 index 00000000..16fa404e --- /dev/null +++ b/examples/oled-1327.cxx @@ -0,0 +1,126 @@ +/* + * Author: Yevgeniy Kiveish + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include "ssd1327.h" + +#define DEVICE_ADDRESS 0x3C +#define BUS_NUMBER 0x0 + +static uint8_t SeeedLogo[] ={ +0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x60, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x06, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xC0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x01, 0xC0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x03, 0x80, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x03, 0x80, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x03, 0xC0, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x01, 0xC0, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, +0x07, 0x80, 0x01, 0xE0, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0F, 0x80, 0x01, 0xE0, +0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0F, 0x00, 0x01, 0xE0, 0x08, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x30, 0x0F, 0x00, 0x01, 0xE0, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, +0x0F, 0x00, 0x01, 0xE0, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0F, 0x00, 0x01, 0xE0, +0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x0F, 0x00, 0x01, 0xE0, 0x18, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x38, 0x0F, 0x00, 0x01, 0xE0, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, +0x0F, 0x80, 0x01, 0xE0, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x0F, 0x80, 0x01, 0xE0, +0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x0F, 0x80, 0x03, 0xE0, 0x78, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x1E, 0x07, 0x80, 0x03, 0xE0, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, +0x07, 0x80, 0x03, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x07, 0x80, 0x03, 0xC1, +0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x87, 0xC0, 0x07, 0xC1, 0xF0, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x0F, 0x83, 0xC0, 0x07, 0x83, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, +0xC3, 0xC0, 0x07, 0x87, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xE1, 0xE0, 0x07, 0x0F, +0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xF0, 0xE0, 0x0F, 0x0F, 0x80, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x01, 0xF8, 0xF0, 0x0E, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, +0xF8, 0x70, 0x1C, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x30, 0x18, 0x7E, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x18, 0x30, 0xFC, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x1F, 0x88, 0x21, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x0F, 0xC4, 0x47, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xE0, 0x0F, 0x80, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x02, 0x00, 0x06, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, +0x00, 0x00, 0x60, 0x00, 0x7E, 0x3F, 0x0F, 0xC3, 0xF0, 0xFA, 0x0F, 0xDF, 0xE1, 0x9F, 0xEC, 0x7E, +0xE6, 0x73, 0x9C, 0xE7, 0x39, 0xCE, 0x1C, 0xDF, 0xE1, 0xB9, 0xEC, 0xE7, 0xE0, 0x61, 0xD8, 0x66, +0x1B, 0x86, 0x1C, 0x06, 0x61, 0xB0, 0x6D, 0xC3, 0x7C, 0x7F, 0xFF, 0xFF, 0xFF, 0x06, 0x0F, 0x86, +0x61, 0xB0, 0x6D, 0x83, 0x3E, 0x7F, 0xFF, 0xFF, 0xFF, 0x06, 0x07, 0xC6, 0x61, 0xB0, 0x6D, 0x83, +0xC3, 0x61, 0x18, 0x46, 0x03, 0x86, 0x18, 0x66, 0x61, 0xB0, 0x6D, 0xC3, 0xFE, 0x7F, 0x9F, 0xE7, +0xF9, 0xFE, 0x1F, 0xE6, 0x3F, 0x9F, 0xEC, 0xFE, 0x7E, 0x3F, 0x0F, 0xC3, 0xF0, 0xFA, 0x0F, 0xC6, +0x3F, 0x9F, 0xEC, 0x7E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x00, +0x00, 0x20, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x20, 0x82, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xF3, 0xCF, 0x70, 0x9E, 0x79, 0xE7, 0x80, 0x00, 0x00, +0x00, 0x00, 0x7D, 0x9E, 0x68, 0x20, 0xB2, 0xC8, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x9E, +0x6F, 0x20, 0xB2, 0xF9, 0xE7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x9A, 0x61, 0x20, 0xB2, 0xCB, +0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xF3, 0xCF, 0x30, 0x9E, 0x79, 0xE7, 0x90, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x02, 0x00, 0x00, 0x82, 0x60, 0x00, 0x00, +0xF8, 0x00, 0x00, 0x40, 0x40, 0x02, 0x00, 0x00, 0x83, 0x60, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x40, +0x60, 0xB7, 0x79, 0xE7, 0x81, 0xC7, 0x92, 0x70, 0x89, 0xE7, 0x9E, 0x78, 0x7C, 0xE2, 0xC9, 0x2C, +0x81, 0xCC, 0xD2, 0x40, 0xFB, 0x21, 0xB2, 0x48, 0x40, 0x62, 0xF9, 0x2C, 0x80, 0x8C, 0xD2, 0x40, +0x8B, 0xE7, 0xB0, 0x48, 0x40, 0xE2, 0xC9, 0x2C, 0x80, 0x84, 0xD2, 0x40, 0x8B, 0x2D, 0x92, 0x48, +0x7D, 0xB3, 0x79, 0x27, 0x80, 0x87, 0x9E, 0x40, 0x8D, 0xE7, 0x9E, 0x48, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + + +int +main(int argc, char **argv) +{ + upm::SSD1327 *lcd = new upm::SSD1327 (BUS_NUMBER, 0x3C); + + /* + * Simple print hello world + */ + for(uint8_t i = 0; i < 12 ; i++) { + lcd->setCursor (i, 0); + lcd->setGrayLevel (i); + lcd->write ("Hello World"); + } + + /* + * Simple print hello world + */ + lcd->draw (SeeedLogo, 96 * 96 / 8); + + lcd->close (); +} diff --git a/src/lcd/CMakeLists.txt b/src/lcd/CMakeLists.txt index 5108da42..113d91f3 100644 --- a/src/lcd/CMakeLists.txt +++ b/src/lcd/CMakeLists.txt @@ -1,4 +1,4 @@ set (libname "i2clcd") -add_library (i2clcd SHARED iiclcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx) +add_library (i2clcd SHARED iiclcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx ssd1327.cxx) include_directories (${MAA_INCLUDE_DIR}) target_link_libraries (i2clcd ${MAA_LIBRARIES}) diff --git a/src/lcd/jsupm_ssd1327.i b/src/lcd/jsupm_ssd1327.i new file mode 100644 index 00000000..8c0705de --- /dev/null +++ b/src/lcd/jsupm_ssd1327.i @@ -0,0 +1,7 @@ +%module jsupm_ssd1327 + +%{ + #include "ssd1327.h" +%} + +%include "ssd1327.h" diff --git a/src/lcd/pyupm_ssd1327.i b/src/lcd/pyupm_ssd1327.i new file mode 100644 index 00000000..d75ed428 --- /dev/null +++ b/src/lcd/pyupm_ssd1327.i @@ -0,0 +1,8 @@ +%module pyupm_ssd1327 + +%feature("autodoc", "3"); + +%include "ssd1327.h" +%{ + #include "ssd1327.h" +%} diff --git a/src/lcd/ssd1327.cxx b/src/lcd/ssd1327.cxx new file mode 100644 index 00000000..054d9e01 --- /dev/null +++ b/src/lcd/ssd1327.cxx @@ -0,0 +1,276 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#include +#include + +#include "ssd1327.h" + +using namespace upm; + +#define INIT_SLEEP 50000 +#define CMD_SLEEP 10000 + +SSD1327::SSD1327 (int bus_in, int addr_in) : IICLcd (bus_in, addr_in) { + maa_result_t error = MAA_SUCCESS; + usleep (INIT_SLEEP); + i2Cmd (m_i2c_lcd_control, 0xFD); // Unlock OLED driver IC MCU interface from entering command. i.e: Accept commands + usleep (INIT_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x12); + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xAE); // Set display off + usleep (INIT_SLEEP); + i2Cmd (m_i2c_lcd_control, 0xA8); // set multiplex ratio + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x5F); // 96 + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xA1); // set display start line + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x00); // + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xA2); // set display offset + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x60); + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xA0); // set remap + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x46); + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xAB); // set vdd internal + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x01); // + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x81); // set contrasr + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x53); // 100 nit + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xB1); // Set Phase Length + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0X51); // + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xB3); // Set Display Clock Divide Ratio/Oscillator Frequency + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x01); // + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xB9); // + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xBC); // set pre_charge voltage/VCOMH + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x08); // (0x08); + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xBE); // set VCOMH + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0X07); // (0x07); + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xB6); // Set second pre-charge period + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x01); // + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xD5); // enable second precharge and enternal vsl + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0X62); // (0x62); + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xA4); // Set Normal Display Mode + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x2E); // Deactivate Scroll + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0xAF); // Switch on display + usleep (INIT_SLEEP); + + // Row Address + error = i2Cmd (m_i2c_lcd_control, 0x75); // Set Row Address + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x00); // Start 0 + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x5f); // End 95 + usleep (INIT_SLEEP); + + // Column Address + error = i2Cmd (m_i2c_lcd_control, 0x15); // 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 + usleep (INIT_SLEEP); + error = i2Cmd (m_i2c_lcd_control, 0x37); // End at (8 + 47)th column. Each Column has 2 pixels(segments) + usleep (INIT_SLEEP); + + clear (); + setNormalDisplay (); + setVerticalMode (); +} + +SSD1327::~SSD1327 () { + +} + +maa_result_t +SSD1327::draw (uint8_t *data, int bytes) { + maa_result_t error = MAA_SUCCESS; + + setHorizontalMode (); + for (int row = 0; row < bytes; row++) { + for (uint8_t col = 0; col < 8; col+=2) { + uint8_t value = 0x0; + + uint8_t bitOne = (data[row] << col) & 0x80; + uint8_t bitTwo = (data[row] << (col + 1)) & 0x80; + + value |= (bitOne) ? grayHigh : 0x00; + value |= (bitTwo) ? grayLow : 0x00; + + i2cData (m_i2c_lcd_control, value); + usleep (CMD_SLEEP - 2000); + } + } + + return error; +} + +/* + * ************** + * virtual area + * ************** + */ +maa_result_t +SSD1327::write (std::string msg) { + maa_result_t error = MAA_SUCCESS; + + setVerticalMode (); + for (std::string::size_type i = 0; i < msg.size(); ++i) { + writeChar (m_i2c_lcd_control, msg[i]); + } + + return error; +} + +maa_result_t +SSD1327::setCursor (int row, int column) { + maa_result_t error = MAA_SUCCESS; + + //Column Address + i2Cmd (m_i2c_lcd_control, 0x15); /* Set Column Address */ + usleep (CMD_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x08 + (column * 4)); /* Start Column: Start from 8 */ + usleep (CMD_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x37); /* End Column */ + usleep (CMD_SLEEP); + // Row Address + i2Cmd (m_i2c_lcd_control, 0x75); /* Set Row Address */ + usleep (CMD_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x00 + (row * 8)); /* Start Row*/ + usleep (CMD_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x07 + (row * 8)); /* End Row*/ + usleep (CMD_SLEEP); + + return error; +} + +maa_result_t +SSD1327::clear () { + maa_result_t error = MAA_SUCCESS; + uint8_t columnIdx, rowIdx; + + for(rowIdx = 0; rowIdx < 12; rowIdx++) { + // clear all columns + for(columnIdx = 0; columnIdx < 12; columnIdx++) { + writeChar (m_i2c_lcd_control, ' '); + } + } + + return MAA_SUCCESS; +} + +maa_result_t +SSD1327::home () { + return setCursor (0, 0); +} + +maa_result_t +SSD1327::setGrayLevel (uint8_t level) { + grayHigh = (level << 4) & 0xF0; + grayLow = level & 0x0F; +} + +/* + * ************** + * private area + * ************** + */ +maa_result_t +SSD1327::writeChar (maa_i2c_context ctx, uint8_t value) { + if (value < 0x20 || value > 0x7F) { + value = 0x20; // space + } + + for (uint8_t row = 0; row < 8; row=row+2) { + for (uint8_t col = 0; col < 8; col++) { + uint8_t data = 0x0; + + uint8_t bitOne = ((BasicFont[value - 32][row]) >> col) & 0x1; + uint8_t bitTwo = ((BasicFont[value - 32][row + 1]) >> col) & 0x1; + + data |= (bitOne) ? grayHigh : 0x00; + data |= (bitTwo) ? grayLow : 0x00; + + i2cData (m_i2c_lcd_control, data); + usleep (CMD_SLEEP - 2000); + } + } +} + +maa_result_t +SSD1327::setNormalDisplay () { + return i2Cmd (m_i2c_lcd_control, DISPLAY_CMD_SET_NORMAL); // set to normal display '1' is ON +} + +maa_result_t +SSD1327::setHorizontalMode () { + i2Cmd (m_i2c_lcd_control, 0xA0); // remap to + usleep (CMD_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x42); // horizontal mode + usleep (CMD_SLEEP); + + // Row Address + i2Cmd (m_i2c_lcd_control, 0x75); // Set Row Address + usleep (CMD_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x00); // Start 0 + usleep (CMD_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x5f); // End 95 + usleep (CMD_SLEEP); + + // Column Address + i2Cmd (m_i2c_lcd_control, 0x15); // 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 + usleep (CMD_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x37); // End at (8 + 47)th column. Each Column has 2 pixels(or segments) + usleep (CMD_SLEEP); +} + +maa_result_t +SSD1327::setVerticalMode () { + i2Cmd (m_i2c_lcd_control, 0xA0); // remap to + usleep (CMD_SLEEP); + i2Cmd (m_i2c_lcd_control, 0x46); // Vertical mode + usleep (CMD_SLEEP); +} diff --git a/src/lcd/ssd1327.h b/src/lcd/ssd1327.h new file mode 100644 index 00000000..bb11768b --- /dev/null +++ b/src/lcd/ssd1327.h @@ -0,0 +1,175 @@ +/* + * Author: Yevgeniy Kiveisha + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#pragma once + +#include +#include "iiclcd.h" + +namespace upm { +/* +#define DISPLAY_CMD_OFF 0xAE +#define DISPLAY_CMD_ON 0xAF + +#define BASE_LOW_COLUMN_ADDR 0x00 +#define BASE_HIGH_COLUMN_ADDR 0x10 +#define BASE_PAGE_START_ADDR 0xB0 +#define DISPLAY_CMD_MEM_ADDR_MODE 0x20 +*/ +#define DISPLAY_CMD_SET_NORMAL 0xA4 + +const uint8_t BasicFont[][8] = +{ + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x5F,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x07,0x00,0x07,0x00,0x00,0x00}, + {0x00,0x14,0x7F,0x14,0x7F,0x14,0x00,0x00}, + {0x00,0x24,0x2A,0x7F,0x2A,0x12,0x00,0x00}, + {0x00,0x23,0x13,0x08,0x64,0x62,0x00,0x00}, + {0x00,0x36,0x49,0x55,0x22,0x50,0x00,0x00}, + {0x00,0x00,0x05,0x03,0x00,0x00,0x00,0x00}, + {0x00,0x1C,0x22,0x41,0x00,0x00,0x00,0x00}, + {0x00,0x41,0x22,0x1C,0x00,0x00,0x00,0x00}, + {0x00,0x08,0x2A,0x1C,0x2A,0x08,0x00,0x00}, + {0x00,0x08,0x08,0x3E,0x08,0x08,0x00,0x00}, + {0x00,0xA0,0x60,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x08,0x08,0x08,0x08,0x08,0x00,0x00}, + {0x00,0x60,0x60,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x20,0x10,0x08,0x04,0x02,0x00,0x00}, + {0x00,0x3E,0x51,0x49,0x45,0x3E,0x00,0x00}, + {0x00,0x00,0x42,0x7F,0x40,0x00,0x00,0x00}, + {0x00,0x62,0x51,0x49,0x49,0x46,0x00,0x00}, + {0x00,0x22,0x41,0x49,0x49,0x36,0x00,0x00}, + {0x00,0x18,0x14,0x12,0x7F,0x10,0x00,0x00}, + {0x00,0x27,0x45,0x45,0x45,0x39,0x00,0x00}, + {0x00,0x3C,0x4A,0x49,0x49,0x30,0x00,0x00}, + {0x00,0x01,0x71,0x09,0x05,0x03,0x00,0x00}, + {0x00,0x36,0x49,0x49,0x49,0x36,0x00,0x00}, + {0x00,0x06,0x49,0x49,0x29,0x1E,0x00,0x00}, + {0x00,0x00,0x36,0x36,0x00,0x00,0x00,0x00}, + {0x00,0x00,0xAC,0x6C,0x00,0x00,0x00,0x00}, + {0x00,0x08,0x14,0x22,0x41,0x00,0x00,0x00}, + {0x00,0x14,0x14,0x14,0x14,0x14,0x00,0x00}, + {0x00,0x41,0x22,0x14,0x08,0x00,0x00,0x00}, + {0x00,0x02,0x01,0x51,0x09,0x06,0x00,0x00}, + {0x00,0x32,0x49,0x79,0x41,0x3E,0x00,0x00}, + {0x00,0x7E,0x09,0x09,0x09,0x7E,0x00,0x00}, + {0x00,0x7F,0x49,0x49,0x49,0x36,0x00,0x00}, + {0x00,0x3E,0x41,0x41,0x41,0x22,0x00,0x00}, + {0x00,0x7F,0x41,0x41,0x22,0x1C,0x00,0x00}, + {0x00,0x7F,0x49,0x49,0x49,0x41,0x00,0x00}, + {0x00,0x7F,0x09,0x09,0x09,0x01,0x00,0x00}, + {0x00,0x3E,0x41,0x41,0x51,0x72,0x00,0x00}, + {0x00,0x7F,0x08,0x08,0x08,0x7F,0x00,0x00}, + {0x00,0x41,0x7F,0x41,0x00,0x00,0x00,0x00}, + {0x00,0x20,0x40,0x41,0x3F,0x01,0x00,0x00}, + {0x00,0x7F,0x08,0x14,0x22,0x41,0x00,0x00}, + {0x00,0x7F,0x40,0x40,0x40,0x40,0x00,0x00}, + {0x00,0x7F,0x02,0x0C,0x02,0x7F,0x00,0x00}, + {0x00,0x7F,0x04,0x08,0x10,0x7F,0x00,0x00}, + {0x00,0x3E,0x41,0x41,0x41,0x3E,0x00,0x00}, + {0x00,0x7F,0x09,0x09,0x09,0x06,0x00,0x00}, + {0x00,0x3E,0x41,0x51,0x21,0x5E,0x00,0x00}, + {0x00,0x7F,0x09,0x19,0x29,0x46,0x00,0x00}, + {0x00,0x26,0x49,0x49,0x49,0x32,0x00,0x00}, + {0x00,0x01,0x01,0x7F,0x01,0x01,0x00,0x00}, + {0x00,0x3F,0x40,0x40,0x40,0x3F,0x00,0x00}, + {0x00,0x1F,0x20,0x40,0x20,0x1F,0x00,0x00}, + {0x00,0x3F,0x40,0x38,0x40,0x3F,0x00,0x00}, + {0x00,0x63,0x14,0x08,0x14,0x63,0x00,0x00}, + {0x00,0x03,0x04,0x78,0x04,0x03,0x00,0x00}, + {0x00,0x61,0x51,0x49,0x45,0x43,0x00,0x00}, + {0x00,0x7F,0x41,0x41,0x00,0x00,0x00,0x00}, + {0x00,0x02,0x04,0x08,0x10,0x20,0x00,0x00}, + {0x00,0x41,0x41,0x7F,0x00,0x00,0x00,0x00}, + {0x00,0x04,0x02,0x01,0x02,0x04,0x00,0x00}, + {0x00,0x80,0x80,0x80,0x80,0x80,0x00,0x00}, + {0x00,0x01,0x02,0x04,0x00,0x00,0x00,0x00}, + {0x00,0x20,0x54,0x54,0x54,0x78,0x00,0x00}, + {0x00,0x7F,0x48,0x44,0x44,0x38,0x00,0x00}, + {0x00,0x38,0x44,0x44,0x28,0x00,0x00,0x00}, + {0x00,0x38,0x44,0x44,0x48,0x7F,0x00,0x00}, + {0x00,0x38,0x54,0x54,0x54,0x18,0x00,0x00}, + {0x00,0x08,0x7E,0x09,0x02,0x00,0x00,0x00}, + {0x00,0x18,0xA4,0xA4,0xA4,0x7C,0x00,0x00}, + {0x00,0x7F,0x08,0x04,0x04,0x78,0x00,0x00}, + {0x00,0x00,0x7D,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x80,0x84,0x7D,0x00,0x00,0x00,0x00}, + {0x00,0x7F,0x10,0x28,0x44,0x00,0x00,0x00}, + {0x00,0x41,0x7F,0x40,0x00,0x00,0x00,0x00}, + {0x00,0x7C,0x04,0x18,0x04,0x78,0x00,0x00}, + {0x00,0x7C,0x08,0x04,0x7C,0x00,0x00,0x00}, + {0x00,0x38,0x44,0x44,0x38,0x00,0x00,0x00}, + {0x00,0xFC,0x24,0x24,0x18,0x00,0x00,0x00}, + {0x00,0x18,0x24,0x24,0xFC,0x00,0x00,0x00}, + {0x00,0x00,0x7C,0x08,0x04,0x00,0x00,0x00}, + {0x00,0x48,0x54,0x54,0x24,0x00,0x00,0x00}, + {0x00,0x04,0x7F,0x44,0x00,0x00,0x00,0x00}, + {0x00,0x3C,0x40,0x40,0x7C,0x00,0x00,0x00}, + {0x00,0x1C,0x20,0x40,0x20,0x1C,0x00,0x00}, + {0x00,0x3C,0x40,0x30,0x40,0x3C,0x00,0x00}, + {0x00,0x44,0x28,0x10,0x28,0x44,0x00,0x00}, + {0x00,0x1C,0xA0,0xA0,0x7C,0x00,0x00,0x00}, + {0x00,0x44,0x64,0x54,0x4C,0x44,0x00,0x00}, + {0x00,0x08,0x36,0x41,0x00,0x00,0x00,0x00}, + {0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00}, + {0x00,0x41,0x36,0x08,0x00,0x00,0x00,0x00}, + {0x00,0x02,0x01,0x01,0x02,0x01,0x00,0x00}, + {0x00,0x02,0x05,0x05,0x02,0x00,0x00,0x00} +}; + +typedef enum { + HORIZONTAL = 0, + VERTICAL = 1, + PAGE = 2 +} displayAddressingMode; + +class SSD1327 : public IICLcd { + public: + /** SSD1308 Constructor. + * Calls MAA initialisation functions. + * @param bus i2c bus to use + * @param address the slave address the lcd is registered on. + */ + SSD1327 (int bus, int address); + ~SSD1327 (); + maa_result_t draw(uint8_t *data, int bytes); + + // virtual methods + maa_result_t write (std::string msg); + maa_result_t setCursor (int row, int column); + maa_result_t clear (); + maa_result_t home (); + maa_result_t setGrayLevel (uint8_t level); + + private: + maa_result_t writeChar (maa_i2c_context ctx, uint8_t value); + maa_result_t setNormalDisplay (); + maa_result_t setHorizontalMode (); + maa_result_t setVerticalMode (); + + uint8_t grayHigh; + uint8_t grayLow; + }; +}