update

demo/arduino-uno/__codelite.workspace

@@ -1,69 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="example code" Database="" Version="10.0.0">
-  <Project Name="uno #0010 - empty" Path="uno #0010 - empty/_codelite.project" Active="No"/>
+  <Project Name="uno-#0010-empty" Path="uno-#0010-empty/_codelite.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0010 - empty" ConfigName="Release"/>
+      <Project Name="uno-#0010-empty" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
-  <Project Name="uno #0020 - two" Path="uno #0020 - two/_codelite.project" Active="No"/>
+  <Project Name="uno-#0020-two" Path="uno-#0020-two/_codelite.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0020 - two" ConfigName="Release"/>
+      <Project Name="uno-#0020-two" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
-  <Project Name="uno #0030 - blink - direct" Path="uno #0030 - blink - direct/_codelite.project" Active="No"/>
+  <Project Name="uno-#0030-blink-direct" Path="uno-#0030-blink-direct/_codelite.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0030 - blink - direct" ConfigName="Release"/>
+      <Project Name="uno-#0030-blink-direct" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
-  <Project Name="uno #0040 - blink - gpio" Path="uno #0040 - blink - gpio/_codelite.project" Active="No"/>
+  <Project Name="uno-#0040-blink-gpio" Path="uno-#0040-blink-gpio/_codelite.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0040 - blink - gpio" ConfigName="Release"/>
+      <Project Name="uno-#0040-blink-gpio" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
-  <Project Name="uno #0050 - blink - blink" Path="uno #0050 - blink - blink/_codelite.project" Active="No"/>
+  <Project Name="uno-#0050-blink-blink" Path="uno-#0050-blink-blink/_codelite.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0050 - blink - blink" ConfigName="Release"/>
+      <Project Name="uno-#0050-blink-blink" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
-  <Project Name="uno #0060 - uart - input" Path="uno #0060 - uart - input/_codelite.project" Active="No"/>
+  <Project Name="uno-#0060-uart-input" Path="uno-#0060-uart-input/_codelite.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0060 - uart - input" ConfigName="Release"/>
+      <Project Name="uno-#0060-uart-input" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
-  <Project Name="uno #0070 - lcd - x" Path="uno #0070 - lcd - x/_codelite.project" Active="No"/>
+  <Project Name="uno-#0070-lcd-16x2" Path="uno-#0070-lcd-16x2/_codelite.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0070 - lcd - x" ConfigName="Release"/>
+      <Project Name="uno-#0070-lcd-16x2" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
-  <Project Name="uno #0080 - lcd - x" Path="uno #0080 - lcd - x/_codelite.project" Active="Yes"/>
+  <Project Name="uno-#0080-lcd-scrolling-message" Path="uno-#0080-lcd-scrolling-message/_codelite.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0080 - lcd - x" ConfigName="Release"/>
+      <Project Name="uno-#0080-lcd-scrolling-message" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
-  <Project Name="uno #0090 - lcd - scrolling message" Path="uno #0090 - lcd - scrolling message/_codelite.project" Active="No"/>
+  <Project Name="uno-#0090-lcd-keypad-shield" Path="uno-#0090-lcd-keypad-shield/_codelite.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0090 - lcd - scrolling message" ConfigName="Release"/>
+      <Project Name="uno-#0090-lcd-keypad-shield" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
-  <Project Name="uno #0100 - lcd - keypad - shield" Path="uno #0100 - lcd - keypad - shield/_codelite.project" Active="No"/>
+  <Project Name="uno-#0100-pcfa8574a-lcd-16x2" Path="uno-#0100-pcfa8574a-lcd-16x2/_codelite.project" Active="Yes"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0100 - lcd - keypad - shield" ConfigName="Release"/>
-    </WorkspaceConfiguration>
-  </BuildMatrix>
-  <Project Name="uno #0110 - pcfa - lcd - x" Path="uno #0110 - pcfa - lcd - x/_codelite.project" Active="No"/>
-  <BuildMatrix>
-    <WorkspaceConfiguration Name="Release" Selected="yes">
-      <Project Name="uno #0110 - pcfa - lcd - x" ConfigName="Release"/>
+      <Project Name="uno-#0100-pcfa8574a-lcd-16x2" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
 </CodeLite_Workspace>

demo/arduino-uno/uno-#0060-uart-input/main.cpp

@@ -21,7 +21,7 @@ int main( void ){
       hwlib::cout 
          << "Type a character : " << hwlib::flush;
 
-      char c = hwlib::cin.getc();
+      char c = 'a'; // hwlib::cin.getc();
 
       hwlib::cout 
          << "\n   "

demo/arduino-uno/uno-#0090-lcd-keypad-shield/main.cpp

@@ -27,7 +27,7 @@ int main( void ){
     // select the LCD size.
     // the shield has a 2 x 16 LCD
     // auto lcd = hwlib::hd44780( rs, e, d, 1, 16 );  
-    auto lcd = hwlib::hd44780( rs, e, d, 2, 16 );  
+    auto lcd = hwlib::hd44780( rs, e, d, hwlib::xy( 16, 2 ) );  
     // auto lcd = hwlib::hd44780( rs, e, d, 4, 20 );  
     // auto lcd = hwlib::hd44780( rs, e, d, 2, 40 );  
 

demo/db103/db103-#0130-kitt-4x4/main.cpp → demo/db103/db103-#0130-kitt-4x3/main.cpp

@@ -28,23 +28,24 @@ int main( void ){
    auto p19 = hwlib::target::pin_out( 1, 9 );
    auto p18 = hwlib::target::pin_out( 1, 8 );
    auto p15 = hwlib::target::pin_out( 1, 5 );
+   auto pa = all( p19, p18, p15 );
+
    auto p14 = hwlib::target::pin_out( 1, 4 );
-
    auto p13 = hwlib::target::pin_out( 1, 3 );
    auto p12 = hwlib::target::pin_out( 1, 2 );
+   auto pb = all( p14, p13, p12 );
+
    auto p11 = hwlib::target::pin_out( 1, 1 );
    auto p10 = hwlib::target::pin_out( 1, 0 );
-
    auto p07 = hwlib::target::pin_out( 0, 7 );
+   auto pc = all( p11, p10, p07 );
+
    auto p06 = hwlib::target::pin_out( 0, 6 );
    auto sda = hwlib::target::pin_out{ 0, 5 };
    auto scl = hwlib::target::pin_out{ 0, 4 };
+   auto pd = all( p06, sda, scl );
 
-   auto leds = hwlib::port_out_from(
-      p19, p18, p15, p14,
-      p13, p12, p11, p10,
-      p07, p06, sda, scl
-   );
+   auto leds = hwlib::port_out_from( pa, pb, pc, pd );
 
    hwlib::kitt( leds, 50 );
 }

doxyfiles/texts/hwlib-doxygen-#0160-notes.hpp

@@ -73,6 +73,8 @@
 /// - check SPI for flush
 /// - check 595 buffering
 /// - add blue-pill documentation & picture
+/// - char stream mux / demux
+/// - ostream has format data *inside*: shouild be separate. raw_ostream?
 ///
 
 /*

library/char-io/hwlib-istream.hpp

@@ -58,5 +58,14 @@ class istream {
    }           
 
 }; // class istream
+
+/*
+ * class stream_demux : public istream {
+   istream & left;
+   istream & right;
+public:
+
+};
+*/
 
 }; // namespace hwlib

library/char-io/hwlib-ostream.hpp

@@ -217,8 +217,8 @@ constexpr _flush flush;
 /// Most formatting features of std::ostream are supported.
 /// Floating point values are not supported.
 /// 
-/// This class is abstract: a concrete subclass must implement putc()
-/// and, flush().
+/// This class is abstract: a concrete subclass 
+/// must implement putc() and flush().
 class ostream {
 private:
 

library/char-io/hwlib-stream-mux.hpp

@@ -0,0 +1,60 @@
+// ==========================================================================
+//
+// File      : hwlib-stream-mux.hpp
+// Part of   : C++ hwlib library for close-to-the-hardware OO programming
+// Copyright : [email protected] 2017-2019
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at 
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// ==========================================================================
+
+// included only via hwlib.hpp, hence no multiple-include guard is needed
+
+// this file contains Doxygen lines
+/// @file
+
+namespace hwlib {
+
+class ostream_prefix : ostream {
+private:
+
+   ostream & minion;
+   const char marker;
+
+public:
+
+   ostream_mux( ostream & minion, char marker ): 
+      minion( minion ), marker( marker )
+   {}
+
+   void putc( char c ) override {
+      minion.putc( marker );
+      minion.putc( c );
+   }
+
+   void flush() override {
+      minion.flush();
+   }
+
+}; // class ostream_prefix
+
+class istream_mux : ostream {
+private:
+
+   ostream & minion;
+
+public:
+
+   ostream_mux( ostream & minion ): minion( minion ){}
+
+   void putc( char x ) override {
+   }
+
+   void flush() override {
+   }
+
+}; // class ostream_mux
+
+}; // namespace hwlib

library/core/hwlib-spi.hpp

@@ -55,10 +55,10 @@ class spi_bus {
 
       spi_bus & bus;
 
-      pin_out & sel;
+      pin_direct_from_out_t sel;
 
-      spi_transaction( spi_bus & bus, pin_out & sel ):
-         bus( bus ), sel( sel )
+      spi_transaction( spi_bus & bus, pin_out & _sel ):
+         bus( bus ), sel( direct( _sel ))
       {
          sel.write( 0 );
       }

library/peripherals/hwlib-hc595.hpp

@@ -107,7 +107,7 @@ class hc595 : public port_out {
    }  
 
    void flush() override {
-      bus.transaction( sel ).write_and_read( 1, &write_buffer, nullptr ); 
+      bus.transaction( sel ).write( write_buffer ); 
    }
 
    /// the output pins of the chip