diff --git a/data/out00000.jpg b/data/out00000.jpg
index 5e42743..f757342 100644
Binary files a/data/out00000.jpg and b/data/out00000.jpg differ
diff --git a/data/out00001.jpg b/data/out00001.jpg
index 54cdca0..67d368f 100644
Binary files a/data/out00001.jpg and b/data/out00001.jpg differ
diff --git a/data/out00002.jpg b/data/out00002.jpg
index 0231f2d..1f7d030 100644
Binary files a/data/out00002.jpg and b/data/out00002.jpg differ
diff --git a/data/out00003.jpg b/data/out00003.jpg
index 56798c6..850ae99 100644
Binary files a/data/out00003.jpg and b/data/out00003.jpg differ
diff --git a/data/out00004.jpg b/data/out00004.jpg
index 56798c6..3758c2c 100644
Binary files a/data/out00004.jpg and b/data/out00004.jpg differ
diff --git a/data/out00005.jpg b/data/out00005.jpg
index 23b91e6..2be4974 100644
Binary files a/data/out00005.jpg and b/data/out00005.jpg differ
diff --git a/data/out00006.jpg b/data/out00006.jpg
index 82a60d0..e0f8281 100644
Binary files a/data/out00006.jpg and b/data/out00006.jpg differ
diff --git a/data/out00007.jpg b/data/out00007.jpg
index b5667da..6aee3c6 100644
Binary files a/data/out00007.jpg and b/data/out00007.jpg differ
diff --git a/data/out00008.jpg b/data/out00008.jpg
index a043192..5ef0fc9 100644
Binary files a/data/out00008.jpg and b/data/out00008.jpg differ
diff --git a/data/out00009.jpg b/data/out00009.jpg
index 6a00d90..1bd4acd 100644
Binary files a/data/out00009.jpg and b/data/out00009.jpg differ
diff --git a/data/out00010.jpg b/data/out00010.jpg
index 6684184..d17b6d2 100644
Binary files a/data/out00010.jpg and b/data/out00010.jpg differ
diff --git a/data/out00011.jpg b/data/out00011.jpg
index f23873b..6fa9302 100644
Binary files a/data/out00011.jpg and b/data/out00011.jpg differ
diff --git a/data/out00012.jpg b/data/out00012.jpg
index e760593..a189d70 100644
Binary files a/data/out00012.jpg and b/data/out00012.jpg differ
diff --git a/data/out00013.jpg b/data/out00013.jpg
index 06492a2..d09d955 100644
Binary files a/data/out00013.jpg and b/data/out00013.jpg differ
diff --git a/data/out00014.jpg b/data/out00014.jpg
index 3d0d4f2..fb0b79a 100644
Binary files a/data/out00014.jpg and b/data/out00014.jpg differ
diff --git a/data/out00015.jpg b/data/out00015.jpg
index f7ac755..8466133 100644
Binary files a/data/out00015.jpg and b/data/out00015.jpg differ
diff --git a/data/out00016.jpg b/data/out00016.jpg
index b57afbb..4557685 100644
Binary files a/data/out00016.jpg and b/data/out00016.jpg differ
diff --git a/data/out00017.jpg b/data/out00017.jpg
index 40695ab..54083a5 100644
Binary files a/data/out00017.jpg and b/data/out00017.jpg differ
diff --git a/data/out00018.jpg b/data/out00018.jpg
index 70f1bf9..83c3478 100644
Binary files a/data/out00018.jpg and b/data/out00018.jpg differ
diff --git a/data/out00019.jpg b/data/out00019.jpg
index fe196fc..8a85fb6 100644
Binary files a/data/out00019.jpg and b/data/out00019.jpg differ
diff --git a/data/out00020.jpg b/data/out00020.jpg
index bfc3c04..7bc2533 100644
Binary files a/data/out00020.jpg and b/data/out00020.jpg differ
diff --git a/data/out00021.jpg b/data/out00021.jpg
index d9a9547..5efd580 100644
Binary files a/data/out00021.jpg and b/data/out00021.jpg differ
diff --git a/data/out00022.jpg b/data/out00022.jpg
index 16ee729..124ecba 100644
Binary files a/data/out00022.jpg and b/data/out00022.jpg differ
diff --git a/data/out00023.jpg b/data/out00023.jpg
index c8839ec..de4a9f9 100644
Binary files a/data/out00023.jpg and b/data/out00023.jpg differ
diff --git a/data/out00024.jpg b/data/out00024.jpg
index d625697..998d310 100644
Binary files a/data/out00024.jpg and b/data/out00024.jpg differ
diff --git a/data/out00025.jpg b/data/out00025.jpg
index 4b745df..c72d2ab 100644
Binary files a/data/out00025.jpg and b/data/out00025.jpg differ
diff --git a/data/out00026.jpg b/data/out00026.jpg
index 6f870f6..ed69dd1 100644
Binary files a/data/out00026.jpg and b/data/out00026.jpg differ
diff --git a/data/out00027.jpg b/data/out00027.jpg
index 1d68115..903dadf 100644
Binary files a/data/out00027.jpg and b/data/out00027.jpg differ
diff --git a/data/out00028.jpg b/data/out00028.jpg
index 748ed86..a385cf0 100644
Binary files a/data/out00028.jpg and b/data/out00028.jpg differ
diff --git a/data/out00029.jpg b/data/out00029.jpg
index 5a730de..f88263e 100644
Binary files a/data/out00029.jpg and b/data/out00029.jpg differ
diff --git a/data/out00030.jpg b/data/out00030.jpg
index 2cbdc1a..592ca02 100644
Binary files a/data/out00030.jpg and b/data/out00030.jpg differ
diff --git a/data/out00031.jpg b/data/out00031.jpg
index c22bb09..25b3dd7 100644
Binary files a/data/out00031.jpg and b/data/out00031.jpg differ
diff --git a/data/out00032.jpg b/data/out00032.jpg
index 5a12c05..0a6654c 100644
Binary files a/data/out00032.jpg and b/data/out00032.jpg differ
diff --git a/data/out00033.jpg b/data/out00033.jpg
index 9a4501a..7e67bb6 100644
Binary files a/data/out00033.jpg and b/data/out00033.jpg differ
diff --git a/data/out00034.jpg b/data/out00034.jpg
index 94d349d..e9aff54 100644
Binary files a/data/out00034.jpg and b/data/out00034.jpg differ
diff --git a/data/out00035.jpg b/data/out00035.jpg
index fe3627d..7593325 100644
Binary files a/data/out00035.jpg and b/data/out00035.jpg differ
diff --git a/data/out00036.jpg b/data/out00036.jpg
index aa974bc..c031529 100644
Binary files a/data/out00036.jpg and b/data/out00036.jpg differ
diff --git a/data/out00037.jpg b/data/out00037.jpg
index 9f4a268..bf4b15c 100644
Binary files a/data/out00037.jpg and b/data/out00037.jpg differ
diff --git a/data/out00038.jpg b/data/out00038.jpg
index 61f2ffd..32a2659 100644
Binary files a/data/out00038.jpg and b/data/out00038.jpg differ
diff --git a/data/out00039.jpg b/data/out00039.jpg
index c26862c..7a9b113 100644
Binary files a/data/out00039.jpg and b/data/out00039.jpg differ
diff --git a/data/out00040.jpg b/data/out00040.jpg
index bc6b6dc..5dc6d31 100644
Binary files a/data/out00040.jpg and b/data/out00040.jpg differ
diff --git a/data/out00041.jpg b/data/out00041.jpg
index 8e6a7a2..d012087 100644
Binary files a/data/out00041.jpg and b/data/out00041.jpg differ
diff --git a/data/out00042.jpg b/data/out00042.jpg
index 85a11a7..9686687 100644
Binary files a/data/out00042.jpg and b/data/out00042.jpg differ
diff --git a/data/out00043.jpg b/data/out00043.jpg
index 3f30721..da3ea84 100644
Binary files a/data/out00043.jpg and b/data/out00043.jpg differ
diff --git a/data/out00044.jpg b/data/out00044.jpg
index d7afc9f..8e3b814 100644
Binary files a/data/out00044.jpg and b/data/out00044.jpg differ
diff --git a/data/out00045.jpg b/data/out00045.jpg
index 4df6a9e..a63c878 100644
Binary files a/data/out00045.jpg and b/data/out00045.jpg differ
diff --git a/data/out00046.jpg b/data/out00046.jpg
index c9a02f3..f7c29d9 100644
Binary files a/data/out00046.jpg and b/data/out00046.jpg differ
diff --git a/data/out00047.jpg b/data/out00047.jpg
index 0e2e4ee..c9e5a4d 100644
Binary files a/data/out00047.jpg and b/data/out00047.jpg differ
diff --git a/data/out00048.jpg b/data/out00048.jpg
index 73e7d1c..f0da514 100644
Binary files a/data/out00048.jpg and b/data/out00048.jpg differ
diff --git a/data/out00049.jpg b/data/out00049.jpg
index 0d6aaa7..c40b8da 100644
Binary files a/data/out00049.jpg and b/data/out00049.jpg differ
diff --git a/data/out00050.jpg b/data/out00050.jpg
index fbac074..ab58cee 100644
Binary files a/data/out00050.jpg and b/data/out00050.jpg differ
diff --git a/data/out00051.jpg b/data/out00051.jpg
index ecdaed3..59c5a11 100644
Binary files a/data/out00051.jpg and b/data/out00051.jpg differ
diff --git a/data/out00052.jpg b/data/out00052.jpg
index 4d283cf..b61bf4e 100644
Binary files a/data/out00052.jpg and b/data/out00052.jpg differ
diff --git a/data/out00053.jpg b/data/out00053.jpg
index c6fc50c..9c89978 100644
Binary files a/data/out00053.jpg and b/data/out00053.jpg differ
diff --git a/data/out00054.jpg b/data/out00054.jpg
index ede7860..84b5853 100644
Binary files a/data/out00054.jpg and b/data/out00054.jpg differ
diff --git a/data/out00055.jpg b/data/out00055.jpg
index 538ae91..4bb7cae 100644
Binary files a/data/out00055.jpg and b/data/out00055.jpg differ
diff --git a/data/out00056.jpg b/data/out00056.jpg
index 61d1af5..23cd07c 100644
Binary files a/data/out00056.jpg and b/data/out00056.jpg differ
diff --git a/data/out00057.jpg b/data/out00057.jpg
index 2361bde..b8a6572 100644
Binary files a/data/out00057.jpg and b/data/out00057.jpg differ
diff --git a/data/out00058.jpg b/data/out00058.jpg
index c19d47b..9691c5d 100644
Binary files a/data/out00058.jpg and b/data/out00058.jpg differ
diff --git a/data/out00059.jpg b/data/out00059.jpg
index 1782f61..cb5303a 100644
Binary files a/data/out00059.jpg and b/data/out00059.jpg differ
diff --git a/data/out00060.jpg b/data/out00060.jpg
index 756374c..aaaea58 100644
Binary files a/data/out00060.jpg and b/data/out00060.jpg differ
diff --git a/data/out00061.jpg b/data/out00061.jpg
index 13445f4..0f58617 100644
Binary files a/data/out00061.jpg and b/data/out00061.jpg differ
diff --git a/data/out00062.jpg b/data/out00062.jpg
index 8b6cbd9..0488e3d 100644
Binary files a/data/out00062.jpg and b/data/out00062.jpg differ
diff --git a/data/out00063.jpg b/data/out00063.jpg
index 3bd08f4..8d9a53a 100644
Binary files a/data/out00063.jpg and b/data/out00063.jpg differ
diff --git a/data/out00064.jpg b/data/out00064.jpg
index 57c8016..ec6e0db 100644
Binary files a/data/out00064.jpg and b/data/out00064.jpg differ
diff --git a/data/out00065.jpg b/data/out00065.jpg
index ca4a9e3..079a351 100644
Binary files a/data/out00065.jpg and b/data/out00065.jpg differ
diff --git a/data/out00066.jpg b/data/out00066.jpg
index 2514122..64e6cfa 100644
Binary files a/data/out00066.jpg and b/data/out00066.jpg differ
diff --git a/data/out00067.jpg b/data/out00067.jpg
index e18d3ed..e584c94 100644
Binary files a/data/out00067.jpg and b/data/out00067.jpg differ
diff --git a/data/out00068.jpg b/data/out00068.jpg
index bac6c58..cffc6ff 100644
Binary files a/data/out00068.jpg and b/data/out00068.jpg differ
diff --git a/data/out00069.jpg b/data/out00069.jpg
index a6cfc15..ee0ab66 100644
Binary files a/data/out00069.jpg and b/data/out00069.jpg differ
diff --git a/data/out00070.jpg b/data/out00070.jpg
index 433e2b4..55e4b55 100644
Binary files a/data/out00070.jpg and b/data/out00070.jpg differ
diff --git a/data/out00071.jpg b/data/out00071.jpg
index ed1f94a..67992c2 100644
Binary files a/data/out00071.jpg and b/data/out00071.jpg differ
diff --git a/data/out00072.jpg b/data/out00072.jpg
index 77c4346..6cf2753 100644
Binary files a/data/out00072.jpg and b/data/out00072.jpg differ
diff --git a/data/out00073.jpg b/data/out00073.jpg
index cd6eb61..03f0ae5 100644
Binary files a/data/out00073.jpg and b/data/out00073.jpg differ
diff --git a/data/out00074.jpg b/data/out00074.jpg
index 1783bb1..d0fa621 100644
Binary files a/data/out00074.jpg and b/data/out00074.jpg differ
diff --git a/data/out00075.jpg b/data/out00075.jpg
index d36acb5..2b283cf 100644
Binary files a/data/out00075.jpg and b/data/out00075.jpg differ
diff --git a/data/out00076.jpg b/data/out00076.jpg
index afca7e1..26ae339 100644
Binary files a/data/out00076.jpg and b/data/out00076.jpg differ
diff --git a/data/out00077.jpg b/data/out00077.jpg
index 70fd8a8..2077d9d 100644
Binary files a/data/out00077.jpg and b/data/out00077.jpg differ
diff --git a/data/out00078.jpg b/data/out00078.jpg
index 8cdb8df..c6fed39 100644
Binary files a/data/out00078.jpg and b/data/out00078.jpg differ
diff --git a/data/out00079.jpg b/data/out00079.jpg
index 9dd0cdd..c7067e5 100644
Binary files a/data/out00079.jpg and b/data/out00079.jpg differ
diff --git a/data/out00080.jpg b/data/out00080.jpg
index e097266..098fe88 100644
Binary files a/data/out00080.jpg and b/data/out00080.jpg differ
diff --git a/data/out00081.jpg b/data/out00081.jpg
index 69e5262..5c7502f 100644
Binary files a/data/out00081.jpg and b/data/out00081.jpg differ
diff --git a/data/out00082.jpg b/data/out00082.jpg
index c53fd84..878ea76 100644
Binary files a/data/out00082.jpg and b/data/out00082.jpg differ
diff --git a/data/out00083.jpg b/data/out00083.jpg
index 4d2223b..9b03cd4 100644
Binary files a/data/out00083.jpg and b/data/out00083.jpg differ
diff --git a/data/out00084.jpg b/data/out00084.jpg
index f4b4b1e..d86f41c 100644
Binary files a/data/out00084.jpg and b/data/out00084.jpg differ
diff --git a/data/out00085.jpg b/data/out00085.jpg
index 187ea9b..5135fbd 100644
Binary files a/data/out00085.jpg and b/data/out00085.jpg differ
diff --git a/data/out00086.jpg b/data/out00086.jpg
index e185e3b..ad9bada 100644
Binary files a/data/out00086.jpg and b/data/out00086.jpg differ
diff --git a/data/out00087.jpg b/data/out00087.jpg
index 8a2db8f..8ce09cd 100644
Binary files a/data/out00087.jpg and b/data/out00087.jpg differ
diff --git a/data/out00088.jpg b/data/out00088.jpg
index 638e389..75d180a 100644
Binary files a/data/out00088.jpg and b/data/out00088.jpg differ
diff --git a/data/out00089.jpg b/data/out00089.jpg
index 3b13ec6..8eb2cea 100644
Binary files a/data/out00089.jpg and b/data/out00089.jpg differ
diff --git a/data/out00090.jpg b/data/out00090.jpg
index 1fcda1b..f0e01b1 100644
Binary files a/data/out00090.jpg and b/data/out00090.jpg differ
diff --git a/data/out00091.jpg b/data/out00091.jpg
index c2a5cbe..5fd1089 100644
Binary files a/data/out00091.jpg and b/data/out00091.jpg differ
diff --git a/data/out00092.jpg b/data/out00092.jpg
index 488f691..08eb930 100644
Binary files a/data/out00092.jpg and b/data/out00092.jpg differ
diff --git a/data/out00093.jpg b/data/out00093.jpg
index 8d9f9a1..fa2c243 100644
Binary files a/data/out00093.jpg and b/data/out00093.jpg differ
diff --git a/data/out00094.jpg b/data/out00094.jpg
index e00d5dc..298dd21 100644
Binary files a/data/out00094.jpg and b/data/out00094.jpg differ
diff --git a/data/out00095.jpg b/data/out00095.jpg
index 50eb30f..0d6e017 100644
Binary files a/data/out00095.jpg and b/data/out00095.jpg differ
diff --git a/data/out00096.jpg b/data/out00096.jpg
index f601310..3569fdd 100644
Binary files a/data/out00096.jpg and b/data/out00096.jpg differ
diff --git a/data/out00097.jpg b/data/out00097.jpg
index 9224d42..7133e76 100644
Binary files a/data/out00097.jpg and b/data/out00097.jpg differ
diff --git a/data/out00098.jpg b/data/out00098.jpg
index ba262e8..33ea1c6 100644
Binary files a/data/out00098.jpg and b/data/out00098.jpg differ
diff --git a/data/out00099.jpg b/data/out00099.jpg
index 0ab78a8..5696c11 100644
Binary files a/data/out00099.jpg and b/data/out00099.jpg differ
diff --git a/data/out00100.jpg b/data/out00100.jpg
deleted file mode 100644
index 9614144..0000000
Binary files a/data/out00100.jpg and /dev/null differ
diff --git a/data/out00101.jpg b/data/out00101.jpg
deleted file mode 100644
index a42ddb7..0000000
Binary files a/data/out00101.jpg and /dev/null differ
diff --git a/data/out00102.jpg b/data/out00102.jpg
deleted file mode 100644
index cad4458..0000000
Binary files a/data/out00102.jpg and /dev/null differ
diff --git a/data/out00103.jpg b/data/out00103.jpg
deleted file mode 100644
index 871bb59..0000000
Binary files a/data/out00103.jpg and /dev/null differ
diff --git a/data/out00104.jpg b/data/out00104.jpg
deleted file mode 100644
index 5ccb5af..0000000
Binary files a/data/out00104.jpg and /dev/null differ
diff --git a/data/out00105.jpg b/data/out00105.jpg
deleted file mode 100644
index acf8359..0000000
Binary files a/data/out00105.jpg and /dev/null differ
diff --git a/data/out00106.jpg b/data/out00106.jpg
deleted file mode 100644
index 0439ea1..0000000
Binary files a/data/out00106.jpg and /dev/null differ
diff --git a/data/out00107.jpg b/data/out00107.jpg
deleted file mode 100644
index f0f052c..0000000
Binary files a/data/out00107.jpg and /dev/null differ
diff --git a/data/out00108.jpg b/data/out00108.jpg
deleted file mode 100644
index fa8735a..0000000
Binary files a/data/out00108.jpg and /dev/null differ
diff --git a/data/out00109.jpg b/data/out00109.jpg
deleted file mode 100644
index 97df515..0000000
Binary files a/data/out00109.jpg and /dev/null differ
diff --git a/data/out00110.jpg b/data/out00110.jpg
deleted file mode 100644
index 5697018..0000000
Binary files a/data/out00110.jpg and /dev/null differ
diff --git a/data/out00111.jpg b/data/out00111.jpg
deleted file mode 100644
index 6219bd1..0000000
Binary files a/data/out00111.jpg and /dev/null differ
diff --git a/data/out00112.jpg b/data/out00112.jpg
deleted file mode 100644
index d71399d..0000000
Binary files a/data/out00112.jpg and /dev/null differ
diff --git a/data/out00113.jpg b/data/out00113.jpg
deleted file mode 100644
index 12b8cfa..0000000
Binary files a/data/out00113.jpg and /dev/null differ
diff --git a/data/out00114.jpg b/data/out00114.jpg
deleted file mode 100644
index e87e8fa..0000000
Binary files a/data/out00114.jpg and /dev/null differ
diff --git a/data/out00115.jpg b/data/out00115.jpg
deleted file mode 100644
index 3317612..0000000
Binary files a/data/out00115.jpg and /dev/null differ
diff --git a/data/out00116.jpg b/data/out00116.jpg
deleted file mode 100644
index 76011c1..0000000
Binary files a/data/out00116.jpg and /dev/null differ
diff --git a/data/out00117.jpg b/data/out00117.jpg
deleted file mode 100644
index c2d5a55..0000000
Binary files a/data/out00117.jpg and /dev/null differ
diff --git a/data/out00118.jpg b/data/out00118.jpg
deleted file mode 100644
index ee42330..0000000
Binary files a/data/out00118.jpg and /dev/null differ
diff --git a/data/out00119.jpg b/data/out00119.jpg
deleted file mode 100644
index 80450c7..0000000
Binary files a/data/out00119.jpg and /dev/null differ
diff --git a/data/out00120.jpg b/data/out00120.jpg
deleted file mode 100644
index 0680a1f..0000000
Binary files a/data/out00120.jpg and /dev/null differ
diff --git a/data/out00121.jpg b/data/out00121.jpg
deleted file mode 100644
index 9912735..0000000
Binary files a/data/out00121.jpg and /dev/null differ
diff --git a/data/out00122.jpg b/data/out00122.jpg
deleted file mode 100644
index cd00f40..0000000
Binary files a/data/out00122.jpg and /dev/null differ
diff --git a/data/out00123.jpg b/data/out00123.jpg
deleted file mode 100644
index c589b87..0000000
Binary files a/data/out00123.jpg and /dev/null differ
diff --git a/data/out00124.jpg b/data/out00124.jpg
deleted file mode 100644
index a97e529..0000000
Binary files a/data/out00124.jpg and /dev/null differ
diff --git a/data/out00125.jpg b/data/out00125.jpg
deleted file mode 100644
index 8fa70da..0000000
Binary files a/data/out00125.jpg and /dev/null differ
diff --git a/data/out00126.jpg b/data/out00126.jpg
deleted file mode 100644
index dd95e12..0000000
Binary files a/data/out00126.jpg and /dev/null differ
diff --git a/data/out00127.jpg b/data/out00127.jpg
deleted file mode 100644
index 48b019d..0000000
Binary files a/data/out00127.jpg and /dev/null differ
diff --git a/data/out00128.jpg b/data/out00128.jpg
deleted file mode 100644
index 3c696d9..0000000
Binary files a/data/out00128.jpg and /dev/null differ
diff --git a/data/out00129.jpg b/data/out00129.jpg
deleted file mode 100644
index b7980f3..0000000
Binary files a/data/out00129.jpg and /dev/null differ
diff --git a/data/out00130.jpg b/data/out00130.jpg
deleted file mode 100644
index 2517ddf..0000000
Binary files a/data/out00130.jpg and /dev/null differ
diff --git a/data/out00131.jpg b/data/out00131.jpg
deleted file mode 100644
index 60e17b9..0000000
Binary files a/data/out00131.jpg and /dev/null differ
diff --git a/data/out00132.jpg b/data/out00132.jpg
deleted file mode 100644
index a7dd228..0000000
Binary files a/data/out00132.jpg and /dev/null differ
diff --git a/data/out00133.jpg b/data/out00133.jpg
deleted file mode 100644
index 8f05f19..0000000
Binary files a/data/out00133.jpg and /dev/null differ
diff --git a/data/out00134.jpg b/data/out00134.jpg
deleted file mode 100644
index b44e004..0000000
Binary files a/data/out00134.jpg and /dev/null differ
diff --git a/data/out00135.jpg b/data/out00135.jpg
deleted file mode 100644
index 41b3ad8..0000000
Binary files a/data/out00135.jpg and /dev/null differ
diff --git a/data/out00136.jpg b/data/out00136.jpg
deleted file mode 100644
index 0431f39..0000000
Binary files a/data/out00136.jpg and /dev/null differ
diff --git a/data/out00137.jpg b/data/out00137.jpg
deleted file mode 100644
index 7371445..0000000
Binary files a/data/out00137.jpg and /dev/null differ
diff --git a/data/out00138.jpg b/data/out00138.jpg
deleted file mode 100644
index a218c48..0000000
Binary files a/data/out00138.jpg and /dev/null differ
diff --git a/data/out00139.jpg b/data/out00139.jpg
deleted file mode 100644
index a4f16b5..0000000
Binary files a/data/out00139.jpg and /dev/null differ
diff --git a/data/out00140.jpg b/data/out00140.jpg
deleted file mode 100644
index d72f984..0000000
Binary files a/data/out00140.jpg and /dev/null differ
diff --git a/data/out00141.jpg b/data/out00141.jpg
deleted file mode 100644
index 7bf2fd1..0000000
Binary files a/data/out00141.jpg and /dev/null differ
diff --git a/data/out00142.jpg b/data/out00142.jpg
deleted file mode 100644
index b251a1b..0000000
Binary files a/data/out00142.jpg and /dev/null differ
diff --git a/data/out00143.jpg b/data/out00143.jpg
deleted file mode 100644
index b4c7512..0000000
Binary files a/data/out00143.jpg and /dev/null differ
diff --git a/data/out00144.jpg b/data/out00144.jpg
deleted file mode 100644
index 5b20166..0000000
Binary files a/data/out00144.jpg and /dev/null differ
diff --git a/data/out00145.jpg b/data/out00145.jpg
deleted file mode 100644
index 4f55a3b..0000000
Binary files a/data/out00145.jpg and /dev/null differ
diff --git a/data/out00146.jpg b/data/out00146.jpg
deleted file mode 100644
index 4f79999..0000000
Binary files a/data/out00146.jpg and /dev/null differ
diff --git a/data/out00147.jpg b/data/out00147.jpg
deleted file mode 100644
index ccbdbad..0000000
Binary files a/data/out00147.jpg and /dev/null differ
diff --git a/data/out00148.jpg b/data/out00148.jpg
deleted file mode 100644
index dd9c520..0000000
Binary files a/data/out00148.jpg and /dev/null differ
diff --git a/data/out00149.jpg b/data/out00149.jpg
deleted file mode 100644
index 5e9cea7..0000000
Binary files a/data/out00149.jpg and /dev/null differ
diff --git a/data/out00150.jpg b/data/out00150.jpg
deleted file mode 100644
index 6fc15d2..0000000
Binary files a/data/out00150.jpg and /dev/null differ
diff --git a/data/out00151.jpg b/data/out00151.jpg
deleted file mode 100644
index bd4e213..0000000
Binary files a/data/out00151.jpg and /dev/null differ
diff --git a/data/out00152.jpg b/data/out00152.jpg
deleted file mode 100644
index 880e9ec..0000000
Binary files a/data/out00152.jpg and /dev/null differ
diff --git a/data/out00153.jpg b/data/out00153.jpg
deleted file mode 100644
index 99076b4..0000000
Binary files a/data/out00153.jpg and /dev/null differ
diff --git a/data/out00154.jpg b/data/out00154.jpg
deleted file mode 100644
index d3adafd..0000000
Binary files a/data/out00154.jpg and /dev/null differ
diff --git a/data/out00155.jpg b/data/out00155.jpg
deleted file mode 100644
index e3f5492..0000000
Binary files a/data/out00155.jpg and /dev/null differ
diff --git a/data/out00156.jpg b/data/out00156.jpg
deleted file mode 100644
index 1c2a9b6..0000000
Binary files a/data/out00156.jpg and /dev/null differ
diff --git a/data/out00157.jpg b/data/out00157.jpg
deleted file mode 100644
index b43d0ca..0000000
Binary files a/data/out00157.jpg and /dev/null differ
diff --git a/data/out00158.jpg b/data/out00158.jpg
deleted file mode 100644
index 76f4452..0000000
Binary files a/data/out00158.jpg and /dev/null differ
diff --git a/data/out00159.jpg b/data/out00159.jpg
deleted file mode 100644
index 7cda5e7..0000000
Binary files a/data/out00159.jpg and /dev/null differ
diff --git a/data/out00160.jpg b/data/out00160.jpg
deleted file mode 100644
index e9f5b84..0000000
Binary files a/data/out00160.jpg and /dev/null differ
diff --git a/data/out00161.jpg b/data/out00161.jpg
deleted file mode 100644
index 5756c6b..0000000
Binary files a/data/out00161.jpg and /dev/null differ
diff --git a/data/out00162.jpg b/data/out00162.jpg
deleted file mode 100644
index 3ba4589..0000000
Binary files a/data/out00162.jpg and /dev/null differ
diff --git a/data/out00163.jpg b/data/out00163.jpg
deleted file mode 100644
index 99592d0..0000000
Binary files a/data/out00163.jpg and /dev/null differ
diff --git a/data/out00164.jpg b/data/out00164.jpg
deleted file mode 100644
index 2d98cf4..0000000
Binary files a/data/out00164.jpg and /dev/null differ
diff --git a/data/out00165.jpg b/data/out00165.jpg
deleted file mode 100644
index f3e3537..0000000
Binary files a/data/out00165.jpg and /dev/null differ
diff --git a/data/out00166.jpg b/data/out00166.jpg
deleted file mode 100644
index b6448dd..0000000
Binary files a/data/out00166.jpg and /dev/null differ
diff --git a/data/out00167.jpg b/data/out00167.jpg
deleted file mode 100644
index 71b921c..0000000
Binary files a/data/out00167.jpg and /dev/null differ
diff --git a/data/out00168.jpg b/data/out00168.jpg
deleted file mode 100644
index 211310e..0000000
Binary files a/data/out00168.jpg and /dev/null differ
diff --git a/data/out00169.jpg b/data/out00169.jpg
deleted file mode 100644
index f218c4f..0000000
Binary files a/data/out00169.jpg and /dev/null differ
diff --git a/data/out00170.jpg b/data/out00170.jpg
deleted file mode 100644
index ac8477a..0000000
Binary files a/data/out00170.jpg and /dev/null differ
diff --git a/data/out00171.jpg b/data/out00171.jpg
deleted file mode 100644
index cadc68a..0000000
Binary files a/data/out00171.jpg and /dev/null differ
diff --git a/data/out00172.jpg b/data/out00172.jpg
deleted file mode 100644
index d9882c3..0000000
Binary files a/data/out00172.jpg and /dev/null differ
diff --git a/data/out00173.jpg b/data/out00173.jpg
deleted file mode 100644
index e021222..0000000
Binary files a/data/out00173.jpg and /dev/null differ
diff --git a/data/out00174.jpg b/data/out00174.jpg
deleted file mode 100644
index 42181ec..0000000
Binary files a/data/out00174.jpg and /dev/null differ
diff --git a/data/out00175.jpg b/data/out00175.jpg
deleted file mode 100644
index 5fe61f7..0000000
Binary files a/data/out00175.jpg and /dev/null differ
diff --git a/data/out00176.jpg b/data/out00176.jpg
deleted file mode 100644
index ab7ef85..0000000
Binary files a/data/out00176.jpg and /dev/null differ
diff --git a/data/out00177.jpg b/data/out00177.jpg
deleted file mode 100644
index d7460ed..0000000
Binary files a/data/out00177.jpg and /dev/null differ
diff --git a/data/out00178.jpg b/data/out00178.jpg
deleted file mode 100644
index ad5740f..0000000
Binary files a/data/out00178.jpg and /dev/null differ
diff --git a/data/out00179.jpg b/data/out00179.jpg
deleted file mode 100644
index ccf6796..0000000
Binary files a/data/out00179.jpg and /dev/null differ
diff --git a/data/out00180.jpg b/data/out00180.jpg
deleted file mode 100644
index 252b2f9..0000000
Binary files a/data/out00180.jpg and /dev/null differ
diff --git a/data/out00181.jpg b/data/out00181.jpg
deleted file mode 100644
index abb27df..0000000
Binary files a/data/out00181.jpg and /dev/null differ
diff --git a/data/out00182.jpg b/data/out00182.jpg
deleted file mode 100644
index 081d297..0000000
Binary files a/data/out00182.jpg and /dev/null differ
diff --git a/data/out00183.jpg b/data/out00183.jpg
deleted file mode 100644
index be7228e..0000000
Binary files a/data/out00183.jpg and /dev/null differ
diff --git a/data/out00184.jpg b/data/out00184.jpg
deleted file mode 100644
index 98766c0..0000000
Binary files a/data/out00184.jpg and /dev/null differ
diff --git a/data/out00185.jpg b/data/out00185.jpg
deleted file mode 100644
index 137d13a..0000000
Binary files a/data/out00185.jpg and /dev/null differ
diff --git a/data/out00186.jpg b/data/out00186.jpg
deleted file mode 100644
index c47bc0b..0000000
Binary files a/data/out00186.jpg and /dev/null differ
diff --git a/data/out00187.jpg b/data/out00187.jpg
deleted file mode 100644
index bfc103e..0000000
Binary files a/data/out00187.jpg and /dev/null differ
diff --git a/data/out00188.jpg b/data/out00188.jpg
deleted file mode 100644
index e93fff6..0000000
Binary files a/data/out00188.jpg and /dev/null differ
diff --git a/data/out00189.jpg b/data/out00189.jpg
deleted file mode 100644
index 349809d..0000000
Binary files a/data/out00189.jpg and /dev/null differ
diff --git a/data/out00190.jpg b/data/out00190.jpg
deleted file mode 100644
index c987604..0000000
Binary files a/data/out00190.jpg and /dev/null differ
diff --git a/data/out00191.jpg b/data/out00191.jpg
deleted file mode 100644
index ac31d16..0000000
Binary files a/data/out00191.jpg and /dev/null differ
diff --git a/data/out00192.jpg b/data/out00192.jpg
deleted file mode 100644
index 67780f4..0000000
Binary files a/data/out00192.jpg and /dev/null differ
diff --git a/data/out00193.jpg b/data/out00193.jpg
deleted file mode 100644
index a30e0c0..0000000
Binary files a/data/out00193.jpg and /dev/null differ
diff --git a/data/out00194.jpg b/data/out00194.jpg
deleted file mode 100644
index 2647706..0000000
Binary files a/data/out00194.jpg and /dev/null differ
diff --git a/data/out00195.jpg b/data/out00195.jpg
deleted file mode 100644
index bbaf5c1..0000000
Binary files a/data/out00195.jpg and /dev/null differ
diff --git a/data/out00196.jpg b/data/out00196.jpg
deleted file mode 100644
index 1a8f03c..0000000
Binary files a/data/out00196.jpg and /dev/null differ
diff --git a/data/out00197.jpg b/data/out00197.jpg
deleted file mode 100644
index 490c318..0000000
Binary files a/data/out00197.jpg and /dev/null differ
diff --git a/data/out00198.jpg b/data/out00198.jpg
deleted file mode 100644
index c6515b8..0000000
Binary files a/data/out00198.jpg and /dev/null differ
diff --git a/data/out00199.jpg b/data/out00199.jpg
deleted file mode 100644
index 05afe46..0000000
Binary files a/data/out00199.jpg and /dev/null differ
diff --git a/data/out00200.jpg b/data/out00200.jpg
deleted file mode 100644
index 9f28606..0000000
Binary files a/data/out00200.jpg and /dev/null differ
diff --git a/data/out00201.jpg b/data/out00201.jpg
deleted file mode 100644
index 696dfcf..0000000
Binary files a/data/out00201.jpg and /dev/null differ
diff --git a/data/out00202.jpg b/data/out00202.jpg
deleted file mode 100644
index 28b5071..0000000
Binary files a/data/out00202.jpg and /dev/null differ
diff --git a/data/out00203.jpg b/data/out00203.jpg
deleted file mode 100644
index 5d7566b..0000000
Binary files a/data/out00203.jpg and /dev/null differ
diff --git a/data/out00204.jpg b/data/out00204.jpg
deleted file mode 100644
index 3cba65a..0000000
Binary files a/data/out00204.jpg and /dev/null differ
diff --git a/data/out00205.jpg b/data/out00205.jpg
deleted file mode 100644
index bb1ff00..0000000
Binary files a/data/out00205.jpg and /dev/null differ
diff --git a/data/out00206.jpg b/data/out00206.jpg
deleted file mode 100644
index 5832a1c..0000000
Binary files a/data/out00206.jpg and /dev/null differ
diff --git a/data/out00207.jpg b/data/out00207.jpg
deleted file mode 100644
index 5da2b58..0000000
Binary files a/data/out00207.jpg and /dev/null differ
diff --git a/data/out00208.jpg b/data/out00208.jpg
deleted file mode 100644
index ed4b706..0000000
Binary files a/data/out00208.jpg and /dev/null differ
diff --git a/data/out00209.jpg b/data/out00209.jpg
deleted file mode 100644
index d172477..0000000
Binary files a/data/out00209.jpg and /dev/null differ
diff --git a/data/out00210.jpg b/data/out00210.jpg
deleted file mode 100644
index de79572..0000000
Binary files a/data/out00210.jpg and /dev/null differ
diff --git a/data/out00211.jpg b/data/out00211.jpg
deleted file mode 100644
index 2a6aa63..0000000
Binary files a/data/out00211.jpg and /dev/null differ
diff --git a/data/out00212.jpg b/data/out00212.jpg
deleted file mode 100644
index ebe34f7..0000000
Binary files a/data/out00212.jpg and /dev/null differ
diff --git a/data/out00213.jpg b/data/out00213.jpg
deleted file mode 100644
index bfa6ec7..0000000
Binary files a/data/out00213.jpg and /dev/null differ
diff --git a/data/out00214.jpg b/data/out00214.jpg
deleted file mode 100644
index 72773e1..0000000
Binary files a/data/out00214.jpg and /dev/null differ
diff --git a/data/out00215.jpg b/data/out00215.jpg
deleted file mode 100644
index 15451b5..0000000
Binary files a/data/out00215.jpg and /dev/null differ
diff --git a/data/out00216.jpg b/data/out00216.jpg
deleted file mode 100644
index 2359ec9..0000000
Binary files a/data/out00216.jpg and /dev/null differ
diff --git a/data/out00217.jpg b/data/out00217.jpg
deleted file mode 100644
index 8c6911c..0000000
Binary files a/data/out00217.jpg and /dev/null differ
diff --git a/data/out00218.jpg b/data/out00218.jpg
deleted file mode 100644
index 71ee5db..0000000
Binary files a/data/out00218.jpg and /dev/null differ
diff --git a/data/out00219.jpg b/data/out00219.jpg
deleted file mode 100644
index 806b309..0000000
Binary files a/data/out00219.jpg and /dev/null differ
diff --git a/data/out00220.jpg b/data/out00220.jpg
deleted file mode 100644
index ea2cc29..0000000
Binary files a/data/out00220.jpg and /dev/null differ
diff --git a/data/out00221.jpg b/data/out00221.jpg
deleted file mode 100644
index 5331ce8..0000000
Binary files a/data/out00221.jpg and /dev/null differ
diff --git a/data/out00222.jpg b/data/out00222.jpg
deleted file mode 100644
index d45d6bf..0000000
Binary files a/data/out00222.jpg and /dev/null differ
diff --git a/data/out00223.jpg b/data/out00223.jpg
deleted file mode 100644
index fed3631..0000000
Binary files a/data/out00223.jpg and /dev/null differ
diff --git a/data/out00224.jpg b/data/out00224.jpg
deleted file mode 100644
index 81bd720..0000000
Binary files a/data/out00224.jpg and /dev/null differ
diff --git a/data/out00225.jpg b/data/out00225.jpg
deleted file mode 100644
index b96a8e5..0000000
Binary files a/data/out00225.jpg and /dev/null differ
diff --git a/data/out00226.jpg b/data/out00226.jpg
deleted file mode 100644
index b2f2814..0000000
Binary files a/data/out00226.jpg and /dev/null differ
diff --git a/data/out00227.jpg b/data/out00227.jpg
deleted file mode 100644
index 8bd11ab..0000000
Binary files a/data/out00227.jpg and /dev/null differ
diff --git a/data/out00228.jpg b/data/out00228.jpg
deleted file mode 100644
index 01f916b..0000000
Binary files a/data/out00228.jpg and /dev/null differ
diff --git a/data/out00229.jpg b/data/out00229.jpg
deleted file mode 100644
index ceb0eac..0000000
Binary files a/data/out00229.jpg and /dev/null differ
diff --git a/data/out00230.jpg b/data/out00230.jpg
deleted file mode 100644
index bd86236..0000000
Binary files a/data/out00230.jpg and /dev/null differ
diff --git a/data/out00231.jpg b/data/out00231.jpg
deleted file mode 100644
index abdd284..0000000
Binary files a/data/out00231.jpg and /dev/null differ
diff --git a/data/out00232.jpg b/data/out00232.jpg
deleted file mode 100644
index 817ca8b..0000000
Binary files a/data/out00232.jpg and /dev/null differ
diff --git a/data/out00233.jpg b/data/out00233.jpg
deleted file mode 100644
index bc1146b..0000000
Binary files a/data/out00233.jpg and /dev/null differ
diff --git a/data/out00234.jpg b/data/out00234.jpg
deleted file mode 100644
index 2f33bfb..0000000
Binary files a/data/out00234.jpg and /dev/null differ
diff --git a/data/out00235.jpg b/data/out00235.jpg
deleted file mode 100644
index ec41f5e..0000000
Binary files a/data/out00235.jpg and /dev/null differ
diff --git a/data/out00236.jpg b/data/out00236.jpg
deleted file mode 100644
index e89b88d..0000000
Binary files a/data/out00236.jpg and /dev/null differ
diff --git a/data/out00237.jpg b/data/out00237.jpg
deleted file mode 100644
index a52a34b..0000000
Binary files a/data/out00237.jpg and /dev/null differ
diff --git a/data/out00238.jpg b/data/out00238.jpg
deleted file mode 100644
index 4fb43d8..0000000
Binary files a/data/out00238.jpg and /dev/null differ
diff --git a/data/out00239.jpg b/data/out00239.jpg
deleted file mode 100644
index e4d2631..0000000
Binary files a/data/out00239.jpg and /dev/null differ
diff --git a/data/out00240.jpg b/data/out00240.jpg
deleted file mode 100644
index 6ebfce0..0000000
Binary files a/data/out00240.jpg and /dev/null differ
diff --git a/data/out00241.jpg b/data/out00241.jpg
deleted file mode 100644
index ebbacf0..0000000
Binary files a/data/out00241.jpg and /dev/null differ
diff --git a/data/out00242.jpg b/data/out00242.jpg
deleted file mode 100644
index e43a847..0000000
Binary files a/data/out00242.jpg and /dev/null differ
diff --git a/data/out00243.jpg b/data/out00243.jpg
deleted file mode 100644
index 40e9229..0000000
Binary files a/data/out00243.jpg and /dev/null differ
diff --git a/data/out00244.jpg b/data/out00244.jpg
deleted file mode 100644
index 39212f9..0000000
Binary files a/data/out00244.jpg and /dev/null differ
diff --git a/data/out00245.jpg b/data/out00245.jpg
deleted file mode 100644
index cd4f65c..0000000
Binary files a/data/out00245.jpg and /dev/null differ
diff --git a/data/out00246.jpg b/data/out00246.jpg
deleted file mode 100644
index 6f0fc6a..0000000
Binary files a/data/out00246.jpg and /dev/null differ
diff --git a/data/out00247.jpg b/data/out00247.jpg
deleted file mode 100644
index 0d2789c..0000000
Binary files a/data/out00247.jpg and /dev/null differ
diff --git a/data/out00248.jpg b/data/out00248.jpg
deleted file mode 100644
index ba4a1b8..0000000
Binary files a/data/out00248.jpg and /dev/null differ
diff --git a/data/out00249.jpg b/data/out00249.jpg
deleted file mode 100644
index c6ca021..0000000
Binary files a/data/out00249.jpg and /dev/null differ
diff --git a/data/out00250.jpg b/data/out00250.jpg
deleted file mode 100644
index e29e7b5..0000000
Binary files a/data/out00250.jpg and /dev/null differ
diff --git a/data/out00251.jpg b/data/out00251.jpg
deleted file mode 100644
index fe2070a..0000000
Binary files a/data/out00251.jpg and /dev/null differ
diff --git a/data/out00252.jpg b/data/out00252.jpg
deleted file mode 100644
index 8f03317..0000000
Binary files a/data/out00252.jpg and /dev/null differ
diff --git a/data/out00253.jpg b/data/out00253.jpg
deleted file mode 100644
index 5ca21aa..0000000
Binary files a/data/out00253.jpg and /dev/null differ
diff --git a/data/out00254.jpg b/data/out00254.jpg
deleted file mode 100644
index 963f64f..0000000
Binary files a/data/out00254.jpg and /dev/null differ
diff --git a/data/out00255.jpg b/data/out00255.jpg
deleted file mode 100644
index 197c0c1..0000000
Binary files a/data/out00255.jpg and /dev/null differ
diff --git a/data/out00256.jpg b/data/out00256.jpg
deleted file mode 100644
index 9cd0e67..0000000
Binary files a/data/out00256.jpg and /dev/null differ
diff --git a/data/out00257.jpg b/data/out00257.jpg
deleted file mode 100644
index 4c50d30..0000000
Binary files a/data/out00257.jpg and /dev/null differ
diff --git a/data/out00258.jpg b/data/out00258.jpg
deleted file mode 100644
index 8c96a72..0000000
Binary files a/data/out00258.jpg and /dev/null differ
diff --git a/data/out00259.jpg b/data/out00259.jpg
deleted file mode 100644
index 87c2f84..0000000
Binary files a/data/out00259.jpg and /dev/null differ
diff --git a/data/out00260.jpg b/data/out00260.jpg
deleted file mode 100644
index 4c182bb..0000000
Binary files a/data/out00260.jpg and /dev/null differ
diff --git a/data/out00261.jpg b/data/out00261.jpg
deleted file mode 100644
index 3b7df7a..0000000
Binary files a/data/out00261.jpg and /dev/null differ
diff --git a/data/out00262.jpg b/data/out00262.jpg
deleted file mode 100644
index 6ddac10..0000000
Binary files a/data/out00262.jpg and /dev/null differ
diff --git a/data/out00263.jpg b/data/out00263.jpg
deleted file mode 100644
index 73d302a..0000000
Binary files a/data/out00263.jpg and /dev/null differ
diff --git a/data/out00264.jpg b/data/out00264.jpg
deleted file mode 100644
index e4057d4..0000000
Binary files a/data/out00264.jpg and /dev/null differ
diff --git a/data/out00265.jpg b/data/out00265.jpg
deleted file mode 100644
index 26a0fd9..0000000
Binary files a/data/out00265.jpg and /dev/null differ
diff --git a/data/out00266.jpg b/data/out00266.jpg
deleted file mode 100644
index 11f117d..0000000
Binary files a/data/out00266.jpg and /dev/null differ
diff --git a/data/out00267.jpg b/data/out00267.jpg
deleted file mode 100644
index 560d769..0000000
Binary files a/data/out00267.jpg and /dev/null differ
diff --git a/data/out00268.jpg b/data/out00268.jpg
deleted file mode 100644
index 898770c..0000000
Binary files a/data/out00268.jpg and /dev/null differ
diff --git a/data/out00269.jpg b/data/out00269.jpg
deleted file mode 100644
index 31e8367..0000000
Binary files a/data/out00269.jpg and /dev/null differ
diff --git a/data/out00270.jpg b/data/out00270.jpg
deleted file mode 100644
index e87b21f..0000000
Binary files a/data/out00270.jpg and /dev/null differ
diff --git a/data/out00271.jpg b/data/out00271.jpg
deleted file mode 100644
index 2f69d53..0000000
Binary files a/data/out00271.jpg and /dev/null differ
diff --git a/data/out00272.jpg b/data/out00272.jpg
deleted file mode 100644
index d70f02b..0000000
Binary files a/data/out00272.jpg and /dev/null differ
diff --git a/data/out00273.jpg b/data/out00273.jpg
deleted file mode 100644
index a8a5a64..0000000
Binary files a/data/out00273.jpg and /dev/null differ
diff --git a/data/out00274.jpg b/data/out00274.jpg
deleted file mode 100644
index 9703abd..0000000
Binary files a/data/out00274.jpg and /dev/null differ
diff --git a/data/out00275.jpg b/data/out00275.jpg
deleted file mode 100644
index d477b04..0000000
Binary files a/data/out00275.jpg and /dev/null differ
diff --git a/data/out00276.jpg b/data/out00276.jpg
deleted file mode 100644
index 345e657..0000000
Binary files a/data/out00276.jpg and /dev/null differ
diff --git a/data/out00277.jpg b/data/out00277.jpg
deleted file mode 100644
index 969e333..0000000
Binary files a/data/out00277.jpg and /dev/null differ
diff --git a/data/out00278.jpg b/data/out00278.jpg
deleted file mode 100644
index 9f69935..0000000
Binary files a/data/out00278.jpg and /dev/null differ
diff --git a/data/out00279.jpg b/data/out00279.jpg
deleted file mode 100644
index 29a6ecc..0000000
Binary files a/data/out00279.jpg and /dev/null differ
diff --git a/data/out00280.jpg b/data/out00280.jpg
deleted file mode 100644
index 7dd78b1..0000000
Binary files a/data/out00280.jpg and /dev/null differ
diff --git a/data/out00281.jpg b/data/out00281.jpg
deleted file mode 100644
index dfe65ee..0000000
Binary files a/data/out00281.jpg and /dev/null differ
diff --git a/data/out00282.jpg b/data/out00282.jpg
deleted file mode 100644
index d663fa0..0000000
Binary files a/data/out00282.jpg and /dev/null differ
diff --git a/data/out00283.jpg b/data/out00283.jpg
deleted file mode 100644
index 566abba..0000000
Binary files a/data/out00283.jpg and /dev/null differ
diff --git a/data/out00284.jpg b/data/out00284.jpg
deleted file mode 100644
index 4e9f026..0000000
Binary files a/data/out00284.jpg and /dev/null differ
diff --git a/data/out00285.jpg b/data/out00285.jpg
deleted file mode 100644
index 4b82e6a..0000000
Binary files a/data/out00285.jpg and /dev/null differ
diff --git a/data/out00286.jpg b/data/out00286.jpg
deleted file mode 100644
index 9383f1c..0000000
Binary files a/data/out00286.jpg and /dev/null differ
diff --git a/data/out00287.jpg b/data/out00287.jpg
deleted file mode 100644
index cd86db7..0000000
Binary files a/data/out00287.jpg and /dev/null differ
diff --git a/data/out00288.jpg b/data/out00288.jpg
deleted file mode 100644
index da533b8..0000000
Binary files a/data/out00288.jpg and /dev/null differ
diff --git a/data/out00289.jpg b/data/out00289.jpg
deleted file mode 100644
index 75b8079..0000000
Binary files a/data/out00289.jpg and /dev/null differ
diff --git a/data/out00290.jpg b/data/out00290.jpg
deleted file mode 100644
index 6d6157b..0000000
Binary files a/data/out00290.jpg and /dev/null differ
diff --git a/data/out00291.jpg b/data/out00291.jpg
deleted file mode 100644
index 52b2fe0..0000000
Binary files a/data/out00291.jpg and /dev/null differ
diff --git a/data/out00292.jpg b/data/out00292.jpg
deleted file mode 100644
index cb8da3a..0000000
Binary files a/data/out00292.jpg and /dev/null differ
diff --git a/data/out00293.jpg b/data/out00293.jpg
deleted file mode 100644
index 8ad5c60..0000000
Binary files a/data/out00293.jpg and /dev/null differ
diff --git a/data/out00294.jpg b/data/out00294.jpg
deleted file mode 100644
index fbb4721..0000000
Binary files a/data/out00294.jpg and /dev/null differ
diff --git a/data/out00295.jpg b/data/out00295.jpg
deleted file mode 100644
index 2ffaeed..0000000
Binary files a/data/out00295.jpg and /dev/null differ
diff --git a/data/out00296.jpg b/data/out00296.jpg
deleted file mode 100644
index 3bd9b83..0000000
Binary files a/data/out00296.jpg and /dev/null differ
diff --git a/data/out00297.jpg b/data/out00297.jpg
deleted file mode 100644
index 22613a2..0000000
Binary files a/data/out00297.jpg and /dev/null differ
diff --git a/data/out00298.jpg b/data/out00298.jpg
deleted file mode 100644
index 043f1e4..0000000
Binary files a/data/out00298.jpg and /dev/null differ
diff --git a/data/out00299.jpg b/data/out00299.jpg
deleted file mode 100644
index e023c27..0000000
Binary files a/data/out00299.jpg and /dev/null differ
diff --git a/lib/RDV GY-512 Library/RDV_GY512.cpp b/lib/RDV GY-512 Library/RDV_GY512.cpp
new file mode 100644
index 0000000..535f683
--- /dev/null
+++ b/lib/RDV GY-512 Library/RDV_GY512.cpp
@@ -0,0 +1,151 @@
+#include "RDV_GY512.h"
+#include "Wire.h"
+
+#define DVC_ADDR 0x68
+#define PWR_ADDR 0x6B
+
+#define ACCEL_SENS 16384
+#define GYRO_SENS 131
+#define GRAVITY_CONSTANT 9.81
+#define RETURN_SIZE 2
+
+
+#define X_ACCEL_ADDR 0x3B
+#define Y_ACCEL_ADDR 0x3D
+#define Z_ACCEL_ADDR 0x3F
+
+#define X_GYRO_ADDR 0x43
+#define Y_GYRO_ADDR 0x45
+#define Z_GYRO_ADDR 0x47
+
+#define TEMP_ADDR 0x41
+
+char tmp_str[7];
+
+GY_512::GY_512(){}
+
+void GY_512::sensor_init(){
+ Wire1.begin();
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(PWR_ADDR);
+ Wire1.write(0);
+ Wire1.endTransmission(true);
+}
+
+int16_t GY_512::get_raw_accel_x(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(X_ACCEL_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return (Wire1.read() << 8 | Wire1.read());
+}
+
+int16_t GY_512::get_raw_accel_y(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(Y_ACCEL_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return (Wire1.read() << 8 | Wire1.read());
+}
+
+int16_t GY_512::get_raw_accel_z(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(Z_ACCEL_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return (Wire1.read() << 8 | Wire1.read());
+}
+
+int16_t GY_512::get_raw_gyro_x(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(X_GYRO_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return (Wire1.read() << 8 | Wire1.read());
+}
+
+int16_t GY_512::get_raw_gyro_y(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(Y_GYRO_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return (Wire1.read() << 8 | Wire1.read());
+}
+
+int16_t GY_512::get_raw_gyro_z(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(Z_GYRO_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return (Wire1.read() << 8 | Wire1.read());
+}
+
+double GY_512::get_accel_x(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(X_ACCEL_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return double(int16_t(Wire1.read() << 8 | Wire1.read()) * GRAVITY_CONSTANT/ ACCEL_SENS);
+}
+
+double GY_512::get_accel_y(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(Y_ACCEL_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return double(int16_t(Wire1.read() << 8 | Wire1.read()) * GRAVITY_CONSTANT/ ACCEL_SENS);
+}
+
+double GY_512::get_accel_z(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(Z_ACCEL_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return double(int16_t(Wire1.read() << 8 | Wire1.read()) * GRAVITY_CONSTANT/ ACCEL_SENS);
+}
+
+double GY_512::get_gyro_x(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(X_GYRO_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return double(int16_t(Wire1.read() << 8 | Wire1.read()) / GYRO_SENS);
+}
+
+double GY_512::get_gyro_y(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(Y_GYRO_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return double(int16_t(Wire1.read() << 8 | Wire1.read()) / GYRO_SENS);
+}
+
+double GY_512::get_gyro_z(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(Z_GYRO_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ return double(int16_t(Wire1.read() << 8 | Wire1.read()) / GYRO_SENS);
+}
+
+double GY_512::get_temperature(){
+ Wire1.beginTransmission(DVC_ADDR);
+ Wire1.write(TEMP_ADDR);
+ Wire1.endTransmission(false);
+
+ Wire1.requestFrom(DVC_ADDR, RETURN_SIZE, true);
+ int16_t temp_out = Wire1.read() << 8 | Wire1.read();
+ return ((temp_out/340) + 36.53);
+}
diff --git a/lib/RDV GY-512 Library/RDV_GY512.h b/lib/RDV GY-512 Library/RDV_GY512.h
new file mode 100644
index 0000000..9bfa559
--- /dev/null
+++ b/lib/RDV GY-512 Library/RDV_GY512.h
@@ -0,0 +1,31 @@
+#ifndef RDV_GY512_H
+#define RDC_GY512_H
+
+#include "Arduino.h"
+
+class GY_512{
+ public:
+ GY_512();
+
+ void sensor_init();
+
+ int16_t get_raw_accel_x();
+ int16_t get_raw_accel_y();
+ int16_t get_raw_accel_z();
+
+ int16_t get_raw_gyro_x();
+ int16_t get_raw_gyro_y();
+ int16_t get_raw_gyro_z();
+
+ double get_accel_x();
+ double get_accel_y();
+ double get_accel_z();
+
+ double get_gyro_x();
+ double get_gyro_y();
+ double get_gyro_z();
+
+ double get_temperature();
+};
+
+#endif
diff --git a/lib/RDV GY-512 Library/README.md b/lib/RDV GY-512 Library/README.md
new file mode 100644
index 0000000..43e8af7
--- /dev/null
+++ b/lib/RDV GY-512 Library/README.md
@@ -0,0 +1,35 @@
+# rdv-gy512 Library
+
+An Arduino library to simplify reading values from the GY-512 gyroscope, accelerometer, and temperature sensor. Shortens code and makes it much more readable. Get raw sensor values or processed data in SI units (m/s^2, degrees, celsius) with simple to use functions!
+
+## Available Functions
+Here are the available functions and their purposes.
+
+- **sensor_init()**
+ Initializes device for communication. Absolutely crucial to initialize the device in the void setup() function.
+- **get_raw_accel_x()**
+ Returns acceleration value in the x-axis as measured by the sensor.
+- **get_raw_accel_y()**
+ Returns acceleration value in the y-axis as measured by the sensor.
+- **get_raw_accel_z()**
+ Returns acceleration value in the z-axis as measured by the sensor.
+- **get_accel_x()**
+ Returns acceleration in the x-axis in m/s^2.
+- **get_accel_y()**
+ Returns acceleration in the y-axis in m/s^2.
+- **get_accel_z()**
+ Returns acceleration in the z-axis in m/s^2.
+- **get_raw_gyro_x()**
+ Returns value of rotation in the x-axis as measured by the sensor.
+- **get_raw_gyro_y()**
+ Returns value of rotation in the y-axis as measured by the sensor.
+- **get_raw_gyro_z()**
+ Returns value of rotation in the z-axis as measured by the sensor.
+- **get_gyro_x()**
+ Returns angle of rotation in the x-axis in degrees.
+- **get_gyro_y()**
+ Returns angle of rotation in the y-axis in degrees.
+- **get_gyro_z()**
+ Returns angle of rotation in the z-axis in degrees.
+- **get_temperature()**
+ Returns temperature at the sensor in degrees celsius.
diff --git a/lib/RDV GY-512 Library/examples/acceleration_in_different_axis/acceleration_in_different_axis.ino b/lib/RDV GY-512 Library/examples/acceleration_in_different_axis/acceleration_in_different_axis.ino
new file mode 100644
index 0000000..6629dc1
--- /dev/null
+++ b/lib/RDV GY-512 Library/examples/acceleration_in_different_axis/acceleration_in_different_axis.ino
@@ -0,0 +1,14 @@
+#include
+
+GY_512 device = GY_512();
+
+void setup() {
+ Serial.begin(9600);
+ device.sensor_init(); // initializes device for communication
+}
+
+void loop() {
+ Serial.println(device.get_accel_x()); // prints acceleration in the x-axis in m/s^2
+ Serial.println(device.get_accel_y()); // prints acceleration in the y-axis in m/s^2
+ Serial.println(device.get_accel_z()); // prints acceleration in the z-axis in m/s^2
+}
diff --git a/lib/RDV GY-512 Library/examples/read_raw_sensor_data/read_raw_sensor_data.ino b/lib/RDV GY-512 Library/examples/read_raw_sensor_data/read_raw_sensor_data.ino
new file mode 100644
index 0000000..2870df7
--- /dev/null
+++ b/lib/RDV GY-512 Library/examples/read_raw_sensor_data/read_raw_sensor_data.ino
@@ -0,0 +1,18 @@
+#include
+
+GY_512 device = GY_512();
+
+void setup() {
+ Serial.begin(9600);
+ device.sensor_init(); // initializes device for communication
+}
+
+void loop() {
+ Serial.println(device.get_raw_accel_x()); // prints acceleration value in the x-axis as measured by the sensor
+ Serial.println(device.get_raw_accel_y()); // prints acceleration value in the y-axis as measured by the sensor
+ Serial.println(device.get_raw_accel_z()); // prints acceleration value in the z-axis as measured by the sensor
+
+ Serial.println(device.get_raw_gyro_x()); // prints value of rotation in the x-axis as measured by the sensor
+ Serial.println(device.get_raw_gyro_y()); // prints value of rotation in the y-axis as measured by the sensor
+ Serial.println(device.get_raw_gyro_z()); // prints value of rotation in the z-axis as measured by the sensor
+}
diff --git a/lib/RDV GY-512 Library/examples/read_temperature/read_temperature.ino b/lib/RDV GY-512 Library/examples/read_temperature/read_temperature.ino
new file mode 100644
index 0000000..cb92349
--- /dev/null
+++ b/lib/RDV GY-512 Library/examples/read_temperature/read_temperature.ino
@@ -0,0 +1,12 @@
+#include
+
+GY_512 device = GY_512();
+
+void setup() {
+ Serial.begin(9600);
+ device.sensor_init(); // initializes device for communication
+}
+
+void loop() {
+ Serial.println(device.get_temperature()); // prints temperature at the sensor in degrees celsius
+}
diff --git a/lib/RDV GY-512 Library/examples/roation_in_different_axis/roation_in_different_axis.ino b/lib/RDV GY-512 Library/examples/roation_in_different_axis/roation_in_different_axis.ino
new file mode 100644
index 0000000..f48ae18
--- /dev/null
+++ b/lib/RDV GY-512 Library/examples/roation_in_different_axis/roation_in_different_axis.ino
@@ -0,0 +1,14 @@
+#include
+
+GY_512 device = GY_512();
+
+void setup() {
+ Serial.begin(9600);
+ device.sensor_init(); // initializes device for communication
+}
+
+void loop() {
+ Serial.println(device.get_gyro_x()); // prints angle of rotation in the x-axis in degrees
+ Serial.println(device.get_gyro_y()); // prints angle of rotation in the y-axis in degrees
+ Serial.println(device.get_gyro_z()); // prints angle of rotation in the z-axis in degrees
+}
diff --git a/lib/RDV GY-512 Library/library.properties b/lib/RDV GY-512 Library/library.properties
new file mode 100644
index 0000000..db8d57f
--- /dev/null
+++ b/lib/RDV GY-512 Library/library.properties
@@ -0,0 +1,10 @@
+name=RDV GY-512 Library
+version=1.0
+author=Gagan Singh
+maintainer=Gagan Singh
+sentence=An Arduino library to simplify reading values from the GY-512 gyroscope, accelerometer, and temperature sensor.
+paragraph=Shortens code and makes it much more readable. Get raw sensor values or processed data in SI units (m/s^2, degrees, celsius) with simple to use functions!
+category=Sensors
+url=https://github.com/TheSpaceDragon/rdv-gy512
+architectures=*
+includes=RDV_GY512.h
diff --git a/platformio.ini b/platformio.ini
index 94a8980..4dfbae0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,5 +19,9 @@ debug_build_flags =
lib_deps =
moononournation/GFX Library for Arduino@^1.3.8
bitbank2/JPEGDEC@^1.2.8
+ olikraus/U8g2@^2.35.7
+ khoih-prog/RPI_PICO_TimerInterrupt@^1.3.1
+ adafruit/Adafruit LIS2MDL@^2.1.7
+ adafruit/Adafruit MMC56x3@^1.0.1
platform_packages =
toolchain-gccarmnoneeabi@1.100301.220327
diff --git a/src/main.cpp b/src/main.cpp
index cee7677..cbe635a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,12 +13,154 @@ extern "C" {
#include "hsv2rgb.h"
#include "sin1.h"
}
+#include
+#include
+Adafruit_MMC5603 mag = Adafruit_MMC5603(12345);
+
+float MagMinX, MagMaxX;
+float MagMinY, MagMaxY;
+float MagMinZ, MagMaxZ;
+
+long lastDisplayTime;
+
+#include
+GY_512 gy512 = GY_512();
+
+int16_t accel_x, accel_y;
+int16_t gyro_x, gyro_y;
+// Decay factor
+const float decay = 0.7;
+const float decay_mag = 0.2;
+int16_t raw_accel_x, raw_accel_y;
+int16_t raw_gyro_x, raw_gyro_y;
+
+
+#define TIMER_INTERRUPT_DEBUG 1
+#define _TIMERINTERRUPT_LOGLEVEL_ 4
+
+#define OLD_ADDRESS 0x30
+#define NEW_ADDRESS 0x42
+
+
+// Can be included as many times as necessary, without `Multiple Definitions` Linker Error
+#include "RPi_Pico_TimerInterrupt.h"
+
+#ifndef LED_BUILTIN
+ #define LED_BUILTIN 25
+#endif
+
+#define PIN_D1 1 // Pin D1 mapped to pin GPIO1 of RPI_PICO
+bool TimerHandler0(struct repeating_timer *t)
+{
+ // Flash the LED on and off to prove timers are working
+ (void) t;
+
+ static bool toggle0 = false;
+ /* #if (TIMER_INTERRUPT_DEBUG > 0)
+ Serial.print("ITimer0: millis() = "); Serial.println(millis());
+ #endif */
+
+ //timer interrupt toggles pin LED_BUILTIN
+ digitalWrite(LED_BUILTIN, toggle0);
+ toggle0 = !toggle0;
+
+ return true;
+}
+
+bool TimerHandler1(struct repeating_timer *t)
+{
+ // Flash the LED on and off to prove timers are working
+
+ (void) t;
+
+ static bool toggle1 = false;
+
+ /* #if (TIMER_INTERRUPT_DEBUG > 0)
+ Serial.print("ITimer1: millis() = "); Serial.println(millis());
+ #endif */
+
+ //timer interrupt toggles outputPin
+ digitalWrite(PIN_D1, toggle1);
+ toggle1 = !toggle1;
+
+ return true;
+}
+bool TimerHandler2(struct repeating_timer *t)
+{
+ // Check the gyro/accel sensor in the background
+
+ (void) t;
+ // #if (TIMER_INTERRUPT_DEBUG > 0)
+ // Serial.print("ITimer2: millis() = "); Serial.println(millis());
+ // #endif
+ // Get the current acceleration values
+ raw_accel_x = gy512.get_raw_accel_x();
+ raw_accel_y = gy512.get_raw_accel_y();
+
+ // Normalize the acceleration values over 100ms
+ accel_x = (accel_x * decay) + ((1.0 - decay) * (raw_accel_x / 100.0));
+ accel_y = (accel_y * decay) + ((1.0 - decay) * (raw_accel_y / 100.0));
+
+ raw_gyro_x = gy512.get_raw_gyro_x();
+ raw_gyro_y = gy512.get_raw_gyro_y();
+
+ // Normalize the change in values values over 100ms
+ gyro_x = (gyro_x * decay) + ((1.0 - decay) * (raw_gyro_x / 100.0));
+ gyro_y = (gyro_y * decay) + ((1.0 - decay) * (raw_gyro_y / 100.0));
+ //Serial.printf("- ax: %i; ay: %i; az: %i\r\n", gy512.get_raw_accel_x(), gy512.get_raw_accel_y(), gy512.get_raw_accel_z());
+ //Serial.printf("- gx: %i; gy: %i; gz: %i\r\n\r\n", gy512.get_raw_gyro_x(), gy512.get_raw_gyro_y(), gy512.get_raw_gyro_z());
+ return true;
+}
+
+float heading;
+float raw_heading;
+float Pi = 3.14159;
+
+bool TimerHandler3(struct repeating_timer *t)
+{
+ // Get the magnetoscope sensor information in the background
+ sensors_event_t event;
+ mag.getEvent(&event);
+
+ /*/ Display the results (magnetic vector values are in micro-Tesla (uT))
+ Serial.print("X: ");
+ Serial.print(event.magnetic.x);
+ Serial.print(" ");
+ Serial.print("Y: ");
+ Serial.print(event.magnetic.y);
+ Serial.print(" ");
+ Serial.print("Z: ");
+ Serial.print(event.magnetic.z);
+ Serial.print(" ");
+ Serial.println("uT");*/
+
+ // Calculate the angle of the vector y,x
+ raw_heading = (atan2(event.magnetic.y,event.magnetic.z) * 180) / Pi;
+
+ // Normalize to 0-360
+ if (raw_heading < 0)
+ {
+ raw_heading = 360 + raw_heading;
+ }
+ heading = (raw_heading * decay_mag) + ((1.0 - decay_mag) * (raw_heading / 100.0)) - 70;
+
+ Serial.print("Compass Heading: ");
+ Serial.println(heading);
+ return true;
+}
+
+#define TIMER0_INTERVAL_MS 1000
+
+#define TIMER1_INTERVAL_MS 5000
+
+RPI_PICO_Timer ITimer0(0);
+RPI_PICO_Timer ITimer1(1);
+RPI_PICO_Timer ITimer2(2);
+RPI_PICO_Timer ITimer3(3);
const char name[] = "Your Name";
-
-
#define SPI0_SCK 2
#define SPI0_MISO GFX_NOT_DEFINED
#define SPI0_MOSI 3
@@ -248,6 +390,10 @@ void setup()
delay(50);
+ Wire.beginTransmission(OLD_ADDRESS);
+ Wire.write(NEW_ADDRESS);
+ Wire.endTransmission();
+
bus->begin(90000000);
if (!disp->begin()) {
@@ -264,77 +410,101 @@ void setup()
// filesystem begin
LittleFS.begin();
+ pinMode(LED_BUILTIN, OUTPUT);
+ pinMode(PIN_D1, OUTPUT);
+
+
+ Serial.print(F("\nStarting Argument_None on ")); Serial.println(BOARD_NAME);
+ Serial.println(RPI_PICO_TIMER_INTERRUPT_VERSION);
+ Serial.print(F("CPU Frequency = ")); Serial.print(F_CPU / 1000000); Serial.println(F(" MHz"));
+
+ // Interval in microsecs
+ if (ITimer0.attachInterruptInterval(TIMER0_INTERVAL_MS * 1000, TimerHandler0))
+ {
+ Serial.print(F("Starting ITimer0 OK, millis() = ")); Serial.println(millis());
+ }
+ else
+ {
+ Serial.println(F("Can't set ITimer0. Select another Timer, freq. or timer"));
+ }
+
+
+ // Interval in microsecs
+ if (ITimer1.attachInterruptInterval(TIMER1_INTERVAL_MS * 1000, TimerHandler1))
+ {
+ Serial.print(F("Starting ITimer1 OK, millis() = ")); Serial.println(millis());
+ }
+ else
+ {
+ Serial.println(F("Can't set ITimer1. Select another Timer, freq. or timer"));
+ }
+ // Interval in microsecs
+ if (ITimer2.attachInterruptInterval(TIMER1_INTERVAL_MS * 10, TimerHandler2))
+ {
+ Serial.print(F("Starting ITimer2 GyroAccelTemp OK, millis() = ")); Serial.println(millis());
+ }
+ else
+ {
+ Serial.println(F("Can't set ITimer2 GyroAccelTemp. Select another Timer, freq. or timer"));
+ }
+ // Interval in microsecs
+ if (ITimer3.attachInterruptInterval(TIMER1_INTERVAL_MS * 100, TimerHandler3))
+ {
+ Serial.print(F("Starting ITimer3 Mag OK, millis() = ")); Serial.println(millis());
+ }
+ else
+ {
+ Serial.println(F("Can't set ITimer2 GyroAccelTemp. Select another Timer, freq. or timer"));
+ }
+ Serial.println("Adafruit_MMC5603 Magnetometer Calibration");
+ Serial.println("");
+
+ /* Initialise the sensor */
+ if (!mag.begin(MMC56X3_DEFAULT_ADDRESS, &Wire1)) { // I2C mode
+ /* There was a problem detecting the MMC5603 ... check your connections */
+ Serial.println("Ooops, no MMC5603 detected ... Check your wiring!");
+ }
+
+ /* Display some basic information on this sensor */
+ mag.printSensorDetails();
+
+ mag.setDataRate(10); // in Hz, from 1-255 or 1000
+ mag.setContinuousMode(true);
+
+ lastDisplayTime = millis();
+ MagMinX = MagMaxX = MagMinY = MagMaxY = MagMinZ = MagMaxZ = 0;
}
void loop()
{
uint16_t hue;
-
- /*
- // rainbow circles program
- bg_rainbow_circles(200);
- // texthue_180degree();
- rgb.r = rgb.g = rgb.b = 0;
-
- // small hue shift with larger saturation shifts circles
- // bg_huesatcycle_circles();
- // texthue_huesatcycle();
-
- // text rotation
- rot += 420 - 69;
-
- int16_t x, y;
- int16_t d;
- d = rot;
- for (uint8_t i = 0; i < strlen(name); i++) {
- x = cos1(d);
- x = (x >> 9) + (x >> 11) + (x >> 12);
-
- y = sin1(d); // sin1(d) * 21) / 32;
- y = (y >> 9) + (y >> 11) + (y >> 12);
-
- rotate_letter(i, d + 0x6000, x, y, dout->color565(rgb.r, rgb.g, rgb.b));
- // d -= 9; // for 7-bit version
- d -= LETTER_SPACING; // for 15-bit version
- }
- */
-
- /* cop mode
- while (true) {
- uint8_t i, j, k;
-
- for (i = 0; i < 16; i++) {
- // flashing
- dout->fillScreen(i & 1 ? RED : BLUE);
- dout->flush();
- delay(200);
- }
- for (i = 0; i < 12; i++) {
- for (j = 0; j < 8; j++) {
- dout->fillScreen(j & 1 ? RED : BLACK);
- dout->flush();
- delay(20);
- }
- for (j = 0; j < 8; j++) {
- dout->fillScreen(j & 1 ? BLUE : BLACK);
- dout->flush();
- delay(20);
- }
- }
- }
- */
-
+ Serial.println("wire pins");
+ Wire1.setSDA(26);
+ Wire1.setSCL(27);
+
+ Serial.println("after wire pins");
+ Serial.println("before init");
+ gy512.sensor_init(); // initializes device for communication
+ Serial.println("after init");
char fn[20];
+
+
while (true) {
- for (int i = 0; i <= 299; i++) {
+ for (int i = 0; i <= 99; i++) {
sprintf(fn, "out00%03i.jpg", i);
- Serial.println(fn);
+ //Serial.println(fn);
+
+ dout->fillScreen(BLACK);
jpegDraw(fn, jpeg_draw_cb, true /* useBigEndian */,
- 0 /* x */, 0 /* y */, dout->width() /* widthLimit */, dout->height() /* heightLimit */);
+ accel_x + heading * 2 /* x */, accel_y + heading * 2/* y */, dout->width() /* widthLimit */, dout->height() /* heightLimit */);
dout->flush();
+ /* Get a new sensor event */
+
+
}
}
dout->flush();
+
}
\ No newline at end of file