X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=ui%2Foswald-ui.c;h=9d7e57581786022feba8e2401a99cf6268c71208;hb=81da03661f51061203889cb115142217230d6a76;hp=a89523b3ad27c9734ca4347c8333f0c3f7b1cf16;hpb=8e3cbad72c8e3abb97f2081527f91af98d8558be;p=oswald.git diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c index a89523b..9d7e575 100644 --- a/ui/oswald-ui.c +++ b/ui/oswald-ui.c @@ -12,7 +12,7 @@ #include -#include "Fonts.h" // the MetaWatch fonts +//#include "Fonts.h" // the MetaWatch fonts #include "oswald.h" #include "oswald_main.h" @@ -23,7 +23,7 @@ static oswald_ui *ui_g; -void lcd_set_pixel(gint x, gint y, gboolean state) +void hal_lcd_set_pixel(gint x, gint y, gboolean state) { gint ix, iy; @@ -35,10 +35,15 @@ void 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); +} + +/* updates the actual LCD so that drawing becomes visible */ +void hal_lcd_update_display(void) +{ gtk_widget_queue_draw(ui_g->darea); } -void lcd_clear_display(void) +void hal_lcd_clear_display(void) { gdk_draw_rectangle (ui_g->pixmap, ui_g->darea->style->white_gc, @@ -50,6 +55,77 @@ void 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"; +} + +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 disable\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) { @@ -155,6 +231,45 @@ gboolean button_F_pr (GtkWidget *widget, GdkEvent *event, gpointer user_data) return FALSE; } +void ambientlight_value_changed (GtkRange *range, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + double val; + + val = gtk_range_get_value(range); + oswald_handle_ambientlight_event((uint8_t) val); +} + +void accelX_value_changed (GtkRange *range, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + double val; + + val = gtk_range_get_value(range); + ui->accel_x = (uint8_t)val; + oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z); +} + +void accelY_value_changed (GtkRange *range, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + double val; + + val = gtk_range_get_value(range); + ui->accel_y = (uint8_t)val; + oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z); +} + +void accelZ_value_changed (GtkRange *range, gpointer user_data) +{ + oswald_ui *ui = (oswald_ui *)user_data; + double val; + + val = gtk_range_get_value(range); + ui->accel_z = (uint8_t)val; + oswald_handle_accel_event(ui->accel_x, ui->accel_y, ui->accel_z); +} + static void create_mainwin(oswald_ui *ui) { GtkWidget *mvb, *hb, *vb, *btn, *sc, *l; @@ -174,19 +289,19 @@ static void create_mainwin(oswald_ui *ui) vb = gtk_vbox_new(FALSE, 5); gtk_box_pack_start (GTK_BOX(hb), vb, FALSE, FALSE, 5); - btn = gtk_button_new_with_label(" D "); + btn = gtk_button_new_with_label(" F "); gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10); - g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_D_clicked), ui); + g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_F_clicked), ui); + g_signal_connect(G_OBJECT(btn), "button-press-event", G_CALLBACK(button_F_pr), ui); + g_signal_connect(G_OBJECT(btn), "button-release-event", G_CALLBACK(button_F_pr), ui); btn = gtk_button_new_with_label(" E "); gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10); g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_E_clicked), ui); - btn = gtk_button_new_with_label(" F "); + btn = gtk_button_new_with_label(" D "); gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10); - g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_F_clicked), ui); - g_signal_connect(G_OBJECT(btn), "button-press-event", G_CALLBACK(button_F_pr), ui); - g_signal_connect(G_OBJECT(btn), "button-release-event", G_CALLBACK(button_F_pr), ui); + g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_D_clicked), ui); ui->darea = gtk_drawing_area_new (); gtk_box_pack_start (GTK_BOX(hb), GTK_WIDGET(ui->darea), FALSE, FALSE, 5); @@ -218,31 +333,42 @@ static void create_mainwin(oswald_ui *ui) gtk_box_pack_start (GTK_BOX(vb), btn, FALSE, FALSE, 10); g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(button_C_clicked), ui); + // ambient light sensor sc = gtk_vscale_new_with_range (0, 255, 1); gtk_box_pack_start (GTK_BOX(hb), sc, FALSE, FALSE, 5); + g_signal_connect(G_OBJECT(sc), "value-changed", G_CALLBACK(ambientlight_value_changed), ui); hb = gtk_hbox_new(FALSE, 0); gtk_box_pack_start (GTK_BOX(mvb), hb, FALSE, FALSE, 5); 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); } -gboolean one_second_tmo_handler (gpointer userdata) +static gboolean one_second_tmo_handler (gpointer userdata) { oswald_ui *ui = (oswald_ui *)userdata; @@ -251,7 +377,7 @@ gboolean one_second_tmo_handler (gpointer userdata) return TRUE; } -gboolean app_idle_handler (gpointer user_data) +static gboolean app_idle_handler (gpointer user_data) { g_print("i"); if (OswaldState.pending_idle) { @@ -261,6 +387,116 @@ gboolean app_idle_handler (gpointer user_data) return FALSE; } +static gboolean centisecond_tmo_handler (gpointer userdata) +{ + oswald_ui *ui = (oswald_ui *)userdata; + + if (ui->centisecond_active) + oswald_centisecond_tick(); + else + return FALSE; + + return TRUE; +} + +void hal_enable_centisecond_timer(void) +{ + ui_g->centisecond_active = TRUE; + g_timeout_add(10, centisecond_tmo_handler, ui_g); +} + +void hal_disable_centisecond_timer(void) +{ + ui_g->centisecond_active = FALSE; +} + +static gboolean halfsecond_tmo_handler (gpointer userdata) +{ + oswald_ui *ui = (oswald_ui *)userdata; + + if (ui->halfsecond_active) + oswald_halfsecond_tick(); + else + return FALSE; + + return TRUE; +} + +void hal_enable_halfsecond_timer(void) +{ + ui_g->halfsecond_active = TRUE; + g_timeout_add(500, halfsecond_tmo_handler, ui_g); +} + +void hal_disable_halfsecond_timer(void) +{ + ui_g->halfsecond_active = FALSE; +} + +void hal_get_rtc(clock_state *rtc) +{ + time_t mt; + struct tm mtime; + + mt = time(NULL); + localtime_r(&mt, &mtime); + + rtc->hour = mtime.tm_hour; + rtc->minute = mtime.tm_min; + rtc->second = mtime.tm_sec; + rtc->day = mtime.tm_mday; + rtc->wday = mtime.tm_wday; + rtc->month = (mtime.tm_mon + 1); + rtc->year = (mtime.tm_year + 1900); + +} + +void hal_set_rtc(const clock_state *rtc, boolean set_set) +{ +} + +void hal_get_power_state(power_state *pwr) +{ + pwr->source = POWER_SOURCE_EXTERNAL; + pwr->charge_state = POWER_CHARGER_CHARGING; + pwr->percent = 50; + pwr->level = 3242; // mV +} + +static boolean BacklightState = FALSE; + +/* sets the backlight on/off, on=TRUE, off=FALSE */ +void hal_lcd_set_backlight(boolean state) +{ + g_print("turn LCD backlight %s\n", state ? "on" : "off"); + BacklightState = state; +} + +boolean hal_lcd_get_backlight(void) +{ + return BacklightState; +} + +static boolean VibrationState = FALSE; + +/* sets the vibration motor on/off, on=TRUE, off=FALSE */ +void hal_vibration_set_state(boolean state) +{ + g_print("turn vibration %s\n", state ? "on" : "off"); + VibrationState = state; +} + +boolean hal_vibration_get_state(void) +{ + return VibrationState; +} + +uint16_t hal_amblight_get_val(void) +{ + return 42; +} + + int main(int argc , char ** argv) { oswald_ui ui; @@ -269,6 +505,12 @@ int main(int argc , char ** argv) ui_g = &ui; + ui.accel_x = 0; + ui.accel_y = 0; + ui.accel_z = 0; + ui.halfsecond_active = FALSE; + ui.centisecond_active = FALSE; + mt = time(NULL); localtime_r(&mt, &mtime); @@ -277,7 +519,8 @@ int main(int argc , char ** argv) create_mainwin(&ui); gtk_widget_realize(ui.mainwin); - oswald_set_time(mtime.tm_hour, mtime.tm_min, mtime.tm_sec); + oswald_set_time(mtime.tm_hour, mtime.tm_min, mtime.tm_sec, TRUE); + oswald_set_date(mtime.tm_mday, (mtime.tm_mon + 1), (mtime.tm_year + 1900), TRUE); oswald_init(); g_timeout_add_seconds(1, one_second_tmo_handler, &ui);