1. pywrap:

   - fix get_registers_list crash with bank != NULL
   - set correct python version in cmake install step
2. html_server:
   - merge set and get value boxes into one box
   - add registers bank view mode
   - read registers/properties values in bank/branch view mode
3. xml/test 
   - remove cmosis registers
   - add multithread safe property example

3 files changed, 150 insertions, 0 deletions

diff --git a/html_server/templates/registers/table_cell.html b/html_server/templates/registers/table_cell.html
new file mode 100644
index 0000000..690f052
--- /dev/null
+++ b/html_server/templates/registers/table_cell.html
@@ -0,0 +1,99 @@
+<tr class="infoTable">
+   {% if 'description' in register %}
+      <td class="infoTable"> {{ register.description }} </td>
+   {% else %}
+      <td class="infoTable">  </td>
+   {% endif %}
+   <td class="infoTable">
+      <table>
+         {% if 'R' in register.mode %}
+         <tr class="infoTable">
+            <td> 
+                  <input type="text"
+                         name="set_val_box_{{ register.bank }}_{{ register.name }}"
+                         id="set_val_box_{{ register.bank }}_{{ register.name }}" 
+                         value="{{ value[register.name] }}" />
+            </td>
+            {% if 'W' in register.mode %}
+            <td> 
+               <input type="button" value="set"
+                      style="width:100%;height:100%" 
+                      onclick="writeRegister('{{ register.bank }}', '{{ register.name }}')">
+            </td>
+            {% endif %}
+            <td> 
+               <input type="button" value="update"
+                      style="width:100%;height:100%"
+                      onclick="updateRegister('{{ register.bank }}', '{{ register.name }}')">
+            </td>
+         </tr>
+         {% endif %}
+      </table>
+   </td>
+   <td class="infoTable">{{ register.defvalue }}</td>
+   <td class="infoTable">{{ register.bank }}</td>
+   <td class="infoTable">
+      <ul>
+      {% for m in register.mode %}
+         {{ m + ';  '}}
+      {% endfor %}
+      </ul>
+   </td>
+   {% if 'range' in register %}
+      <td class="infoTable">
+         <table>
+            <tr class="infoTable">
+               <td class="infoTable"> min </td>
+               <td class="infoTable"> max </td>
+            </tr>
+            <tr class="infoTable">
+               <td class="infoTable"> {{ register.range.min }} </td>
+               <td class="infoTable"> {{ register.range.max }} </td>
+            </tr>
+         </table>
+      </td>
+   {% else %}
+      <td class="infoTable">  </td>
+   {% endif %}
+   {% if 'values' in register %}
+   <td class="infoTable">
+      <table>
+         <tr>
+         {% for v in register['values'] %}
+            <td>
+            <table>
+               {% if 'name' in v %}
+                  <tr class="infoTable">
+                     <td class="infoTable"> Name </td>
+                     <td class="infoTable"> {{v.name}} </td>
+                  </tr>
+               {% endif %}
+               {% if 'description' in v %}
+                  <tr class="infoTable">
+                     <td class="infoTable"> Description </td>
+                     <td class="infoTable"> {{ v.description }} </td>
+                  </tr>
+               {% endif %}
+               <tr class="infoTable">
+                  <td class="infoTable"> Min </td>
+                  <td class="infoTable"> {{ v.min }} </td>
+               </tr>
+               <tr class="infoTable">
+                  <td class="infoTable"> Max </td>
+                  <td class="infoTable"> {{ v.max }} </td>
+               </tr>
+               <tr class="infoTable">
+                  <td class="infoTable"> Value </td>
+                  <td class="infoTable"> {{ v.value }} </td>
+               </tr>
+            </table>
+            </td>
+         {% endfor %}
+         </tr>
+      </table>
+   </td>
+   {% else %}
+      <td class="infoTable">  </td>
+   {% endif %}
+</tr>
+
diff --git a/html_server/templates/registers/table_header.html b/html_server/templates/registers/table_header.html
new file mode 100644
index 0000000..f96ec20
--- /dev/null
+++ b/html_server/templates/registers/table_header.html
@@ -0,0 +1,9 @@
+<tr class="infoTable">
+      <td class="infoTable"> Description </td>
+      <td class="infoTable"> Value </td>
+      <td class="infoTable">Default value</td>
+      <td class="infoTable">Bank</td>
+      <td class="infoTable">Mode</td>
+      <td class="infoTable">Range</td>
+      <td class="infoTable">Values</td>
+</tr> 
diff --git a/html_server/templates/registers/table_scripts.html b/html_server/templates/registers/table_scripts.html
new file mode 100644
index 0000000..017c910
--- /dev/null
+++ b/html_server/templates/registers/table_scripts.html
@@ -0,0 +1,42 @@
+{% if standalone %}
+<script src="{{ url_for('static', filename='codebase/dhtmlx.js') }}"></script>
+<script src="{{ url_for('static', filename='check_err.js') }}"></script>
+{% endif %}
+
+<script>
+   /*
+   $("#set_val_box").keyup(function(event){
+    if(event.keyCode == 13){
+        $("#set_val_button").click();
+    }
+   });
+   */
+   
+   function updateRegister(bank, name) {
+      var pathToReadRegister = "{{ url_for('read_register_json') }}"
+      var completePath = pathToReadRegister + '?bank=' + bank +
+                     '&name=' + name
+      
+      $.getJSON(completePath, function(json){
+                  checkError(json)
+                  $("#set_val_box_" + bank + "_" + name).val(json.value)
+               })
+   }
+   
+   function writeRegister(bank, name)
+   {
+      var value = document.getElementById("set_val_box_" + bank + "_" + name).value;
+      if(value == "")
+         return
+      
+      var pathToReadRegister = "{{ url_for('write_register_json') }}"
+      var completePath = pathToReadRegister + '?bank=' + bank +
+                     '&name=' + name + '&val=' + value;
+                        
+      $.getJSON(completePath, 
+                function(json) {
+                   checkError(json)
+                   updateRegister(bank, name)
+                })
+   }; 
+</script>