You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2017/03/17 19:53:59 UTC

[1/2] incubator-mynewt-core git commit: MYNEWT-676 - Oops, fix broken apps.

Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/develop d1f00e95a -> d7a9e96a9


MYNEWT-676 - Oops, fix broken apps.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/f23fbe77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f23fbe77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f23fbe77

Branch: refs/heads/develop
Commit: f23fbe77dabe3226359c7790bbdd3d7847ee9a0a
Parents: d1f00e9
Author: Christopher Collins <cc...@apache.org>
Authored: Fri Mar 17 12:23:58 2017 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Fri Mar 17 12:23:58 2017 -0700

----------------------------------------------------------------------
 apps/sensors_test/src/main.c   | 2 +-
 apps/slinky/src/main.c         | 2 +-
 apps/slinky_oic/src/main.c     | 2 +-
 apps/splitty/src/main.c        | 2 +-
 apps/testbench/src/testbench.c | 2 +-
 apps/testbench/src/testbench.h | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f23fbe77/apps/sensors_test/src/main.c
----------------------------------------------------------------------
diff --git a/apps/sensors_test/src/main.c b/apps/sensors_test/src/main.c
index 8ecbccd..ac694be 100755
--- a/apps/sensors_test/src/main.c
+++ b/apps/sensors_test/src/main.c
@@ -46,7 +46,7 @@
 #include <assert.h>
 #include <string.h>
 #include <flash_test/flash_test.h>
-#include <reboot/reboot_start.h>
+#include <reboot/log_reboot.h>
 #include <os/os_time.h>
 #include <id/id.h>
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f23fbe77/apps/slinky/src/main.c
----------------------------------------------------------------------
diff --git a/apps/slinky/src/main.c b/apps/slinky/src/main.c
index 2e74801..d0fd099 100755
--- a/apps/slinky/src/main.c
+++ b/apps/slinky/src/main.c
@@ -41,7 +41,7 @@
 #include <assert.h>
 #include <string.h>
 #include <flash_test/flash_test.h>
-#include <reboot/reboot_start.h>
+#include <reboot/log_reboot.h>
 #include <os/os_time.h>
 #include <id/id.h>
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f23fbe77/apps/slinky_oic/src/main.c
----------------------------------------------------------------------
diff --git a/apps/slinky_oic/src/main.c b/apps/slinky_oic/src/main.c
index 115fa33..d606295 100755
--- a/apps/slinky_oic/src/main.c
+++ b/apps/slinky_oic/src/main.c
@@ -37,7 +37,7 @@
 #include <oic/oc_api.h>
 #include <assert.h>
 #include <string.h>
-#include <reboot/reboot_start.h>
+#include <reboot/log_reboot.h>
 #include <os/os_time.h>
 
 #ifdef ARCH_sim

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f23fbe77/apps/splitty/src/main.c
----------------------------------------------------------------------
diff --git a/apps/splitty/src/main.c b/apps/splitty/src/main.c
index 6362187..80bcd54 100755
--- a/apps/splitty/src/main.c
+++ b/apps/splitty/src/main.c
@@ -34,7 +34,7 @@
 #include <imgmgr/imgmgr.h>
 #include <assert.h>
 #include <string.h>
-#include <reboot/reboot_start.h>
+#include <reboot/log_reboot.h>
 #include <os/os_time.h>
 #include <id/id.h>
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f23fbe77/apps/testbench/src/testbench.c
----------------------------------------------------------------------
diff --git a/apps/testbench/src/testbench.c b/apps/testbench/src/testbench.c
index 5345d6f..19b0ebf 100644
--- a/apps/testbench/src/testbench.c
+++ b/apps/testbench/src/testbench.c
@@ -43,7 +43,7 @@
 #include <assert.h>
 #include <string.h>
 #include <json/json.h>
-#include <reboot/reboot_start.h>
+#include <reboot/log_reboot.h>
 #include <os/os_time.h>
 #include <id/id.h>
 #include <os/os_eventq.h>

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f23fbe77/apps/testbench/src/testbench.h
----------------------------------------------------------------------
diff --git a/apps/testbench/src/testbench.h b/apps/testbench/src/testbench.h
index 8b39310..a94ee1c 100644
--- a/apps/testbench/src/testbench.h
+++ b/apps/testbench/src/testbench.h
@@ -46,7 +46,7 @@
 #include <assert.h>
 #include <string.h>
 #include <json/json.h>
-#include <reboot/reboot_start.h>
+#include <reboot/log_reboot.h>
 #include <os/os_time.h>
 #include <id/id.h>
 


[2/2] incubator-mynewt-core git commit: MYNEWT-677 NMP: Include next_index in log show rsp

Posted by cc...@apache.org.
MYNEWT-677 NMP: Include next_index in log show rsp

The next_index value (index of next log entry to be written) is useful
for determining if a device's flash has been wiped since the last time
logs were scoured.

The new value is at the top-level of the log show response with the
following name: next_index.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/d7a9e96a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/d7a9e96a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/d7a9e96a

Branch: refs/heads/develop
Commit: d7a9e96a9f17270d371ce421697c4407b1647bf4
Parents: f23fbe7
Author: Christopher Collins <cc...@apache.org>
Authored: Fri Mar 17 12:51:11 2017 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Fri Mar 17 12:51:11 2017 -0700

----------------------------------------------------------------------
 sys/log/full/src/log_nmgr.c | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d7a9e96a/sys/log/full/src/log_nmgr.c
----------------------------------------------------------------------
diff --git a/sys/log/full/src/log_nmgr.c b/sys/log/full/src/log_nmgr.c
index 00beeba..8615fb7 100644
--- a/sys/log/full/src/log_nmgr.c
+++ b/sys/log/full/src/log_nmgr.c
@@ -279,6 +279,8 @@ log_nmgr_read(struct mgmt_cbuf *cb)
         return rc;
     }
 
+    g_err |= cbor_encode_text_stringz(&cb->encoder, "next_index");
+    g_err |= cbor_encode_int(&cb->encoder, g_log_info.li_next_index);
 
     g_err |= cbor_encode_text_stringz(&cb->encoder, "logs");
     g_err |= cbor_encoder_create_array(&cb->encoder, &logs,