X-Git-Url: https://git.karo-electronics.de/?p=oswald.git;a=blobdiff_plain;f=ui%2Foswald-ui.c;h=29e15fd461cc2c7432f973a691aa445a5dca86ef;hp=563a7b7e51792cebc7252e2e0463a10d0a375286;hb=7591b56527b514071ba465297b77a3bae4f57548;hpb=b83e605bc8ba69950a84b6ed268f0c196f68762c

diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c
index 563a7b7..29e15fd 100644
--- 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"
 
@@ -94,6 +94,38 @@ 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";
+}
+
+void hal_accelerometer_enable(void)
+{
+	g_printerr("accel enable\n");
+	gtk_widget_set_sensitive(ui_g->x_sc, TRUE);
+	gtk_widget_set_sensitive(ui_g->y_sc, TRUE);
+	gtk_widget_set_sensitive(ui_g->z_sc, TRUE);
+}
+
+void hal_accelerometer_disable(void)
+{
+	g_printerr("accel enable\n");
+	gtk_widget_set_sensitive(ui_g->x_sc, FALSE);
+	gtk_widget_set_sensitive(ui_g->y_sc, FALSE);
+	gtk_widget_set_sensitive(ui_g->z_sc, FALSE);
+}
+
+
 static gint
 configure_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data)
 {
@@ -205,7 +237,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)
@@ -214,7 +246,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);
 }
 
@@ -224,7 +256,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);
 }
 
@@ -234,7 +266,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);
 }
 
@@ -311,21 +343,27 @@ 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);
+	ui->x_sc = sc;
+	gtk_widget_set_sensitive(ui->x_sc, FALSE);
 
 	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);
+	ui->y_sc = sc;
+	gtk_widget_set_sensitive(ui->y_sc, FALSE);
 
 	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);
+	ui->z_sc = sc;
+	gtk_widget_set_sensitive(ui->z_sc, FALSE);
 
 	gtk_widget_show_all(ui->mainwin);
 }