From 6c7c0c7d2656acfd847c6b4b7cd358318ee40da4 Mon Sep 17 00:00:00 2001 From: Juan Antonio Brena Moral Date: Sat, 8 Dec 2018 17:39:22 +0100 Subject: [PATCH 1/4] Added support for drawOval --- CHANGELOG.md | 2 ++ build.gradle | 4 ++-- .../adr/{adr-lejos-sensor.md => adr-lejos-api-changes.md} | 8 +++++++- src/main/java/ev3dev/actuators/LCDJessie.java | 5 +++++ src/main/java/ev3dev/actuators/LCDStretch.java | 6 ++++++ 5 files changed, 22 insertions(+), 3 deletions(-) rename docs/adr/{adr-lejos-sensor.md => adr-lejos-api-changes.md} (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ea7e17a..c1c8159a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 2.5.x 2018-12-31 +- Add support for drawOval +- Upgrade lejos-commons to 0.7.3 - Add support for BrickPi3 for EV3Dev Debian Stretch - Add support for BrickPi+ for EV3Dev Debian Stretch - Add support for Unregulated motors on BrickPi 3 diff --git a/build.gradle b/build.gradle index 0e827fde..97923c76 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ plugins { id 'maven-publish' } -version = '2.5.1' +version = '2.5.2-SNAPSHOT' repositories { jcenter() @@ -56,7 +56,7 @@ dependencies { testCompileOnly("org.projectlombok:lombok:1.16.20") compile("org.slf4j:slf4j-api:1.7.25") - compile("com.github.ev3dev-lang-java:lejos-commons:0.7.2") + compile("com.github.ev3dev-lang-java:lejos-commons:0.7.3-SNAPSHOT") compile("net.java.dev.jna:jna:4.5.2") testCompile("ch.qos.logback:logback-classic:1.2.3") diff --git a/docs/adr/adr-lejos-sensor.md b/docs/adr/adr-lejos-api-changes.md similarity index 92% rename from docs/adr/adr-lejos-sensor.md rename to docs/adr/adr-lejos-api-changes.md index 7a36d70b..15ca6361 100644 --- a/docs/adr/adr-lejos-sensor.md +++ b/docs/adr/adr-lejos-api-changes.md @@ -1,4 +1,10 @@ -# leJOS Sensor API changes (Nov 2015) +# lejos API changelog + +## GraphicsLCD + +- Added method drawOval 08/12/2018 + +## leJOS Sensor API changes (Nov 2015) In this project, we reimplemented most of the leJOS sensor API. However, there are some incompatibilities and changes to enhance diff --git a/src/main/java/ev3dev/actuators/LCDJessie.java b/src/main/java/ev3dev/actuators/LCDJessie.java index 3502f2b8..7d268c2d 100644 --- a/src/main/java/ev3dev/actuators/LCDJessie.java +++ b/src/main/java/ev3dev/actuators/LCDJessie.java @@ -350,4 +350,9 @@ public int setAutoRefreshPeriod(int i) { log.debug("Feature not implemented"); return -1; } + + @Override + public void drawOval(int x, int y, int width, int height) { + g2d.drawOval(x, y, width, height); + } } diff --git a/src/main/java/ev3dev/actuators/LCDStretch.java b/src/main/java/ev3dev/actuators/LCDStretch.java index 1652f2f0..0a3f6471 100644 --- a/src/main/java/ev3dev/actuators/LCDStretch.java +++ b/src/main/java/ev3dev/actuators/LCDStretch.java @@ -543,4 +543,10 @@ public void run() { refresh(); } } + + @Override + public void drawOval(int x, int y, int width, int height) { + g2d.drawOval(x, y, width, height); + } + } From 7414a45b246bf176b630c38d465ca91c51867b15 Mon Sep 17 00:00:00 2001 From: Juan Antonio Brena Moral Date: Sat, 8 Dec 2018 18:20:36 +0100 Subject: [PATCH 2/4] Upgrade lejos-commons --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 97923c76..335abb07 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ dependencies { testCompileOnly("org.projectlombok:lombok:1.16.20") compile("org.slf4j:slf4j-api:1.7.25") - compile("com.github.ev3dev-lang-java:lejos-commons:0.7.3-SNAPSHOT") + compile("com.github.ev3dev-lang-java:lejos-commons:0.7.3") compile("net.java.dev.jna:jna:4.5.2") testCompile("ch.qos.logback:logback-classic:1.2.3") From b6442f0d5274a9c83e0bbde3044406c706377572 Mon Sep 17 00:00:00 2001 From: Juan Antonio Brena Moral Date: Sat, 8 Dec 2018 18:21:17 +0100 Subject: [PATCH 3/4] Bump new snapshot Upgrade lejos-commons --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 335abb07..c2bbf659 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ plugins { id 'maven-publish' } -version = '2.5.2-SNAPSHOT' +version = '2.5.3-SNAPSHOT' repositories { jcenter() From 1246999e11df833b748c721a67d1164bc738d383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Antonio=20Bren=CC=83a=20Moral?= Date: Sat, 8 Dec 2018 22:33:40 +0100 Subject: [PATCH 4/4] Bump new patch version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c2bbf659..5cc8ea66 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ plugins { id 'maven-publish' } -version = '2.5.3-SNAPSHOT' +version = '2.5.3' repositories { jcenter()