gv_fsm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b717895ae52d4a28c56c12944e18db81886463858bd42d9507a6cbb3c1309e
-  data.tar.gz: f929706aace8b53639fdd8e67aa3096be88994c551266d4c7805196144595e26
+  metadata.gz: 9cdb522af0bd9bac3a853e75ad379b063657a6bd21ceb2fcad80c427ca6c00ed
+  data.tar.gz: 350cd6c0dbdbe1e3ff03f8e26eda97b16be7764dc7f5c244a98b3e0997d50b3a
 SHA512:
-  metadata.gz: a807c54fa79bda61a07df1fee06b8dac62d193d92eb7e056a44c56b144fd008f63e983b0ea28e18d1a7008637a5cf5c64dd21a430f5133cb03f8ca62a75af021
-  data.tar.gz: 6c471ada43c67ef29bdf12d7797b8f4d4bd23aa4e37bcc78ff7e56f0c91657c01066bec2ee5ee5d64a8c5ce0ac50845c4a156e7cf5ebc5d2af28413d25be3a40
+  metadata.gz: 2b623ee5a2d45345ff3ab13db5605ffa978b30add3b0ca912588d531fbf81f13b3f5a3210b02bbcee29e736115a10b936201e57828635d81c9c2c82eec869e74
+  data.tar.gz: bc2584dfcc1025b41499bc66ff85113eb2b440031467e1ac74a44450717cc48850cc4c35cfe8594262b59ac6d3e0164c766f439aa9f8eaf6e36e6cdc790262d9

data/bin/gv_fsm

@@ -11,6 +11,7 @@ OptionParser.new do |parser|
   Graphviz to Finite State Machine generator
   Version: #{GV_FSM::VERSION}
   See also https://github.com/pbosetti/gv_fsm
+  
   Usage: gv_fsm [options] scheme.dot
   EOB
 
@@ -50,3 +51,5 @@ if options[:source] then
   sm.generate_c 
   puts "Generated source #{sm.cname}.c"
 end
+
+

data/lib/gv_fsm.rb

@@ -31,6 +31,7 @@ module GV_FSM
         g.each_edge do |e|
           from = e.node_one
           to = e.node_two
+          next unless e[:label]
           case e[:label].source
           when ""
             label = nil
@@ -82,6 +83,15 @@ module GV_FSM
       return dest
     end
 
+    def transitions_paths
+      path = {}
+      @transitions.each do |t|
+        path[t[:function]] = [] unless path[t[:function]]
+        path[t[:function]] << {from: t[:from], to: t[:to]}
+      end
+      return path
+    end
+
     def generate_c(filename = @cname)
       File.open("#{filename}.c", "w") do |f|
         f.puts ERB.new(HEADER, 0, "<>").result(binding)

data/lib/templates.rb

@@ -41,17 +41,18 @@ module GV_FSM
       state_t <%= s[:function] %>(void *data);
       <% end %>
 
+      // List of state functions
+      state_func_t *const state_table[NUM_STATES] = {
+        <%= self.state_functions_list.join(",\n  ")%>
+      };
+      
+      <% if self.transition_functions_list.count > 0 then %>
       // transition functions
       <% self.transition_functions_list.each do |t| %>
       <% next if t == "NULL" %>
       void <%= t %>(void *data);
       <% end %>
 
-      // List of state functions
-      state_func_t *const state_table[NUM_STATES] = {
-        <%= self.state_functions_list.join(",\n  ")%>
-      };
-
       // Table of transition functions
       transition_func_t *const transition_table[NUM_STATES][NUM_STATES] = {
       <% sl = self.states_list %>
@@ -62,6 +63,9 @@ module GV_FSM
         /* <%= sl[i].ljust(sw) %> */ {<%= l.map {|e| e.ljust(fw)}.join(", ") %>}, 
       <% end %>
       };
+      <% else %>
+      // No transition functions
+      <% end %>
 
       // state manager
       state_t run_state(state_t cur_state, void *data);
@@ -73,7 +77,18 @@ module GV_FSM
       #include <syslog.h>
       #include "<%= self.cname %>.h"
       
-      // State functions
+      //  ____  _        _       
+      // / ___|| |_ __ _| |_ ___ 
+      // \\___ \\| __/ _` | __/ _ \\
+      //  ___) | || (_| | ||  __/
+      // |____/ \\__\\__,_|\\__\\___|
+      //                         
+      //   __                  _   _                 
+      //  / _|_   _ _ __   ___| |_(_) ___  _ __  ___ 
+      // | |_| | | | '_ \\ / __| __| |/ _ \\| '_ \\/ __|
+      // |  _| |_| | | | | (__| |_| | (_) | | | \\__ \\
+      // |_|  \\__,_|_| |_|\\___|\\__|_|\\___/|_| |_|___/
+      //                                             
       <% dest = self.destinations.dup %>
       <% self.states.each do |s| %>
       <% stable = true if dest[s[:id]].include? s[:id] %>
@@ -81,6 +96,7 @@ module GV_FSM
       <% if dest[s[:id]].empty? or stable then
         dest[s[:id]].unshift "NO_CHANGE"
       end %>
+      // To be executed in state <%= s[:id] %>
       state_t <%= s[:function] %>(void *data) {
         state_t next_state = <%= dest[s[:id]].first %>;
 
@@ -102,22 +118,54 @@ module GV_FSM
 
       <% end %>
 
-      // Transition functions
+      <% if self.transition_functions_list.count > 0 then %>
+      //  _____                    _ _   _              
+      // |_   _| __ __ _ _ __  ___(_) |_(_) ___  _ __   
+      //   | || '__/ _` | '_ \\/ __| | __| |/ _ \\| '_ \\  
+      //   | || | | (_| | | | \\__ \\ | |_| | (_) | | | | 
+      //   |_||_|  \\__,_|_| |_|___/_|\\__|_|\\___/|_| |_| 
+      //                                                
+      //   __                  _   _                 
+      //  / _|_   _ _ __   ___| |_(_) ___  _ __  ___ 
+      // | |_| | | | '_ \\ / __| __| |/ _ \\| '_ \\/ __|
+      // |  _| |_| | | | | (__| |_| | (_) | | | \\__ \\
+      // |_|  \\__,_|_| |_|\\___|\\__|_|\\___/|_| |_|___/
+      //    
+                                               
       <% self.transition_functions_list.each do |t| %>
       <% next if t == "NULL" %>
+      // This function is called in transitions:
+      <% self.transitions_paths[t].each do |e| %>
+      // from <%= e[:from] %> to <%= e[:to] %>
+      <% end %>
       void <%= t %>(void *data) {
         syslog(LOG_INFO, "[FSM] State transition <%= t %>");
         /* Your code here */
       }
 
       <% end %>
+      <% end %>
+
+      //  ____  _        _        
+      // / ___|| |_ __ _| |_ ___  
+      // \\___ \\| __/ _` | __/ _ \\ 
+      //  ___) | || (_| | ||  __/ 
+      // |____/ \\__\\__,_|\\__\\___| 
+      //                          
+      //                                              
+      //  _ __ ___   __ _ _ __   __ _  __ _  ___ _ __ 
+      // | '_ ` _ \\ / _` | '_ \\ / _` |/ _` |/ _ \\ '__|
+      // | | | | | | (_| | | | | (_| | (_| |  __/ |   
+      // |_| |_| |_|\\__,_|_| |_|\\__,_|\\__, |\\___|_|   
+      //                              |___/           
 
-      // State manager
       state_t run_state(state_t cur_state, void *data) {
         state_t new_state = state_table[cur_state](data);
+      <% if self.transition_functions_list.count > 0 then %>
         transition_func_t *transition = transition_table[cur_state][new_state];
         if (transition)
           transition(data);
+      <% end %>
         return new_state == NO_CHANGE ? cur_state : new_state;
       };
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module GV_FSM
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gv_fsm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paolo Bosetti