From d95e58b519d096bb6c189afa5cef89e925e43a67 Mon Sep 17 00:00:00 2001 From: nopnop2002 Date: Tue, 26 Apr 2022 20:11:08 +0900 Subject: [PATCH] Changed from RotateDemo to WarpAroundDemo --- ImageDemo/main/main.c | 4 ++-- {RotateDemo => WrapAroundDemo}/CMakeLists.txt | 0 {RotateDemo => WrapAroundDemo}/README.md | 2 +- .../main/CMakeLists.txt | 0 .../main/component.mk | 0 {RotateDemo => WrapAroundDemo}/main/main.c | 24 +++++++++---------- components/ssd1306/ssd1306.c | 2 +- components/ssd1306/ssd1306.h | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) rename {RotateDemo => WrapAroundDemo}/CMakeLists.txt (100%) rename {RotateDemo => WrapAroundDemo}/README.md (80%) rename {RotateDemo => WrapAroundDemo}/main/CMakeLists.txt (100%) rename {RotateDemo => WrapAroundDemo}/main/component.mk (100%) rename {RotateDemo => WrapAroundDemo}/main/main.c (83%) diff --git a/ImageDemo/main/main.c b/ImageDemo/main/main.c index 93b6811..0f51dc5 100644 --- a/ImageDemo/main/main.c +++ b/ImageDemo/main/main.c @@ -193,7 +193,7 @@ void app_main(void) vTaskDelay(3000 / portTICK_PERIOD_MS); for(int i=0;i<128;i++) { - ssd1306_rotate(&dev, SCROLL_RIGHT, 2, 3, 0); + ssd1306_wrap_arround(&dev, SCROLL_RIGHT, 2, 3, 0); } vTaskDelay(2000 / portTICK_PERIOD_MS); @@ -203,7 +203,7 @@ void app_main(void) vTaskDelay(2000 / portTICK_PERIOD_MS); for(int i=0;i<64;i++) { - ssd1306_rotate(&dev, SCROLL_UP, 0, 127, 0); + ssd1306_wrap_arround(&dev, SCROLL_UP, 0, 127, 0); } vTaskDelay(2000 / portTICK_PERIOD_MS); #endif diff --git a/RotateDemo/CMakeLists.txt b/WrapAroundDemo/CMakeLists.txt similarity index 100% rename from RotateDemo/CMakeLists.txt rename to WrapAroundDemo/CMakeLists.txt diff --git a/RotateDemo/README.md b/WrapAroundDemo/README.md similarity index 80% rename from RotateDemo/README.md rename to WrapAroundDemo/README.md index 8e8033f..716607e 100644 --- a/RotateDemo/README.md +++ b/WrapAroundDemo/README.md @@ -1,4 +1,4 @@ -# RotateDemo for SSD1306 +# WrapAroundDemo for SSD1306 ![RoteteDemo](https://user-images.githubusercontent.com/6020549/165236460-e1fd757c-dcff-4601-bce1-b533599b5fc5.JPG) diff --git a/RotateDemo/main/CMakeLists.txt b/WrapAroundDemo/main/CMakeLists.txt similarity index 100% rename from RotateDemo/main/CMakeLists.txt rename to WrapAroundDemo/main/CMakeLists.txt diff --git a/RotateDemo/main/component.mk b/WrapAroundDemo/main/component.mk similarity index 100% rename from RotateDemo/main/component.mk rename to WrapAroundDemo/main/component.mk diff --git a/RotateDemo/main/main.c b/WrapAroundDemo/main/main.c similarity index 83% rename from RotateDemo/main/main.c rename to WrapAroundDemo/main/main.c index eccbc0a..17d7f3b 100644 --- a/RotateDemo/main/main.c +++ b/WrapAroundDemo/main/main.c @@ -88,17 +88,17 @@ void app_main(void) vTaskDelay(3000 / portTICK_PERIOD_MS); while(1) { for(int i=0;i<128;i++) { - ssd1306_rotate(&dev, SCROLL_RIGHT, 1, 2, 0); + ssd1306_wrap_arround(&dev, SCROLL_RIGHT, 1, 2, 0); if (pages == 7) { - ssd1306_rotate(&dev, SCROLL_RIGHT, 5, 6, 0); + ssd1306_wrap_arround(&dev, SCROLL_RIGHT, 5, 6, 0); } } vTaskDelay(2000 / portTICK_PERIOD_MS); for(int i=0;i<128;i++) { - ssd1306_rotate(&dev, SCROLL_LEFT, 1, 2, 0); + ssd1306_wrap_arround(&dev, SCROLL_LEFT, 1, 2, 0); if (pages == 7) { - ssd1306_rotate(&dev, SCROLL_LEFT, 5, 6, 0); + ssd1306_wrap_arround(&dev, SCROLL_LEFT, 5, 6, 0); } } vTaskDelay(2000 / portTICK_PERIOD_MS); @@ -106,27 +106,27 @@ void app_main(void) int height = ssd1306_get_height(&dev); ESP_LOGD(TAG, "height=%d", height); for(int i=0;i