Bug fixes for 3.6.0

Author: tyler-gilbert

doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = StratifyAPI
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.5.0
+PROJECT_NUMBER         = 3.6.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -2157,7 +2157,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of
@@ -2199,7 +2199,7 @@ DOT_FONTPATH           =
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-CLASS_GRAPH            = NO
+CLASS_GRAPH            = YES
 
 # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
 # graph for each documented class showing the direct and indirect implementation
@@ -2215,15 +2215,15 @@ COLLABORATION_GRAPH    = NO
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-GROUP_GRAPHS           = NO
+GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-UML_LOOK               = NO
+UML_LOOK               = YES
 
 # If the UML_LOOK tag is enabled, the fields and methods are shown inside the
 # class node. If there are many fields or methods and many nodes the graph may
@@ -2236,15 +2236,15 @@ UML_LOOK               = NO
 # Minimum value: 0, maximum value: 100, default value: 10.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-UML_LIMIT_NUM_FIELDS   = 10
+UML_LIMIT_NUM_FIELDS   = 6
 
 # If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
 # collaboration graphs will show the relations between templates and their
 # instances.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-TEMPLATE_RELATIONS     = NO
+TEMPLATE_RELATIONS     = YES
 
 # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
 # YES then doxygen will generate a graph for each documented file showing the
@@ -2293,7 +2293,7 @@ CALLER_GRAPH           = NO
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-GRAPHICAL_HIERARCHY    = NO
+GRAPHICAL_HIERARCHY    = YES
 
 # If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
 # dependencies a directory has on other directories in a graphical way. The
@@ -2329,7 +2329,7 @@ DOT_IMAGE_FORMAT       = svg
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-INTERACTIVE_SVG        = NO
+INTERACTIVE_SVG        = YES
 
 # The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
@@ -2379,7 +2379,7 @@ PLANTUML_INCLUDE_PATH  =
 # Minimum value: 0, maximum value: 10000, default value: 50.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_GRAPH_MAX_NODES    = 15
+DOT_GRAPH_MAX_NODES    = 100
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
 # generated by dot. A depth value of 3 means that only nodes reachable from the
@@ -2391,7 +2391,7 @@ DOT_GRAPH_MAX_NODES    = 15
 # Minimum value: 0, maximum value: 1000, default value: 0.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-MAX_DOT_GRAPH_DEPTH    = 3
+MAX_DOT_GRAPH_DEPTH    = 50
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
 # background. This is disabled by default, because dot on Windows does not seem

include/hal/I2C.hpp

@@ -199,6 +199,9 @@ class I2C : public Periph<i2c_info_t, i2c_attr_t, 'i'> {
     int get_error() const;
 
     //deprecated
+#if !defined __link
+    [[deprecated("use get_error()")]]
+#endif
     int get_err() const { return get_error(); }
 
 	/*! \details Sets the attributes of the I2C bus.

include/sys/File.hpp

@@ -305,15 +305,13 @@ class File : public api::SObject {
 	/*! \details Seeks to a location in the file or on the device. */
 	virtual int seek(int loc, int whence = LINK_SEEK_SET) const;
 
-
-	/*! \details Reads up to n-1 bytes to \a s until end-of-file or \a term is reached.  */
-	char * gets(char * s, int n, char term = '\n') const;
+    /*! \details Reads a line in to the var::String until end-of-file or \a term is reached. */
+    char * gets(var::String & s, char term = '\n') const;
 
 #ifndef __link
-	/*! \details Reads a line in to the var::String until end-of-file or \a term is reached. */
-	char * gets(var::String & s, char term = '\n') const { return gets(s.cdata(), s.capacity(), term); }
+    [[deprecated("Use gets(var::String & s) instead")]]
 #endif
-
+    char * gets(char * s, int n, char term = '\n') const;
 
 #ifdef __link
 	void set_driver(link_transport_mdriver_t * d){ m_driver = d; }

include/ui/EventLoop.hpp

@@ -72,6 +72,9 @@ class EventLoop: public ev::EventLoop {
     /*! \details Updates the drawing attributes. */
 	void set_drawing_attr(const draw::DrawingAttr & attr){ m_drawing_attr = attr; }
 
+    virtual Element * catch_null_handler(Element * last_element){ return 0; }
+
+
     static Element * handle_event(Element * current_element, const Event & event, const draw::DrawingAttr & drawing_attr, EventLoop * event_loop = 0);
     static void handle_transition(Element * current_element, Element * next_element, const draw::DrawingAttr & drawing_attr);
 

include/var/String.hpp

@@ -275,17 +275,17 @@ class String : public Data {
     bool empty() const { return size() == 0; }
 
 	/*! \details Assigns a substring of \a a to string. */
-	void assign(const char * a, u32 subpos, u32 sublen){ assign(a + subpos, sublen); }
+    int assign(const char * a, u32 subpos, u32 sublen){ return assign(a + subpos, sublen); }
 	/*! \details Assigns a maximum of \a n characters of \a a to string. */
-	void assign(const char * a, u32 n);
+    int assign(const char * a, u32 n);
 	/*! \details Assigns \a a (zero terminated) to string.  */
-	void assign(const char * a);
+    int assign(const char * a);
 	/*! \details Appends \a a (zero terminated) to string.  */
-	void append(const char * a);
+    int append(const char * a);
 	/*! \details Appends \a c to string.  */
-	void append(char c);
+    int append(char c);
 	/*! \details Appends \a c to string.  */
-    void push_back(char c) { append(c); }
+    void push_back(char c){ append(c); }
 
 	/*! \details Copies the \a nth element (separated by \a sep) of the string to to \a dest. */
 	bool get_delimited_data(String & dest, int n, char sep = ',', char term = '\n');

src/api/SObject.cpp

@@ -4,6 +4,7 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <sos/link.h>
 
 #include "api/SObject.hpp"
 

src/sys/File.cpp

@@ -173,7 +173,7 @@ int File::close(){
 
 int File::read(void * buf, int nbyte) const {
 #if defined __link
-    return set_error_number_if_error( link_read(driver(), m_fd, buf, nbyte) );s
+    return set_error_number_if_error( link_read(driver(), m_fd, buf, nbyte) );
 #else
     return set_error_number_if_error( ::read(m_fd, buf, nbyte) );
 #endif
@@ -253,6 +253,19 @@ char * File::gets(char * s, int n, char term) const {
 
 }
 
+char * File::gets(var::String & s, char term) const {
+    int ret;
+    char c;
+    do {
+        ret = read(&c, 1);
+        if( ret > 0 ){
+            s.append(c);
+        }
+    } while( (c != term) && (ret > 0) );
+    return s.cdata();
+}
+
+
 const char * File::name(const char * path){
     int len;
     int i;

src/ui/EventLoop.cpp

@@ -60,6 +60,13 @@ bool EventLoop::handle_event(const Event & event){
     Element * tmp = current_element();
     tmp = handle_event(current_element(), event, drawing_attr(), this);
     if( tmp != current_element() ){
+        if( tmp == 0 ){
+            tmp = catch_null_handler(current_element());
+            if( tmp != 0 ){
+                tmp->set_event_loop(this);
+                handle_transition(current_element(), tmp, drawing_attr());
+            }
+        }
         set_current_element(tmp);
         return true;
     }

src/var/String.cpp

@@ -77,47 +77,51 @@ char String::at(u32 pos) const {
     return 0;
 }
 
-void String::assign(const char * a){
+int String::assign(const char * a){
     if( a == 0 ){
         clear();
-        return;
+        return 0;
     }
     u32 len = strlen(a);
-    assign(a, len);
+    return assign(a, len);
 }
 
-void String::assign(const char * a, u32 n){
+int String::assign(const char * a, u32 n){
     if( a != 0 ){
-
         if( n == (u32)npos ){
             n = strlen(a);
         }
-        set_capacity(n+1); //attempt to resize the object to at least n
+        if( set_capacity(n+1) < 0 ){
+            return -1;
+        }
         clear();
         strncpy(cdata(), a, n);
     } else {
         clear();
     }
+    return 0;
 }
 
-void String::append(const char * a){
-    if( a == 0 ){ return; }
+int String::append(const char * a){
+    if( a == 0 ){ return 0; }
     u32 len = size();
     u32 alen = strlen(a);
     set_capacity(len + alen); //try to make min capacity
     if( len == 0 ){
         clear(); //previous length was zero -- ensure string is valid
     }
-    if( cdata() == 0 ){ return; }
+    if( cdata() == 0 ){ return -1; }
     strncat(cdata(), a, capacity() - len);
+    return 0;
 }
 
-void String::append(char c){
+int String::append(char c){
     u32 len = size();
     u32 alen = 1;
     set_capacity(len + alen + 1); //try to make min capacity
-    if( cdata() == 0 ){ return; }
+    if( cdata() == 0 ){ return -1; }
     strncat(cdata(),&c,1);
+    return 0;
 }
 
 bool String::get_delimited_data(String & dest, int n, char sep, char term){