Merge branch 'master' into develop

mongonta0716 · mongonta0716 · commit 1d0bb5e6e153 · 2023-07-10T20:06:45.000+09:00
diff --git a/library.json b/library.json
@@ -17,7 +17,7 @@
   "license": "MIT",
   "dependencies": {
   },
-  "version": "0.8.2",
+  "version": "0.8.3",
   "frameworks": "arduino",
   "platforms": "espressif32"
 }
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=M5Stack_Avatar
-version=0.8.2
+version=0.8.3
 author=Shinya Ishikawa
 maintainer=Shinya Ishikawa<ishikawa.s.1027@gmail.com>
 sentence=Yet another avatar module for M5Stack
diff --git a/src/Effect.h b/src/Effect.h
@@ -59,7 +59,7 @@ class Effect final : public Drawable {
   }
 
   void drawAngerMark(M5Canvas *spi, uint32_t x, uint32_t y, uint32_t r,
-                     uint16_t color, uint32_t bColor, float offset) {
+                     uint16_t color, uint16_t bColor, float offset) {
     r = r + abs(r * 0.4 * offset);
     spi->fillRect(x - (r / 3), y - r, (r * 2) / 3, r * 2, color);
     spi->fillRect(x - r, y - (r / 3), r * 2, (r * 2) / 3, color);

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class Effect final : public Drawable {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`void drawAngerMark(M5Canvas *spi, uint32_t x, uint32_t y, uint32_t r,`
`62`		`- uint16_t color, uint32_t bColor, float offset) {`
	`62`	`+ uint16_t color, uint16_t bColor, float offset) {`
`63`	`63`	`r = r + abs(r * 0.4 * offset);`
`64`	`64`	`spi->fillRect(x - (r / 3), y - r, (r * 2) / 3, r * 2, color);`
`65`	`65`	`spi->fillRect(x - r, y - (r / 3), r * 2, (r * 2) / 3, color);`