new file mode 100644

@@ -0,0 +1,8 @@

+argv = ['/home/louis/.pebble-sdk/SDKs/current/sdk-core/pebble/waf', 'configure']

+environ = {'WSL_INTEROP': '/run/WSL/10_interop', 'PEBBLE_TOOLCHAIN_PATH': '/home/louis/pebble-dev/pebble-sdk-4.5-linux64/arm-cs-tools/bin', 'WSL_DISTRO_NAME': 'Ubuntu-18.04', 'HOSTTYPE': 'x86_64', 'LESSOPEN': '| /usr/bin/lesspipe %s', 'LOGNAME': 'louis', 'USER': 'louis', 'NO_GCE_CHECK': 'False', 'PATH': '/home/louis/pebble-dev/pebble-sdk-4.5-linux64/arm-cs-tools/bin:/home/louis/pebble-dev/pebble-sdk-4.5-linux64/bin:/home/louis/pebble-dev/pebble-sdk-4.5-linux64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/wsl/lib:/mnt/c/Program Files/WindowsApps/Microsoft.WindowsTerminal_1.15.2874.0_x64__8wekyb3d8bbwe:/mnt/c/Program Files/Python310/Scripts/:/mnt/c/Program Files/Python310/:/mnt/c/Program Files/Python38/Scripts/:/mnt/c/Program Files/Python38/:/mnt/c/Program Files/Python39/Scripts/:/mnt/c/Program Files/Python39/:/mnt/c/ProgramData/Oracle/Java/javapath:/mnt/c/WINDOWS/system32:/mnt/c/WINDOWS:/mnt/c/WINDOWS/System32/Wbem:/mnt/c/WINDOWS/System32/WindowsPowerShell/v1.0/:/mnt/c/Program Files (x86)/PuTTY/:/mnt/c/WINDOWS/System32/OpenSSH/:/mnt/c/Program Files/nodejs/:/mnt/c/Program Files/Git/cmd:/mnt/c/Program Files/Microsoft VS Code/bin:/mnt/c/Python27/:/mnt/c/Python27/Scripts/:/mnt/c/Program Files (x86)/NVIDIA Corporation/PhysX/Common:/mnt/c/Program Files/NVIDIA Corporation/NVIDIA NvDLISR:/mnt/c/Program Files/Calibre2/:/mnt/c/Users/Sandy/scoop/shims:/mnt/c/Users/Sandy/AppData/Local/Microsoft/WindowsApps:/mnt/c/Users/Sandy/AppData/Local/Programs/radare2:/mnt/c/Users/Sandy/AppData/Roaming/npm:/snap/bin', 'LIBGL_ALWAYS_INDIRECT': '1', 'HOME': '/home/louis', 'WT_SESSION': '35568b07-b500-40de-a6ad-f80f0f72b31c', 'DISPLAY': '172.27.224.1:0', '_': '/home/louis/pebble-dev/pebble-sdk-4.5-linux64/.env/bin/python', 'LANG': 'C.UTF-8', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'LESSCLOSE': '/usr/bin/lesspipe %s %s', 'NAME': 'DESKTOP-PSQDLD8', 'XDG_DATA_DIRS': '/usr/local/share:/usr/share:/var/lib/snapd/desktop', 'OLDPWD': '/home/louis', 'PYTHONHOME': '/home/louis/.pebble-sdk/SDKs/current/sdk-core/../.env', 'NODE_PATH': '/home/louis/.pebble-sdk/SDKs/current/sdk-core/../node_modules', 'WT_PROFILE_ID': '{c6eaf9f4-32a7-5fdc-b5cf-066e8a4b1e40}', 'SHLVL': '2', 'PWD': '/home/louis/repos/Pebble-Watchface-Day-and-Night-Earth-Connection-master', 'WSLENV': 'WT_SESSION::WT_PROFILE_ID', 'LS_COLORS': 'rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:', 'PHONESIM_PATH': '/home/louis/pebble-dev/pebble-sdk-4.5-linux64/.env//bin/pypkjs', 'NOCLIMB': '1'}

+files = ['/mnt/c/Users/Sandy/repos/Pebble-Watchface-Day-and-Night-Earth-Connection-master/wscript']

+hash = -5198275514520904974

+options = {'files': '', 'jobs': 4, 'verbose': 0, 'nocache': False, 'progress_bar': 0, 'no_groups': False, 'distcheck_args': None, 'top': '', 'sandbox': False, 'destdir': '', 'keep': 0, 'zones': '', 'debug': False, 'prefix': '/usr/local/', 'timestamp': None, 'download': False, 'force': False, 'targets': '', 'out': ''}

+out_dir = '/mnt/c/Users/Sandy/repos/Pebble-Watchface-Day-and-Night-Earth-Connection-master/build'

+run_dir = '/mnt/c/Users/Sandy/repos/Pebble-Watchface-Day-and-Night-Earth-Connection-master'

+top_dir = '/mnt/c/Users/Sandy/repos/Pebble-Watchface-Day-and-Night-Earth-Connection-master'

new file mode 100644

@@ -0,0 +1,3 @@

+{

+    "C_Cpp.errorSquiggles": "Disabled"

+}

\ No newline at end of file

new file mode 100644

Binary files /dev/null and b/build/Pebble-Watchface-Day-and-Night-Earth-Connection-master.pbw differ

@@ -9,8 +9,7 @@

         "messageKeys": [],

         "projectType": "native",

         "resources": {

-            "media": [

-                {

+            "media": [{

                     "file": "images/menu_icon.png",

                     "menuIcon": true,

                     "name": "IMAGE_MENU_ICON",

@@ -39,7 +38,6 @@

         },

         "sdkVersion": "3",

         "targetPlatforms": [

-            "diorite",

             "aplite"

         ],

         "uuid": "892e12bc-7a3e-411c-ba97-daa492f91088",

@@ -48,4 +46,4 @@

         }

     },

     "version": "2.1.0"

-}

+}

\ No newline at end of file

@@ -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) {