@@ -9,6 +9,7 @@

 static Window *window;

 static TextLayer *time_text_layer;

 static TextLayer *date_text_layer;

+static TextLayer *s_battery_layer;

 static GBitmap *world_bitmap;

@@ -16,10 +17,10 @@ static Layer *canvas;

 static GBitmap *image;

 static int redraw_counter;

 // BT connection & Battery icon declare

-static BitmapLayer *s_battery_icon_layer, *s_bt_icon_layer;

-static GBitmap *s_battery_icon_bitmap, *s_bt_icon_bitmap;

+static BitmapLayer *s_bt_icon_layer; //*s_battery_icon_layer

+static GBitmap *s_bt_icon_bitmap; //*s_battery_icon_bitmap

 static bool low_battery;

-static int s_battery_level;

+static int i_battery_level;

 // s is set to memory of size STR_SIZE, and temporarily stores strings

 char *s;

@@ -104,21 +105,38 @@ static void bluetooth_callback(bool connected) {

   if(!connected && !quiet_time_is_active ()) {

     // Issue a vibrating alert

     vibes_double_pulse();

-  }

+  } 

 }

 static void battery_callback(BatteryChargeState state) {

+  static char buff[4] = {};

+  int i = 0,temp_num = state.charge_percent, length = 0;

+

   // Record the new battery level

-  s_battery_level = state.charge_percent;

+  i_battery_level=state.charge_percent;

+  // count how many characters in the number

+    while(temp_num) {

+      temp_num /= 10;

+      length++;

+    }

+  for(i = 0; i < length; i++) {

+    buff[(length-1)-i] = '0' + (i_battery_level % 10);

+    i_battery_level /= 10;

+  }

+  buff[i] = '\0'; // can't forget the null byte to properly end our string

- // display icon and vibrate if low battery

-  if( s_battery_level < 11 && !low_battery && !state.is_charging ) {

+  text_layer_set_text(s_battery_layer, buff);

+  

+  // display --icon and-- vibrate if low battery and not charging

+  

+  if( state.charge_percent < 11 && !low_battery && !state.is_charging ) {

     vibes_double_pulse();

     low_battery = true;

-  }else if (state.is_charging) {

+  }else if (state.is_charging){

     low_battery = false;

   }

-  layer_set_hidden(bitmap_layer_get_layer(s_battery_icon_layer), !low_battery);

+  // Batterie is now displayed as integer, no need to display icon below

+  // layer_set_hidden(bitmap_layer_get_layer(s_battery_icon_layer), !low_battery);

 }

@@ -134,21 +152,29 @@ static void window_load(Window *window) {

   Layer *window_layer = window_get_root_layer(window);

   GRect bounds = layer_get_bounds(window_layer);

-  time_text_layer = text_layer_create(GRect(0, 72, 144-0, 168-72));

+  time_text_layer = text_layer_create(GRect(0, 72, 144-0, 49));

   text_layer_set_background_color(time_text_layer, background_color);

   text_layer_set_text_color(time_text_layer, foreground_color);

   text_layer_set_font(time_text_layer, fonts_get_system_font(FONT_KEY_ROBOTO_BOLD_SUBSET_49));

-  text_layer_set_text(time_text_layer, "");

+  text_layer_set_text(time_text_layer, "--");

   text_layer_set_text_alignment(time_text_layer, GTextAlignmentCenter);

   layer_add_child(window_layer, text_layer_get_layer(time_text_layer));

-  date_text_layer = text_layer_create(GRect(0, 130, 144-0, 168-130));

+  date_text_layer = text_layer_create(GRect(0, 121, 144-0, 21));

   text_layer_set_background_color(date_text_layer, background_color);

   text_layer_set_text_color(date_text_layer, foreground_color);

   text_layer_set_font(date_text_layer, fonts_get_system_font(FONT_KEY_ROBOTO_CONDENSED_21));

-  text_layer_set_text(date_text_layer, "");

+  text_layer_set_text(date_text_layer, "--");

   text_layer_set_text_alignment(date_text_layer, GTextAlignmentCenter);

   layer_add_child(window_layer, text_layer_get_layer(date_text_layer));

+  

+  s_battery_layer = text_layer_create(GRect(102, 147, 42, 20));

+  text_layer_set_background_color(s_battery_layer, background_color);

+  text_layer_set_text_color(s_battery_layer, foreground_color);

+  text_layer_set_font(s_battery_layer, fonts_get_system_font(FONT_KEY_LECO_20_BOLD_NUMBERS));

+  text_layer_set_text(s_battery_layer, "---");

+  text_layer_set_text_alignment(s_battery_layer, GTextAlignmentRight);

+  layer_add_child(window_layer, text_layer_get_layer(s_battery_layer));

   canvas = layer_create(GRect(0, 0, bounds.size.w, bounds.size.h));

   layer_set_update_proc(canvas, draw_watch);

@@ -160,13 +186,14 @@ static void window_load(Window *window) {

   //----------------

   // Create the Battery icon GBitmap

-  s_battery_icon_bitmap = gbitmap_create_with_resource(RESOURCE_ID_BATTERY );

+  //s_battery_icon_bitmap = gbitmap_create_with_resource(RESOURCE_ID_BATTERY );

   // Create the BitmapLayer to display the GBitmap

+  /*

   s_battery_icon_layer = bitmap_layer_create(GRect( 127, 143, 14, 22));

   bitmap_layer_set_bitmap(s_battery_icon_layer, s_battery_icon_bitmap);

   layer_add_child(window_layer, bitmap_layer_get_layer(s_battery_icon_layer));

-  

+  */

   //----------------

   // Create the Bluetooth icon GBitmap

@@ -190,8 +217,8 @@ static void window_unload(Window *window) {

   gbitmap_destroy(image);

   gbitmap_destroy(s_bt_icon_bitmap);

   bitmap_layer_destroy(s_bt_icon_layer);

-  gbitmap_destroy(s_battery_icon_bitmap);

-  bitmap_layer_destroy(s_battery_icon_layer);

+  //gbitmap_destroy(s_battery_icon_bitmap);

+  text_layer_destroy(s_battery_layer);

 }

 static void init(void) {

new file mode 100755

@@ -0,0 +1,239 @@

+#include <pebble.h>

+#include "config.h"

+

+#define STR_SIZE 20

+#define REDRAW_INTERVAL 1

+#define WIDTH 144

+#define HEIGHT 72

+

+static Window *window;

+static TextLayer *time_text_layer;

+static TextLayer *date_text_layer;

+

+static GBitmap *world_bitmap;

+

+static Layer *canvas;

+static GBitmap *image;

+static int redraw_counter;

+// BT connection & Battery icon declare

+static BitmapLayer *s_battery_icon_layer, *s_bt_icon_layer;

+static GBitmap *s_battery_icon_bitmap, *s_bt_icon_bitmap;

+static bool low_battery;

+static int s_battery_level;

+// s is set to memory of size STR_SIZE, and temporarily stores strings

+char *s;

+

+

+static void draw_earth() {

+  // ##### calculate the time

+  int now = (int)time(NULL);

+

+  float day_of_year; // value from 0 to 1 of progress through a year

+  float time_of_day; // value from 0 to 1 of progress through a day

+  // approx number of leap years since epoch

+  // = now / SECONDS_IN_YEAR * .24; (.24 = average rate of leap years)

+  int leap_years = (int)((float)now / 131487192.0);

+  // day_of_year is an estimate, but should be correct to within one day

+  day_of_year = now - (((int)((float)now / 31556926.0) * 365 + leap_years) * 86400);

+  day_of_year = day_of_year / 86400.0;

+  time_of_day = day_of_year - (int)day_of_year;

+  day_of_year = day_of_year / 365.0;

+  // ##### calculate the position of the sun

+  // left to right of world goes from 0 to 65536

+  int sun_x = (int)((float)TRIG_MAX_ANGLE * (1.0 - time_of_day));

+  // bottom to top of world goes from -32768 to 32768

+  // 0.2164 is march 20, the 79th day of the year, the march equinox

+  // Earth's inclination is 23.4 degrees, so sun should vary 23.4/90=.26 up and down

+  int sun_y = -sin_lookup((day_of_year - 0.2164) * TRIG_MAX_ANGLE) * .26 * .25;

+  // ##### draw the bitmap

+  int x, y;

+  for(x = 0; x < WIDTH; x++) {

+    int x_angle = (int)((float)TRIG_MAX_ANGLE * (float)x / (float)(WIDTH));

+    for(y = 0; y < HEIGHT; y++) {

+      int y_angle = (int)((float)TRIG_MAX_ANGLE * (float)y / (float)(HEIGHT * 2)) - TRIG_MAX_ANGLE/4;

+      // spherical law of cosines

+      float angle = ((float)sin_lookup(sun_y)/(float)TRIG_MAX_RATIO) * ((float)sin_lookup(y_angle)/(float)TRIG_MAX_RATIO);

+      angle = angle + ((float)cos_lookup(sun_y)/(float)TRIG_MAX_RATIO) * ((float)cos_lookup(y_angle)/(float)TRIG_MAX_RATIO) * ((float)cos_lookup(sun_x - x_angle)/(float)TRIG_MAX_RATIO);

+      int byte = y * gbitmap_get_bytes_per_row(image) + (int)(x / 8);

+      //if ((angle < 0) ^ (0x1 & (((char *)gbitmap_get_data(world_bitmap))[byte] >> (x % 8)))) {

+      if ( (angle < 0) ^ (0x1 & (((char *)gbitmap_get_data(world_bitmap))[byte] >> (x % 8)))) {

+        // white pixel

+        ((char *)gbitmap_get_data(image))[byte] = ((char *)gbitmap_get_data(image))[byte] | (0x1 << (x % 8));

+     } else {

+        // black pixel

+        ((char *)gbitmap_get_data(image))[byte] = ((char *)gbitmap_get_data(image))[byte] & ~(0x1 << (x % 8));

+      }

+    }

+  }

+  layer_mark_dirty(canvas);

+}

+

+static void draw_watch(struct Layer *layer, GContext *ctx) {

+  graphics_draw_bitmap_in_rect(ctx, image, gbitmap_get_bounds(image));

+}

+

+static void handle_minute_tick(struct tm *tick_time, TimeUnits units_changed) {

+  static char time_text[] = "00:00";

+  static char date_text[] = "Xxx, Xxx 00";

+

+  strftime(date_text, sizeof(date_text), "%a, %b %e", tick_time);

+  text_layer_set_text(date_text_layer, date_text);

+

+  if (clock_is_24h_style()) {

+    strftime(time_text, sizeof(time_text), "%R", tick_time);

+  } else {

+    strftime(time_text, sizeof(time_text), "%I:%M", tick_time);

+  }

+  if (!clock_is_24h_style() && (time_text[0] == '0')) {

+    memmove(time_text, &time_text[1], sizeof(time_text) - 1);

+  }

+  text_layer_set_text(time_text_layer, time_text);

+ 

+  redraw_counter++;

+  if (redraw_counter >= REDRAW_INTERVAL) {

+    draw_earth();

+    redraw_counter = 0;

+  }

+}

+

+

+static void bluetooth_callback(bool connected) {

+  // Show ko icon if disconnected

+  layer_set_hidden(bitmap_layer_get_layer(s_bt_icon_layer), connected);

+

+  if(!connected && !quiet_time_is_active ()) {

+    // Issue a vibrating alert

+    vibes_double_pulse();

+  }

+}

+

+static void battery_callback(BatteryChargeState state) {

+  // Record the new battery level

+  s_battery_level = state.charge_percent;

+  

+ // display icon and vibrate if low battery

+  if( s_battery_level < 11 && !low_battery && !state.is_charging ) {

+    vibes_double_pulse();

+    low_battery = true;

+  }else if (state.is_charging) {

+    low_battery = false;

+  }

+  layer_set_hidden(bitmap_layer_get_layer(s_battery_icon_layer), !low_battery);

+

+}

+

+static void window_load(Window *window) {

+#ifdef BLACK_ON_WHITE

+  GColor background_color = GColorWhite;

+  GColor foreground_color = GColorBlack;

+#else

+  GColor background_color = GColorBlack;

+  GColor foreground_color = GColorWhite;

+#endif

+  window_set_background_color(window, background_color);

+  Layer *window_layer = window_get_root_layer(window);

+  GRect bounds = layer_get_bounds(window_layer);

+

+  time_text_layer = text_layer_create(GRect(0, 72, 144-0, 168-72));

+  text_layer_set_background_color(time_text_layer, background_color);

+  text_layer_set_text_color(time_text_layer, foreground_color);

+  text_layer_set_font(time_text_layer, fonts_get_system_font(FONT_KEY_ROBOTO_BOLD_SUBSET_49));

+  text_layer_set_text(time_text_layer, "");

+  text_layer_set_text_alignment(time_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(time_text_layer));

+

+  date_text_layer = text_layer_create(GRect(0, 130, 144-0, 168-130));

+  text_layer_set_background_color(date_text_layer, background_color);

+  text_layer_set_text_color(date_text_layer, foreground_color);

+  text_layer_set_font(date_text_layer, fonts_get_system_font(FONT_KEY_ROBOTO_CONDENSED_21));

+  text_layer_set_text(date_text_layer, "");

+  text_layer_set_text_alignment(date_text_layer, GTextAlignmentCenter);

+  layer_add_child(window_layer, text_layer_get_layer(date_text_layer));

+

+  canvas = layer_create(GRect(0, 0, bounds.size.w, bounds.size.h));

+  layer_set_update_proc(canvas, draw_watch);

+  layer_add_child(window_layer, canvas);

+

+  image = gbitmap_create_blank(GSize(WIDTH, HEIGHT), GBitmapFormat1Bit);

+

+  draw_earth();

+  //----------------

+  

+  // Create the Battery icon GBitmap

+  s_battery_icon_bitmap = gbitmap_create_with_resource(RESOURCE_ID_BATTERY );

+  

+  // Create the BitmapLayer to display the GBitmap

+  s_battery_icon_layer = bitmap_layer_create(GRect( 127, 143, 14, 22));

+  bitmap_layer_set_bitmap(s_battery_icon_layer, s_battery_icon_bitmap);

+  layer_add_child(window_layer, bitmap_layer_get_layer(s_battery_icon_layer));

+  

+  //----------------

+  

+  // Create the Bluetooth icon GBitmap

+  s_bt_icon_bitmap = gbitmap_create_with_resource(RESOURCE_ID_BT_ko_icon );

+  

+  // Create the BitmapLayer to display the GBitmap

+  s_bt_icon_layer = bitmap_layer_create(GRect( 3, 143, 14, 22));

+  bitmap_layer_set_bitmap(s_bt_icon_layer, s_bt_icon_bitmap);

+  layer_add_child(window_layer, bitmap_layer_get_layer(s_bt_icon_layer));

+  

+  // show correct state of battery from start

+  battery_callback(battery_state_service_peek());

+  // Show the correct state of the BT connection from the start

+  bluetooth_callback(connection_service_peek_pebble_app_connection());

+}

+

+static void window_unload(Window *window) {

+  text_layer_destroy(time_text_layer);

+  text_layer_destroy(date_text_layer);

+  layer_destroy(canvas);

+  gbitmap_destroy(image);

+  gbitmap_destroy(s_bt_icon_bitmap);

+  bitmap_layer_destroy(s_bt_icon_layer);

+  gbitmap_destroy(s_battery_icon_bitmap);

+  bitmap_layer_destroy(s_battery_icon_layer);

+}

+

+static void init(void) {

+  redraw_counter = 0;

+

+

+  world_bitmap = gbitmap_create_with_resource(RESOURCE_ID_WORLD_MONO);

+

+  window = window_create();

+  window_set_window_handlers(window, (WindowHandlers) {

+    .load = window_load,

+    .unload = window_unload,

+  });

+  

+  const bool animated = true;

+  window_stack_push(window, animated);

+

+  s = malloc(STR_SIZE);

+  tick_timer_service_subscribe(MINUTE_UNIT, handle_minute_tick);

+  

+  // Subscribe to battery info

+  battery_state_service_subscribe(battery_callback);

+  

+  // Register for Bluetooth connection updates

+  connection_service_subscribe((ConnectionHandlers) {

+    .pebble_app_connection_handler = bluetooth_callback

+  });  

+}

+

+static void deinit(void) {

+  tick_timer_service_unsubscribe();

+  free(s);

+  window_destroy(window);

+  gbitmap_destroy(world_bitmap);

+

+}

+

+int main(void) {

+  init();

+

+  APP_LOG(APP_LOG_LEVEL_DEBUG, "Done initializing, pushed window: %p", window);

+

+  app_event_loop();

+  deinit();

+}