@@ -1,4 +1,4 @@

-wscript

+# removed ignoring of wscript as needed to compile

 # Ignore swap files

 *.swp

Binary files a/build/agenda_sommeil.pbw and b/build/agenda_sommeil.pbw differ

@@ -1,13 +1,14 @@

 #include <pebble.h>

+#define ACCEL_STEP_MS 300000

 static Window *s_window;

-static StatusBarLayer *s_status_text_layer;

+static TextLayer *s_main_text_layer;

+/*static StatusBarLayer *s_status_text_layer;

 static TextLayer *s_upperleft_text_layer;

 static TextLayer *s_upperright_text_layer;

-static TextLayer *s_main_text_layer;

 static TextLayer *s_lowerleft_text_layer;

 static TextLayer *s_lowerright_text_layer;

-static TextLayer *s_lower_text_layer;

+static TextLayer *s_lower_text_layer;*/

 // Largest expected inbox and outbox message sizes

 const uint32_t inbox_size = 150;

@@ -15,16 +16,49 @@ const uint32_t outbox_size = 64;

 static uint32_t size ;

 static char s_status[4];

-static char s_msg[50];

+//static char s_msg[50];

 static bool s_js_ready;

 typedef enum {

   status,

-  event

+  x,

+  y,

+  z

 } AppKey;

+static void accel_data_handler(void *data) {

+  AccelData accel = (AccelData) { .x = 0, .y = 0, .z = 0 };

+  accel_service_peek(&accel);

+  APP_LOG(APP_LOG_LEVEL_INFO, "t: %llu, x: %d, y: %d, z: %d",accel.timestamp, accel.x , accel.y, accel.z);

+  

+  APP_LOG(APP_LOG_LEVEL_INFO, "size of timestamp : %u",sizeof(accel.timestamp));

+  

+  // Declare the dictionary's iterator

+  DictionaryIterator *out_iter;

+

+  // Prepare the outbox buffer for this message

+  AppMessageResult result = app_message_outbox_begin(&out_iter);

+

+  if(result == APP_MSG_OK) {

+    dict_write_cstring(out_iter, status, "position");

+    dict_write_int16(out_iter, x, accel.x);

+    dict_write_int16(out_iter, y, accel.y);

+    dict_write_int16(out_iter, z, accel.z);

+

+  // Send this message

+    result = app_message_outbox_send();

+    if(result != APP_MSG_OK) {

+      APP_LOG(APP_LOG_LEVEL_ERROR, "Error sending the outbox: %d", (int)result);

+    }

+  } else {

+    // The outbox cannot be used right now

+    APP_LOG(APP_LOG_LEVEL_ERROR, "Error preparing the outbox: %d", (int)result);

+  }

+  app_timer_register(ACCEL_STEP_MS, accel_data_handler, NULL);

+}

+

 static void send_message(char * msg){

   // Declare the dictionary's iterator

@@ -187,6 +221,11 @@ static void prv_init(void) {

   app_message_register_outbox_sent(outbox_sent_callback);

   // Register to be notified about outbox failed events

   app_message_register_outbox_failed(outbox_failed_callback);

+  

+  accel_data_service_subscribe(0, NULL);

+

+  app_timer_register(1000, accel_data_handler, NULL);

+

   s_window = window_create();

@@ -4,11 +4,6 @@ var clay = new Clay(clayConfig, null, { autoHandleEvents: false });

 var messageKeys = require('message_keys');

 var message;

-var locate_me

-

-var firstlocationInterval = false;

-var locationInterval = false;

-var instantLocationInterval = false;

 Pebble.addEventListener('showConfiguration', function(e) {

@@ -44,7 +39,34 @@ Pebble.addEventListener('webviewclosed', function(t) {

     }

 });

-function PostToWeb(event) {

+function PostPosition(x,y,z){

+    console.log(localStorage.getItem('clay-settings'))

+    var url = JSON.parse(localStorage.getItem('clay-settings')).web_url + "?event=position&user="+JSON.parse(localStorage.getItem('clay-settings')).username+"&x="+x+"&y="+y+"&z="+z;

+    console.log(url)

+    var xhr = new XMLHttpRequest();

+    xhr.timeout = 10000; // time in milliseconds

+    xhr.open("GET", url, false);

+    //console.log('------ CSV / xhr opened')

+    xhr.onload = function() {

+        //console.log('------xhr onloaded')

+        if (xhr.readyState === 4) {

+            //console.log('------xhr request returned with ' + xhr.status);

+            //console.log(this.responseText);

+            //localStorage.setItem("custom_uploaded", true);

+            if (xhr.status == 200) {

+                //console.log('--> HTTP 200');

+                return true;

+            } else {

+                //console.log('--> HTTP ' + xhr.status);

+                return false;

+            }

+        }

+    };

+

+  //send xhr without body (GET)

+  xhr.send();

+}

+function PostEvent(event) {

     console.log(localStorage.getItem('clay-settings'))

     var url = JSON.parse(localStorage.getItem('clay-settings')).web_url + "?event="+event+"&user="+JSON.parse(localStorage.getItem('clay-settings')).username;

     var xhr = new XMLHttpRequest();

@@ -101,18 +123,24 @@ Pebble.addEventListener('ready', function(e) {

 Pebble.addEventListener('appmessage', function (e) {

     // Get the dictionary from the message

     var dict = e.payload;

-    //console.log(dict[0].toString());

+    for (var i in dict){

+        console.log(i +": "+dict[i].toString());

+    }

+    

     switch (dict[0]) {

+        case 'position':

+            PostPosition(dict[1],dict[2],dict[3])

+            break;

         case 'gotosleep':

-            PostToWeb("gotosleep")

+            PostEvent("gotosleep")

             break;

         case 'awake':   

-            PostToWeb("awake")

+        PostEvent("awake")

             break;

         case 'wakeup':   

-            PostToWeb("wakeup")  

+        PostEvent("wakeup")  

             break;

-      default:

+    default:

         console.log('Sorry. I don\'t understand your request :' + dict[0]);

     }

new file mode 100644

@@ -0,0 +1,54 @@

+#

+# This file is the default set of rules to compile a Pebble application.

+#

+# Feel free to customize this to your needs.

+#

+import os.path

+

+top = '.'

+out = 'build'

+

+

+def options(ctx):

+    ctx.load('pebble_sdk')

+

+

+def configure(ctx):

+    """

+    This method is used to configure your build. ctx.load(`pebble_sdk`) automatically configures

+    a build for each valid platform in `targetPlatforms`. Platform-specific configuration: add your

+    change after calling ctx.load('pebble_sdk') and make sure to set the correct environment first.

+    Universal configuration: add your change prior to calling ctx.load('pebble_sdk').

+    """

+    ctx.load('pebble_sdk')

+

+

+def build(ctx):

+    ctx.load('pebble_sdk')

+

+    build_worker = os.path.exists('worker_src')

+    binaries = []

+

+    cached_env = ctx.env

+    for platform in ctx.env.TARGET_PLATFORMS:

+        ctx.env = ctx.all_envs[platform]

+        ctx.set_group(ctx.env.PLATFORM_NAME)

+        app_elf = '{}/pebble-app.elf'.format(ctx.env.BUILD_DIR)

+        ctx.pbl_build(source=ctx.path.ant_glob('src/c/**/*.c'), target=app_elf, bin_type='app')

+

+        if build_worker:

+            worker_elf = '{}/pebble-worker.elf'.format(ctx.env.BUILD_DIR)

+            binaries.append({'platform': platform, 'app_elf': app_elf, 'worker_elf': worker_elf})

+            ctx.pbl_build(source=ctx.path.ant_glob('worker_src/c/**/*.c'),

+                          target=worker_elf,

+                          bin_type='worker')

+        else:

+            binaries.append({'platform': platform, 'app_elf': app_elf})

+    ctx.env = cached_env

+

+    ctx.set_group('bundle')

+    ctx.pbl_bundle(binaries=binaries,

+                   js=ctx.path.ant_glob(['src/pkjs/**/*.js',

+                                         'src/pkjs/**/*.json',

+                                         'src/common/**/*.js']),

+                   js_entry_file='src/pkjs/index.js')