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

[oswald.git] / ui / oswald-ui.c

diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c
index e86f0e1593bc9a930d3bf8aa1be13e3009f01685..c482c7834569b230839ee99ec181f062625ebc37 100644 (file)
--- a/ui/oswald-ui.c
+++ b/ui/oswald-ui.c
@@ -12,7 +12,7 @@
 
 #include <gtk/gtk.h>
 
-#include "Fonts.h" // the MetaWatch fonts
+//#include "Fonts.h" // the MetaWatch fonts
 #include "oswald.h"
 #include "oswald_main.h"
 
@@ -35,7 +35,6 @@ void hal_lcd_set_pixel(gint x, gint y, gboolean state)
        gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix, iy+1);
        gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix+1, iy+1);
 
-//     gtk_widget_queue_draw(ui_g->darea);
 }
 
 /* updates the actual LCD so that drawing becomes visible */
@@ -56,6 +55,61 @@ void hal_lcd_clear_display(void)
        gtk_widget_queue_draw(ui_g->darea);
 }
 
+static bluetooth_state bt_state = BLUETOOTH_OFF;
+static boolean bt_visible = FALSE;
+
+bluetooth_state hal_bluetooth_set_state(bluetooth_state state)
+{
+       bt_state = state;
+       if (bt_state == BLUETOOTH_OFF)
+               bt_visible = FALSE;
+
+       return bt_state;
+}
+
+bluetooth_state hal_bluetooth_get_state(void)
+{
+       return bt_state;
+}
+
+uint8_t *hal_bluetooth_get_local_bdaddr(void)
+{
+       static uint8_t local_bdaddr[6] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55};
+
+       return local_bdaddr;
+}
+
+void hal_bluetooth_set_visible(boolean visible)
+{
+       bt_visible = visible;
+}
+
+boolean hal_bluetooth_get_visible(void)
+{
+       return bt_visible;
+}
+
+void hal_bluetooth_send_data(const void *mdat, uint16_t mlen)
+{
+       g_printerr("write comm %d\n", mlen);
+}
+
+const char *hal_get_version_string(void)
+{
+       return "GTK v0.3";
+}
+
+const char *hal_get_buildno_string(void)
+{
+       return BUILDNO;
+}
+
+const char *hal_get_radio_version_string(void)
+{
+       return "BlueZ";
+}
+
+
 static gint
 configure_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data)
 {
@@ -167,7 +221,7 @@ void ambientlight_value_changed (GtkRange *range, gpointer  user_data)
        double val;
 
        val = gtk_range_get_value(range);
-       oswald_handle_ambientlight_event((u8t) val);
+       oswald_handle_ambientlight_event((uint8_t) val);
 }
 
 void accelX_value_changed (GtkRange *range, gpointer  user_data)
@@ -176,7 +230,7 @@ void accelX_value_changed (GtkRange *range, gpointer  user_data)
        double val;
 
        val = gtk_range_get_value(range);
-       ui->accel_x = (u8t)val;
+       ui->accel_x = (uint8_t)val;
        oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z);
 }
 
@@ -186,7 +240,7 @@ void accelY_value_changed (GtkRange *range, gpointer  user_data)
        double val;
 
        val = gtk_range_get_value(range);
-       ui->accel_y = (u8t)val;
+       ui->accel_y = (uint8_t)val;
        oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z);
 }
 
@@ -196,7 +250,7 @@ void accelZ_value_changed (GtkRange *range, gpointer  user_data)
        double val;
 
        val = gtk_range_get_value(range);
-       ui->accel_z = (u8t)val;
+       ui->accel_z = (uint8_t)val;
        oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z);
 }
 
@@ -273,19 +327,19 @@ static void create_mainwin(oswald_ui *ui)
 
        l = gtk_label_new("X:");
        gtk_box_pack_start (GTK_BOX(hb), l, FALSE, FALSE, 5);
-       sc = gtk_hscale_new_with_range (0, 255, 1);
+       sc = gtk_hscale_new_with_range (-128, 127, 1);
        gtk_box_pack_start (GTK_BOX(hb), sc, TRUE, TRUE, 5);
        g_signal_connect(G_OBJECT(sc), "value-changed", G_CALLBACK(accelX_value_changed), ui);
 
        l = gtk_label_new("Y:");
        gtk_box_pack_start (GTK_BOX(hb), l, FALSE, FALSE, 5);
-       sc = gtk_hscale_new_with_range (0, 255, 1);
+       sc = gtk_hscale_new_with_range (-128, 127, 1);
        gtk_box_pack_start (GTK_BOX(hb), sc, TRUE, TRUE, 5);
        g_signal_connect(G_OBJECT(sc), "value-changed", G_CALLBACK(accelY_value_changed), ui);
 
        l = gtk_label_new("Z:");
        gtk_box_pack_start (GTK_BOX(hb), l, FALSE, FALSE, 5);
-       sc = gtk_hscale_new_with_range (0, 255, 1);
+       sc = gtk_hscale_new_with_range (-128, 127, 1);
        gtk_box_pack_start (GTK_BOX(hb), sc, TRUE, TRUE, 5);
        g_signal_connect(G_OBJECT(sc), "value-changed", G_CALLBACK(accelZ_value_changed), ui);