Mandelbrot set generator using DISCO-F746NG.
Dependencies: BSP_DISCO_F746NG LCD_DISCO_F746NG TS_DISCO_F746NG mbed BUTTON_GROUP
Revision 6:cafbcdf0d166, committed 2016-02-22
- Comitter:
- MikamiUitOpen
- Date:
- Mon Feb 22 13:51:42 2016 +0000
- Parent:
- 5:d8baac12f595
- Commit message:
- 7
Changed in this revision
--- a/BUTTON_GROUP.lib Wed Feb 17 06:37:08 2016 +0000 +++ b/BUTTON_GROUP.lib Mon Feb 22 13:51:42 2016 +0000 @@ -1,1 +1,1 @@ -http://mbed.org/users/MikamiUitOpen/code/BUTTON_GROUP/#204bc17f59cc +http://mbed.org/users/MikamiUitOpen/code/BUTTON_GROUP/#af578b53ff0e
--- a/Mandelbrot/mandelbrot.cpp Wed Feb 17 06:37:08 2016 +0000 +++ b/Mandelbrot/mandelbrot.cpp Mon Feb 22 13:51:42 2016 +0000 @@ -56,4 +56,3 @@ return 0xFF000000 | (r << 16) | (g << 8) | b; } } -
--- a/main.cpp Wed Feb 17 06:37:08 2016 +0000 +++ b/main.cpp Mon Feb 22 13:51:42 2016 +0000 @@ -5,7 +5,7 @@ // Tap the Mandelbrot set on the screen, expanded figure by a // factor of two around the tapped position is displayed. // -// 2016/02/17, Copyright (c) 2016 MIKAMI, Naoki +// 2016/02/22, Copyright (c) 2016 MIKAMI, Naoki //--------------------------------------------------------------- #include "button_group.hpp" @@ -28,7 +28,6 @@ const int NX_ = 321; // number of pixels for horizon const int NY_ = 261; // number of pixels for vertical -// Redrawing Mandelbrot set with different scale void Redraw(MandelbrotBase *mandel, float wH, float hH, PointF xy, int level, float &x1, float &x2, float &y1, float &y2) @@ -118,8 +117,7 @@ // expand twice around tapped point if (area.Touched() && (pattern != -1)) { - TS_StateTypeDef state; - ts_.GetState(&state); + TS_StateTypeDef state = Button::GottenState(); uint16_t x = state.touchX[0] - X0_; uint16_t y = state.touchY[0] - Y0_;