mirror of
https://github.com/eclipse/upm.git
synced 2025-07-03 02:11:15 +03:00
examples: Remove heap allocation from C++ examples
Cleanup of UPM C++ examples. Switched from heap allocation to stack allocation when possible. This simplifies the samples since it removes the need for explicit memory management. A script was used to identify and replace pointer use. To simplify the replace script, I re-formatted the C++ examples using the UPM .clang-format file. Unfortuantely this changes the look of the UPM C++ examples to a large degree. However, examples will now have a standard look/feel and uniform formatting. * Ran clang-format w/provided UPM .clang-format file * Removed new's/delete's whenever possible (left those in interface examples) * Added IIO sensor library implementation of callback void* arg * Converted all sleeps to upm defined delays (added header when necessary) * Scrubbed CXX example includes Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:

committed by
Mihai Tudor Panu

parent
bd6e4ec786
commit
5cefe7f5f3
@ -22,63 +22,63 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
|
||||
#include "ili9341.hpp"
|
||||
#include "upm_utilities.h"
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
//! [Interesting]
|
||||
int
|
||||
main(int argc, char** argv)
|
||||
{
|
||||
//! [Interesting]
|
||||
|
||||
// Pins (Edison)
|
||||
// CS_LCD GP44 (MRAA 31)
|
||||
// CS_SD GP43 (MRAA 38) unused
|
||||
// DC GP12 (MRAA 20)
|
||||
// RESEST GP13 (MRAA 14)
|
||||
upm::ILI9341 * lcd = new upm::ILI9341(31, 38, 20, 14);
|
||||
upm::ILI9341 lcd(31, 38, 20, 14);
|
||||
|
||||
// Fill the screen with a solid color
|
||||
lcd->fillScreen(lcd->color565(0, 40, 16));
|
||||
lcd.fillScreen(lcd.color565(0, 40, 16));
|
||||
|
||||
// Draw some shapes
|
||||
lcd->drawFastVLine(10, 10, 100, ILI9341_RED);
|
||||
lcd->drawFastHLine(20, 10, 50, ILI9341_CYAN);
|
||||
lcd->drawLine(160, 30, 200, 60, ILI9341_GREEN);
|
||||
lcd->fillRect(20, 30, 75, 60, ILI9341_ORANGE);
|
||||
lcd->drawCircle(70, 50, 20, ILI9341_PURPLE);
|
||||
lcd->fillCircle(120, 50, 20, ILI9341_PURPLE);
|
||||
lcd->drawTriangle(50, 100, 10, 140, 90, 140, ILI9341_YELLOW);
|
||||
lcd->fillTriangle(150, 100, 110, 140, 190, 140, ILI9341_YELLOW);
|
||||
lcd->drawRoundRect(20, 150, 50, 30, 10, ILI9341_RED);
|
||||
lcd->drawRoundRect(130, 150, 50, 30, 10, ILI9341_RED);
|
||||
lcd->fillRoundRect(75, 150, 50, 30, 10, ILI9341_RED);
|
||||
lcd.drawFastVLine(10, 10, 100, ILI9341_RED);
|
||||
lcd.drawFastHLine(20, 10, 50, ILI9341_CYAN);
|
||||
lcd.drawLine(160, 30, 200, 60, ILI9341_GREEN);
|
||||
lcd.fillRect(20, 30, 75, 60, ILI9341_ORANGE);
|
||||
lcd.drawCircle(70, 50, 20, ILI9341_PURPLE);
|
||||
lcd.fillCircle(120, 50, 20, ILI9341_PURPLE);
|
||||
lcd.drawTriangle(50, 100, 10, 140, 90, 140, ILI9341_YELLOW);
|
||||
lcd.fillTriangle(150, 100, 110, 140, 190, 140, ILI9341_YELLOW);
|
||||
lcd.drawRoundRect(20, 150, 50, 30, 10, ILI9341_RED);
|
||||
lcd.drawRoundRect(130, 150, 50, 30, 10, ILI9341_RED);
|
||||
lcd.fillRoundRect(75, 150, 50, 30, 10, ILI9341_RED);
|
||||
|
||||
// Write some text
|
||||
lcd->setCursor(0, 200);
|
||||
lcd->setTextColor(ILI9341_LIGHTGREY);
|
||||
lcd->setTextWrap(true);
|
||||
lcd->setTextSize(1);
|
||||
lcd->print("Text 1\n");
|
||||
lcd->setTextSize(2);
|
||||
lcd->print("Text 2\n");
|
||||
lcd->setTextSize(3);
|
||||
lcd->print("Text 3\n");
|
||||
lcd->setTextSize(4);
|
||||
lcd->print("Text 4\n");
|
||||
|
||||
lcd.setCursor(0, 200);
|
||||
lcd.setTextColor(ILI9341_LIGHTGREY);
|
||||
lcd.setTextWrap(true);
|
||||
lcd.setTextSize(1);
|
||||
lcd.print("Text 1\n");
|
||||
lcd.setTextSize(2);
|
||||
lcd.print("Text 2\n");
|
||||
lcd.setTextSize(3);
|
||||
lcd.print("Text 3\n");
|
||||
lcd.setTextSize(4);
|
||||
lcd.print("Text 4\n");
|
||||
|
||||
// Test screen rotation
|
||||
for(int r = 0; r < 4; r++) {
|
||||
lcd->setRotation(r);
|
||||
lcd->fillRect(0, 0, 5, 5, ILI9341_WHITE);
|
||||
sleep(1);
|
||||
for (int r = 0; r < 4; r++) {
|
||||
lcd.setRotation(r);
|
||||
lcd.fillRect(0, 0, 5, 5, ILI9341_WHITE);
|
||||
upm_delay(1);
|
||||
}
|
||||
|
||||
// Invert colors, wait, then revert back
|
||||
lcd->invertDisplay(true);
|
||||
sleep(2);
|
||||
lcd->invertDisplay(false);
|
||||
lcd.invertDisplay(true);
|
||||
upm_delay(2);
|
||||
lcd.invertDisplay(false);
|
||||
|
||||
// Don't forget to free up that memory!
|
||||
delete lcd;
|
||||
//! [Interesting]
|
||||
//! [Interesting]
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user