Merge branch 'develop'

gbmhunter · Apr 22, 2018 · e7ec4c8 · e7ec4c8
2 parents a9f0894 + b4c57fb
commit e7ec4c8
Show file tree

Hide file tree

Showing 18 changed files with 1,831 additions and 20 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,7 +3,7 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -33,6 +33,10 @@ module.exports = {
   },
   module: {
     rules: [
+        {
+            test: /\.txt$/,
+            use: 'raw-loader'
+        },
       {
         test: /\.(js|vue)$/,
         loader: 'eslint-loader',

diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v3.4.0] - 2018-04-22
+
+### Added
+- Added a new PID tuner tool. This tool can simulate both predefined and user-defined process/plants/systems. Includes real-time graphs of the simulation as you tune the PID constants.
+
 ## [v3.3.1] - 2018-03-04
 
 ### Fixed