Merge branch 'master' of github.com:collin80/SavvyCAN into WIP2

2016-12-08 20:50:35 -05:00
parent ddfac100d2 ef8b6ca755
commit 9e592d916c
16 changed files with 970 additions and 27 deletions
@@ -225,6 +225,8 @@
    <addaction name="actionScripting_INterface"/>
    <addaction name="actionFuzzing"/>
    <addaction name="actionUDS_Scanner"/>
+    <addaction name="actionFirmware_Update"/>
+    <addaction name="actionMotorControlConfig"/>
   </widget>
   <widget class="QMenu" name="menuFile">
    <property name="title">
@@ -401,6 +403,16 @@
    <string>Sniffer</string>
   </property>
  </action>
+  <action name="actionFirmware_Update">
+   <property name="text">
+    <string>Firmware Update</string>
+   </property>
+  </action>
+  <action name="actionMotorControlConfig">
+   <property name="text">
+    <string>MotorControlConfig</string>
+   </property>
+  </action>
 </widget>
 <layoutdefault spacing="6" margin="11"/>
 <resources/>