bindings: cxx: examples: consistency cleanup

A collection of minor changes to be more consistent with other examples:
 - capitalize comments
 - add line offset to value outputs
 - drop comma from edge event outputs
 - drop trailing return where example loops indefintely
 - sort includes

Signed-off-by: Kent Gibson <warthog618@gmail.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/bindings/cxx/examples/async_watch_line_value.cpp b/bindings/cxx/examples/async_watch_line_value.cpp
index e1d4a1e42971f80a2b9de3f7ca73fb3321409980..d8317a5c81a02d51a6dd8b94b005d72cca1ce2a9 100644 (file)
--- a/bindings/cxx/examples/async_watch_line_value.cpp
+++ b/bindings/cxx/examples/async_watch_line_value.cpp
@@ -7,6 +7,7 @@
 #include <cstring>
 #include <filesystem>
 #include <gpiod.hpp>
+#include <iomanip>
 #include <iostream>
 #include <poll.h>
 
@@ -79,10 +80,9 @@ int main(void)
 
                for (const auto& event : buffer)
                        ::std::cout << "offset: " << event.line_offset()
-                                   << ", type: " << edge_event_type_str(event)
-                                   << ", event #" << event.line_seqno()
+                                   << "  type: " << ::std::setw(7)
+                                   << ::std::left << edge_event_type_str(event)
+                                   << "  event #" << event.line_seqno()
                                    << ::std::endl;
        }
-
-       return EXIT_SUCCESS;
 }

diff --git a/bindings/cxx/examples/get_line_value.cpp b/bindings/cxx/examples/get_line_value.cpp
index 8f4e739af3873c5e2fd17625ca48174c643b2f0b..a14d7e4aca5428beae7d35837b5b5f65831116df 100644 (file)
--- a/bindings/cxx/examples/get_line_value.cpp
+++ b/bindings/cxx/examples/get_line_value.cpp
@@ -10,7 +10,7 @@
 
 namespace {
 
-/* example configuration - customize to suit your situation */
+/* Example configuration - customize to suit your situation */
 const ::std::filesystem::path chip_path("/dev/gpiochip0");
 const ::gpiod::line::offset line_offset = 5;
 
@@ -18,17 +18,21 @@ const ::gpiod::line::offset line_offset = 5;
 
 int main(void)
 {
-       auto request =
-               ::gpiod::chip(chip_path)
-                       .prepare_request()
-                       .set_consumer("get-line-value")
-                       .add_line_settings(
-                               line_offset,
-                               ::gpiod::line_settings().set_direction(
-                                       ::gpiod::line::direction::INPUT))
-                       .do_request();
-
-       ::std::cout << request.get_value(line_offset) << ::std::endl;
+       auto request = ::gpiod::chip(chip_path)
+                              .prepare_request()
+                              .set_consumer("get-line-value")
+                              .add_line_settings(
+                                      line_offset,
+                                      ::gpiod::line_settings().set_direction(
+                                              ::gpiod::line::direction::INPUT))
+                              .do_request();
+
+       ::std::cout << line_offset << "="
+                   << (request.get_value(line_offset) ==
+                                       ::gpiod::line::value::ACTIVE ?
+                               "Active" :
+                               "Inactive")
+                   << ::std::endl;
 
        return EXIT_SUCCESS;
 }

diff --git a/bindings/cxx/examples/toggle_line_value.cpp b/bindings/cxx/examples/toggle_line_value.cpp
index a060e8a9f318d80f4df35eeb138c7317ff500b71..a17b43b9846cae114d49c1ac462298eba0e9a46a 100644 (file)
--- a/bindings/cxx/examples/toggle_line_value.cpp
+++ b/bindings/cxx/examples/toggle_line_value.cpp
@@ -6,8 +6,8 @@
 #include <cstdlib>
 #include <chrono>
 #include <filesystem>
-#include <iostream>
 #include <gpiod.hpp>
+#include <iostream>
 #include <thread>
 
 namespace {
@@ -19,15 +19,15 @@ const ::gpiod::line::offset line_offset = 5;
 ::gpiod::line::value toggle_value(::gpiod::line::value v)
 {
        return (v == ::gpiod::line::value::ACTIVE) ?
-                       ::gpiod::line::value::INACTIVE :
-                       ::gpiod::line::value::ACTIVE;
+                      ::gpiod::line::value::INACTIVE :
+                      ::gpiod::line::value::ACTIVE;
 }
 
 } /* namespace */
 
 int main(void)
 {
-       ::gpiod::line::value val = ::gpiod::line::value::ACTIVE;
+       ::gpiod::line::value value = ::gpiod::line::value::ACTIVE;
 
        auto request =
                ::gpiod::chip(chip_path)
@@ -40,12 +40,10 @@ int main(void)
                        .do_request();
 
        for (;;) {
-               ::std::cout << val << ::std::endl;
+               ::std::cout << line_offset << "=" << value << ::std::endl;
 
                std::this_thread::sleep_for(std::chrono::seconds(1));
-               val = toggle_value(val);
-               request.set_value(line_offset, val);
+               value = toggle_value(value);
+               request.set_value(line_offset, value);
        }
-
-       return EXIT_SUCCESS;
 }

diff --git a/bindings/cxx/examples/watch_line_value.cpp b/bindings/cxx/examples/watch_line_value.cpp
index 5436884c5de3b9f97c22acf6d455ca4851bc33d9..5055789b53ef2f072c53afa352379f534015de93 100644 (file)
--- a/bindings/cxx/examples/watch_line_value.cpp
+++ b/bindings/cxx/examples/watch_line_value.cpp
@@ -6,6 +6,7 @@
 #include <cstdlib>
 #include <filesystem>
 #include <gpiod.hpp>
+#include <iomanip>
 #include <iostream>
 
 namespace {
@@ -18,7 +19,7 @@ const char *edge_event_type_str(const ::gpiod::edge_event &event)
 {
        switch (event.type()) {
        case ::gpiod::edge_event::event_type::RISING_EDGE:
-               return "Rising ";
+               return "Rising";
        case ::gpiod::edge_event::event_type::FALLING_EDGE:
                return "Falling";
        default:
@@ -61,11 +62,10 @@ int main(void)
                request.read_edge_events(buffer);
 
                for (const auto &event : buffer)
-                       ::std::cout << "offset: " << event.line_offset()
-                                   << ", type: " << edge_event_type_str(event)
-                                   << ", event #" << event.line_seqno()
+                       ::std::cout << "line: " << event.line_offset()
+                                   << "  type: " << ::std::setw(7)
+                                   << ::std::left << edge_event_type_str(event)
+                                   << "  event #" << event.line_seqno()
                                    << ::std::endl;
        }
-
-       return EXIT_SUCCESS;
 }