diff --git a/ui/assets/720.png b/uitest/assets/720.png
similarity index 100%
rename from ui/assets/720.png
rename to uitest/assets/720.png
diff --git a/uitest/assets/default_assets.h b/uitest/assets/default_assets.h
new file mode 100644
index 0000000..9603b44
--- /dev/null
+++ b/uitest/assets/default_assets.h
@@ -0,0 +1,7 @@
+#define LOAD_ASSETS() GD.safeload("syringe.pic");
+#define SYRINGE_HANDLE 0
+#define SYRINGE_WIDTH 110
+#define SYRINGE_HEIGHT 50
+#define SYRINGE_CELLS 1
+#define ASSETS_END 11000UL
+static const shape_t SYRINGE_SHAPE = {0, 110, 50, 0};
diff --git a/uitest/assets/icon_20561.svg b/uitest/assets/icon_20561.svg
new file mode 100644
index 0000000..5a7c9ab
--- /dev/null
+++ b/uitest/assets/icon_20561.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/ui/assets/makeAssets.py b/uitest/assets/makeAssets.py
similarity index 78%
rename from ui/assets/makeAssets.py
rename to uitest/assets/makeAssets.py
index ca7c893..7dbe2e3 100644
--- a/ui/assets/makeAssets.py
+++ b/uitest/assets/makeAssets.py
@@ -7,5 +7,7 @@ def addall(self):
spinner = gd2.prep.split(90, 30, Image.open("720.png"))
self.load_handle("SPINNER", spinner, gd2.ARGB1555)
+ self.load_handle("SYRINGE",Image.open("syringe.png"),gd2.ARGB4)
+
if __name__ == '__main__':
Spinner().make()
diff --git a/ui/assets/makeAssets.py~ b/uitest/assets/makeAssets.py~
similarity index 59%
rename from ui/assets/makeAssets.py~
rename to uitest/assets/makeAssets.py~
index d6a824e..79863ed 100644
--- a/ui/assets/makeAssets.py~
+++ b/uitest/assets/makeAssets.py~
@@ -4,8 +4,10 @@ import gameduino2 as gd2
class Spinner(gd2.prep.AssetBin):
def addall(self):
- spinner = gd2.prep.split(30, 90, Image.open("720.png"))
+ spinner = gd2.prep.split(90, 30, Image.open("720.png"))
self.load_handle("SPINNER", spinner, gd2.ARGB1555)
+ self.load_handle("SYRINGE",Image.open("syringe.png"),gd2.ARGB1555)
+
if __name__ == '__main__':
Spinner().make()
diff --git a/ui/assets/spinner_assets.h b/uitest/assets/spinner_assets.h
similarity index 100%
rename from ui/assets/spinner_assets.h
rename to uitest/assets/spinner_assets.h
diff --git a/uitest/assets/syringe.pic b/uitest/assets/syringe.pic
new file mode 100644
index 0000000..00b6bf3
Binary files /dev/null and b/uitest/assets/syringe.pic differ
diff --git a/uitest/assets/syringe.png b/uitest/assets/syringe.png
new file mode 100644
index 0000000..179d853
Binary files /dev/null and b/uitest/assets/syringe.png differ
diff --git a/uitest/default_assets.h b/uitest/default_assets.h
new file mode 100644
index 0000000..95d83c7
--- /dev/null
+++ b/uitest/default_assets.h
@@ -0,0 +1,7 @@
+#define LOAD_ASSETS() GD.safeload("syringe.pic");
+#define SYRINGE_HANDLE 1
+#define SYRINGE_WIDTH 110
+#define SYRINGE_HEIGHT 50
+#define SYRINGE_CELLS 1
+#define ASSETS_END 11000UL
+static const shape_t SYRINGE_SHAPE = {0, 110, 50, 0};
diff --git a/uitest/icon_20561.svg b/uitest/icon_20561.svg
new file mode 100644
index 0000000..b1ec0a6
--- /dev/null
+++ b/uitest/icon_20561.svg
@@ -0,0 +1,53 @@
+
+
\ No newline at end of file
diff --git a/ui/spinner_assets.h b/uitest/spinner_assets.h
similarity index 97%
rename from ui/spinner_assets.h
rename to uitest/spinner_assets.h
index c57bdd8..0855c15 100644
--- a/ui/spinner_assets.h
+++ b/uitest/spinner_assets.h
@@ -135,10 +135,10 @@ static const PROGMEM prog_uchar __assets[2026] = {
141, 9, 51, 141, 65, 50, 111, 38, 204, 54, 199, 248, 47, 232, 3, 158,
171
};
-#define LOAD_ASSETS() GD.copy(__assets, sizeof(__assets))
-#define SPINNER_HANDLE 0
-#define SPINNER_WIDTH 90
-#define SPINNER_HEIGHT 30
-#define SPINNER_CELLS 12
-#define ASSETS_END 64800UL
-static const shape_t SPINNER_SHAPE = {0, 90, 30, 0};
+#define SPIN_LOAD_ASSETS() GD.copy(__assets, sizeof(__assets))
+#define SPIN_SPINNER_HANDLE 0
+#define SPIN_SPINNER_WIDTH 90
+#define SPIN_SPINNER_HEIGHT 30
+#define SPIN_SPINNER_CELLS 12
+#define SPIN_ASSETS_END 64800UL
+static const shape_t SPIN_SPINNER_SHAPE = {0, 90, 30, 0};
diff --git a/uitest/syringe.png b/uitest/syringe.png
new file mode 100644
index 0000000..179d853
Binary files /dev/null and b/uitest/syringe.png differ
diff --git a/uitest/ui.ino b/uitest/ui.ino
new file mode 100644
index 0000000..fb34ba5
--- /dev/null
+++ b/uitest/ui.ino
@@ -0,0 +1,42 @@
+#include
+#include
+#include
+
+#include "spinner_assets.h"
+#include "default_assets.h"
+
+int i = 0;
+
+void setup()
+{
+ GD.begin();
+ SPIN_LOAD_ASSETS();
+ LOAD_ASSETS();
+}
+
+void loop()
+{
+ //GD.ClearColorRGB(0x103000);
+ GD.Clear();
+ GD.cmd_text(240, 68, 31, OPT_CENTER, "56.7 mL/h");
+
+ /*
+ GD.Begin(POINTS); // draw 50-pixel wide green circles
+ GD.ColorRGB(20, 91, 71);
+ GD.PointSize(50 * 16);
+ GD.BlendFunc(SRC_ALPHA, ONE);
+ // additive blending
+ for (int x = 100; x <= 380; x += 40)
+ GD.Vertex2ii(x, 200);
+ */
+
+ GD.Begin(BITMAPS);
+ GD.Vertex2ii(240, 110, SPIN_SPINNER_HANDLE, floor(i / 10));
+ i += 1;
+ if(i>110)
+ i = 0;
+
+ GD.Vertex2ii(100, 200, SYRINGE_HANDLE);
+
+ GD.swap();
+}