Dariaceli's Git
Browse code

Use strutils instead of snprintf (to save some bytes), set default year to 2014, partial revamp of the stopwatch

Dario Rodriguez authored on 14/01/2014 22:59:59
Showing 1 changed files
ui/Makefile.am
History View file @ 940a301
... ... 
@@ -4,7 +4,8 @@ bin_PROGRAMS = .buildno oswald-gui
4 4
5 5 
 oswald_gui_SOURCES = oswald-ui.c oswald_main.c \
6 6 
 	oswald_watch_faces.c oswald_strings.c oswald_screens.c \
7 
-	embedvm.c oswald_graphics.c calendar.c oswald_fonts.c dayslib.c
7 
+	embedvm.c oswald_graphics.c calendar.c oswald_fonts.c \
8 
+	dayslib.c mymem.c strutils.c
8 9
9 10 
 # BUILDNO = \"$(shell cat .buildno)\"
10 11 
 BUILDNO = \"$(shell date +%y%m%d)-\#$(shell cat .buildno)\"
Browse code

Replace font handling, add new watch face, add calendar. More watchfaces, make calendar interactive and start rearranging button functions

Dario Rodriguez authored on 17/12/2013 22:59:59
Showing 1 changed files
ui/Makefile.am
History View file @ bce8609
... ... 
@@ -4,7 +4,7 @@ bin_PROGRAMS = .buildno oswald-gui
4 4
5 5 
 oswald_gui_SOURCES = oswald-ui.c oswald_main.c \
6 6 
 	oswald_watch_faces.c oswald_strings.c oswald_screens.c \
7 
-	embedvm.c oswald_graphics.c calendar.c oswald_fonts.c
7 
+	embedvm.c oswald_graphics.c calendar.c oswald_fonts.c dayslib.c
8 8
9 9 
 # BUILDNO = \"$(shell cat .buildno)\"
10 10 
 BUILDNO = \"$(shell date +%y%m%d)-\#$(shell cat .buildno)\"
Browse code

Add version information and info screen, some more work on the accel screen

Nils Faerber authored on 05/05/2013 01:54:24
Showing 1 changed files
ui/Makefile.am
History View file @ 84e4829
... ... 
@@ -1,15 +1,23 @@
1 1 
 ACLOCAL_AMFLAGS = -I m4
2 2
3 
-bin_PROGRAMS = oswald-gui
3 
+bin_PROGRAMS = .buildno oswald-gui
4 4
5 5 
 oswald_gui_SOURCES = oswald-ui.c oswald_main.c \
6 6 
 	oswald_watch_faces.c oswald_strings.c oswald_screens.c \
7 7 
 	embedvm.c oswald_graphics.c calendar.c oswald_fonts.c
8 8
9 
-oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
9 
+# BUILDNO = \"$(shell cat .buildno)\"
10 
+BUILDNO = \"$(shell date +%y%m%d)-\#$(shell cat .buildno)\"
11 
+
12 
+oswald_gui_CFLAGS = -DBUILDNO=$(BUILDNO) -g $(GTK_CFLAGS)
13 
+
10 14 
 oswald_gui_LDADD = $(GTK_LIBS)
11 15
12 16 
 EXTRA_DIST = config.rpath m4/ChangeLog  \
13 17 
 	AUTHORS                 \
14 18 
 	COPYING                 \
15 19 
 	README.txt
20 
+
21 
+.buildno: $(oswald_gui_OBJECTS)
22 
+	@if ! test -f .buildno; then echo 0 > .buildno; fi
23 
+	@echo $$(($$(cat .buildno) + 1)) > .buildno
Browse code

Starting to get rid of borrowed code (LcdDisplay, Fonts), integrate new fonts and stuff

Nils Faerber authored on 28/04/2013 22:38:41
Showing 1 changed files
ui/Makefile.am
History View file @ 16600ff
... ... 
@@ -2,8 +2,10 @@ ACLOCAL_AMFLAGS = -I m4
2 2
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 
-oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c oswald_strings.c oswald_screens.c \
6 
-embedvm.c oswald_fonts.c oswald_graphics.c calendar.c
5 
+oswald_gui_SOURCES = oswald-ui.c oswald_main.c \
6 
+	oswald_watch_faces.c oswald_strings.c oswald_screens.c \
7 
+	embedvm.c oswald_graphics.c calendar.c oswald_fonts.c
8 
+
7 9 
 oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
8 10 
 oswald_gui_LDADD = $(GTK_LIBS)
9 11
Browse code

Oh boy... lots of changes, too many to describe

Nils Faerber authored on 21/04/2013 14:26:38
Showing 1 changed files
ui/Makefile.am
History View file @ 5d0ff00
... ... 
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 5 
 oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c oswald_strings.c oswald_screens.c \
6 
-embedvm.c oswald_fonts.c oswald_graphics.c
6 
+embedvm.c oswald_fonts.c oswald_graphics.c calendar.c
7 7 
 oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
8 8 
 oswald_gui_LDADD = $(GTK_LIBS)
9 9
Browse code

Add fixes for it to work properly on microcontroller

Nils Faerber authored on 19/03/2013 19:22:58
Showing 1 changed files
ui/Makefile.am
History View file @ a03500b
... ... 
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 5 
 oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c oswald_strings.c oswald_screens.c \
6 
-embedvm.c
6 
+embedvm.c oswald_fonts.c oswald_graphics.c
7 7 
 oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
8 8 
 oswald_gui_LDADD = $(GTK_LIBS)
9 9
Browse code

Make idle selectable

Nils Faerber authored on 12/08/2012 02:11:30
Showing 1 changed files
ui/Makefile.am
History View file @ 8e3cbad
... ... 
@@ -2,7 +2,8 @@ ACLOCAL_AMFLAGS = -I m4
2 2
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 
-oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c oswald_strings.c oswald_screens.c
5 
+oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c oswald_strings.c oswald_screens.c \
6 
+embedvm.c
6 7 
 oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
7 8 
 oswald_gui_LDADD = $(GTK_LIBS)
8 9
Browse code

Redesign to an event based handling

Nils Faerber authored on 07/08/2012 22:09:29
Showing 1 changed files
ui/Makefile.am
History View file @ 019424a
... ... 
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
2 2
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 
-oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c oswald_strings.c
5 
+oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c oswald_strings.c oswald_screens.c
6 6 
 oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
7 7 
 oswald_gui_LDADD = $(GTK_LIBS)
8 8
Browse code

Add support for more screens

Nils Faerber authored on 06/08/2012 14:12:20
Showing 1 changed files
ui/Makefile.am
History View file @ 013b763
... ... 
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
2 2
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 
-oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c
5 
+oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c oswald_strings.c
6 6 
 oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
7 7 
 oswald_gui_LDADD = $(GTK_LIBS)
8 8
Browse code

Too much to note...

Nils Faerber authored on 05/08/2012 17:07:17
Showing 1 changed files
ui/Makefile.am
History View file @ e09935a
... ... 
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
2 2
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 
-oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c
5 
+oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c oswald_main.c oswald_watch_faces.c
6 6 
 oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
7 7 
 oswald_gui_LDADD = $(GTK_LIBS)
8 8
Browse code

Add MetaWatch Fonts package, LcdDisplay and start demo

Nils Faerber authored on 31/07/2012 21:42:03
Showing 1 changed files
ui/Makefile.am
History View file @ 95bcec6
... ... 
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
2 2
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 
-oswald_gui_SOURCES = oswald-ui.c
5 
+oswald_gui_SOURCES = oswald-ui.c LcdDisplay.c Fonts.c
6 6 
 oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
7 7 
 oswald_gui_LDADD = $(GTK_LIBS)
8 8
Browse code

Fix automake

Nils Faerber authored on 31/07/2012 17:53:52
Showing 1 changed files
ui/Makefile.am
History View file @ 6885cfb
... ... 
@@ -2,9 +2,9 @@ ACLOCAL_AMFLAGS = -I m4
2 2
3 3 
 bin_PROGRAMS = oswald-gui
4 4
5 
-winkui_SOURCES = oswald-ui.c
6 
-winkui_CFLAGS = -g $(GTK_CFLAGS)
7 
-winkui_LDADD = $(GTK_LIBS)
5 
+oswald_gui_SOURCES = oswald-ui.c
6 
+oswald_gui_CFLAGS = -g $(GTK_CFLAGS)
7 
+oswald_gui_LDADD = $(GTK_LIBS)
8 8
9 9 
 EXTRA_DIST = config.rpath m4/ChangeLog  \
10 10 
 	AUTHORS                 \
Browse code

initial UI stuff

Nils Faerber authored on 31/07/2012 17:51:24
Showing 1 changed files
ui/Makefile.am
History View file @ 112a5c4
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,12 @@
1 
+ACLOCAL_AMFLAGS = -I m4
2 
+
3 
+bin_PROGRAMS = oswald-gui
4 
+
5 
+winkui_SOURCES = oswald-ui.c
6 
+winkui_CFLAGS = -g $(GTK_CFLAGS)
7 
+winkui_LDADD = $(GTK_LIBS)
8 
+
9 
+EXTRA_DIST = config.rpath m4/ChangeLog  \
10 
+	AUTHORS                 \
11 
+	COPYING                 \
12 
+	README.txt