diff --git a/.gitattributes b/.gitattributes new file mode 100755 index 0000000..fcadb2c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text eol=lf diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 24bc5d4..4c7111b --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,4 @@ __pycache__ watchfaces/libraries watchfaces/pokemon-2.0/pokemon-src !watchfaces/*/preview.bmp -watchy-image-editor watchysim \ No newline at end of file diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/docs/img/piece0_0.png b/docs/img/piece0_0.png old mode 100644 new mode 100755 diff --git a/docs/img/piece0_1.png b/docs/img/piece0_1.png old mode 100644 new mode 100755 diff --git a/docs/img/piece1_0.png b/docs/img/piece1_0.png old mode 100644 new mode 100755 diff --git a/docs/img/piece1_1.png b/docs/img/piece1_1.png old mode 100644 new mode 100755 diff --git a/docs/img/piece2_0.png b/docs/img/piece2_0.png old mode 100644 new mode 100755 diff --git a/docs/img/piece2_1.png b/docs/img/piece2_1.png old mode 100644 new mode 100755 diff --git a/docs/img/piece2_2.png b/docs/img/piece2_2.png old mode 100644 new mode 100755 diff --git a/docs/img/piece2_3.png b/docs/img/piece2_3.png old mode 100644 new mode 100755 diff --git a/docs/img/piece3_0.png b/docs/img/piece3_0.png old mode 100644 new mode 100755 diff --git a/docs/img/piece3_1.png b/docs/img/piece3_1.png old mode 100644 new mode 100755 diff --git a/docs/img/piece3_2.png b/docs/img/piece3_2.png old mode 100644 new mode 100755 diff --git a/docs/img/piece3_3.png b/docs/img/piece3_3.png old mode 100644 new mode 100755 diff --git a/docs/img/piece4_0.png b/docs/img/piece4_0.png old mode 100644 new mode 100755 diff --git a/docs/img/piece4_1.png b/docs/img/piece4_1.png old mode 100644 new mode 100755 diff --git a/docs/img/piece5_0.png b/docs/img/piece5_0.png old mode 100644 new mode 100755 diff --git a/docs/img/piece6_0.png b/docs/img/piece6_0.png old mode 100644 new mode 100755 diff --git a/docs/img/piece6_1.png b/docs/img/piece6_1.png old mode 100644 new mode 100755 diff --git a/docs/img/piece6_2.png b/docs/img/piece6_2.png old mode 100644 new mode 100755 diff --git a/docs/img/piece6_3.png b/docs/img/piece6_3.png old mode 100644 new mode 100755 diff --git a/docs/index.html b/docs/index.html old mode 100644 new mode 100755 diff --git a/docs/lib/vue.min.js b/docs/lib/vue.min.js old mode 100644 new mode 100755 diff --git a/docs/main.js b/docs/main.js old mode 100644 new mode 100755 diff --git a/docs/style.css b/docs/style.css old mode 100644 new mode 100755 diff --git a/watchfaces/below/README.md b/watchfaces/below/README.md old mode 100644 new mode 100755 diff --git a/watchfaces/below/Watchy_Below.cpp b/watchfaces/below/Watchy_Below.cpp old mode 100644 new mode 100755 diff --git a/watchfaces/below/Watchy_Below.h b/watchfaces/below/Watchy_Below.h old mode 100644 new mode 100755 diff --git a/watchfaces/below/below.h b/watchfaces/below/below.h old mode 100644 new mode 100755 diff --git a/watchfaces/below/below.ino b/watchfaces/below/below.ino old mode 100644 new mode 100755 diff --git a/watchfaces/below/preview.bmp b/watchfaces/below/preview.bmp old mode 100644 new mode 100755 diff --git a/watchfaces/below/preview.png b/watchfaces/below/preview.png old mode 100644 new mode 100755 diff --git a/watchfaces/below/settings.h b/watchfaces/below/settings.h old mode 100644 new mode 100755 diff --git a/watchfaces/below/wta.cpp b/watchfaces/below/wta.cpp old mode 100644 new mode 100755 diff --git a/watchfaces/below/wta.h b/watchfaces/below/wta.h old mode 100644 new mode 100755 diff --git a/watchfaces/pokemon-2.0/FreeMonoBold10pt7b.h b/watchfaces/pokemon-2.0/FreeMonoBold10pt7b.h old mode 100644 new mode 100755 diff --git a/watchfaces/pokemon-2.0/FreeMonoBold7pt7b.h b/watchfaces/pokemon-2.0/FreeMonoBold7pt7b.h old mode 100644 new mode 100755 diff --git a/watchfaces/pokemon-2.0/README.md b/watchfaces/pokemon-2.0/README.md old mode 100644 new mode 100755 diff --git a/watchfaces/pokemon-2.0/Watchy_Pokemon.cpp b/watchfaces/pokemon-2.0/Watchy_Pokemon.cpp old mode 100644 new mode 100755 diff --git a/watchfaces/pokemon-2.0/Watchy_Pokemon.h b/watchfaces/pokemon-2.0/Watchy_Pokemon.h old mode 100644 new mode 100755 index 4f9476c..ebf976b --- a/watchfaces/pokemon-2.0/Watchy_Pokemon.h +++ b/watchfaces/pokemon-2.0/Watchy_Pokemon.h @@ -1,11 +1,11 @@ #ifndef WATCHY_POKEMON_H #define WATCHY_POKEMON_H -//#define SIM -#define FR +#define SIM +//#define FR #ifdef SIM -#include "../../Watchy.h" +#include "..\..\Watchy.h" #else #include #include "wta.h" @@ -26,14 +26,14 @@ class WatchyPokemon : public Watchy class WatchyPokemon : public WatchySynced #endif { - #ifndef SIM +#ifndef SIM using WatchySynced::WatchySynced; - #endif - public: - void drawWatchFace(); - double randomDay(uint32_t d); - double randomHour(uint32_t d); - double randomMinute(uint32_t d); +#endif +public: + void drawWatchFace(); + double randomDay(uint32_t d); + double randomHour(uint32_t d); + double randomMinute(uint32_t d); }; #endif diff --git a/watchfaces/pokemon-2.0/images.py b/watchfaces/pokemon-2.0/images.py old mode 100644 new mode 100755 diff --git a/watchfaces/pokemon-2.0/preview.bmp b/watchfaces/pokemon-2.0/preview.bmp old mode 100644 new mode 100755 diff --git a/watchfaces/pokemon-2.0/settings.h b/watchfaces/pokemon-2.0/settings.h old mode 100644 new mode 100755 diff --git a/watchfaces/pokemon-2.0/wta.cpp b/watchfaces/pokemon-2.0/wta.cpp old mode 100644 new mode 100755 diff --git a/watchfaces/pokemon-2.0/wta.h b/watchfaces/pokemon-2.0/wta.h old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/README.md b/watchfaces/tetris-2.0/README.md old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/Watchy_Tetris.cpp b/watchfaces/tetris-2.0/Watchy_Tetris.cpp old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/Watchy_Tetris.h b/watchfaces/tetris-2.0/Watchy_Tetris.h old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/all pieces.png b/watchfaces/tetris-2.0/all pieces.png old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/preview-full.png b/watchfaces/tetris-2.0/preview-full.png old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/preview.bmp b/watchfaces/tetris-2.0/preview.bmp old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/reference.png b/watchfaces/tetris-2.0/reference.png old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/settings.h b/watchfaces/tetris-2.0/settings.h old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/tetris-2.0.ino b/watchfaces/tetris-2.0/tetris-2.0.ino old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/tetris.h b/watchfaces/tetris-2.0/tetris.h old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/wta.cpp b/watchfaces/tetris-2.0/wta.cpp old mode 100644 new mode 100755 diff --git a/watchfaces/tetris-2.0/wta.h b/watchfaces/tetris-2.0/wta.h old mode 100644 new mode 100755 diff --git a/watchy-image-editor/__init__.py b/watchy-image-editor/__init__.py old mode 100644 new mode 100755 diff --git a/watchy-image-editor/app.py b/watchy-image-editor/app.py old mode 100644 new mode 100755 diff --git a/watchy-image-editor/bitmap.py b/watchy-image-editor/bitmap.py old mode 100644 new mode 100755 diff --git a/watchy-image-editor/explorer.py b/watchy-image-editor/explorer.py old mode 100644 new mode 100755 diff --git a/watchy-image-editor/file.py b/watchy-image-editor/file.py old mode 100644 new mode 100755 diff --git a/watchy-image-editor/image.py b/watchy-image-editor/image.py old mode 100644 new mode 100755 diff --git a/watchy-image-editor/image_view.py b/watchy-image-editor/image_view.py old mode 100644 new mode 100755 diff --git a/watchy-image-editor/input_popup.py b/watchy-image-editor/input_popup.py old mode 100644 new mode 100755 diff --git a/watchy-image-editor/main.py b/watchy-image-editor/main.py old mode 100644 new mode 100755 diff --git a/watchy-image-editor/preview.png b/watchy-image-editor/preview.png old mode 100644 new mode 100755