Commits · fc6c69f0a15478563b01c546dcc0dbcec8c08f8a · 潘栩锋 / hemei

26 Dec, 2018 1 commit
- 生成安装包 · fc6c69f0
  潘栩锋 authored Dec 26, 2018
  
  fc6c69f0
25 Dec, 2018 5 commits
- 1. 修改收卷主界面没有限制小数点 · d7947943
  潘栩锋 authored Dec 25, 2018
  
  d7947943
- 1.改进 IBC控制图, 更新时序 · ab2ec805
  潘栩锋 authored Dec 25, 2018
  
  ab2ec805
- 1. 修复上料频率设定=0 · 01eb94dd
  潘栩锋 authored Dec 25, 2018
```
2. 改进 上料流量界面加速
3. 修复 收卷预警逻辑修正
```
  01eb94dd
- 更新安装包生成方式 · 9f3ca040
  潘栩锋 authored Dec 25, 2018
  
  9f3ca040
- 1. 把自动风环Griaph 【设置】按钮又改回自动风环的参数界面 · fc44b61b
  潘栩锋 authored Dec 25, 2018
  
  fc44b61b
24 Dec, 2018 4 commits
- Merge branch 'master' of http://private.flyautomation.net:82/panruising/hemei · 02beb5c9
  潘栩锋 authored Dec 24, 2018
```
# Conflicts:
#	Resource/称重/设备连接变量表_541/HMI-541最后确定.xlsm
```
  02beb5c9
- Squashed commit of the following: · 2a466b53
  潘栩锋 authored Dec 24, 2018
```
commit e7e1d551
Author: SimonPan <panruising@163.com>
Date:   Mon Dec 24 12:04:31 2018 +0800

    更新541资料

commit 6e603665
Author: SimonPan <panruising@163.com>
Date:   Sat Dec 22 11:45:40 2018 +0800

    更新脚本
```
  2a466b53
- 1 · d3306b89
  潘栩锋 authored Dec 24, 2018
  
  d3306b89
- 更新541资料 · e7e1d551
  潘栩锋 authored Dec 24, 2018
  
  e7e1d551
22 Dec, 2018 1 commit
- 更新脚本 · 6e603665
  潘栩锋 authored Dec 22, 2018
  
  6e603665
20 Dec, 2018 5 commits
- 1. 称重的流量图，可以选择看某个流量 · 3ed9d4ca
  潘栩锋 authored Dec 20, 2018
```
2.IBC,与称重的图，当不是最新，10秒后会自动按 最新
```
  3ed9d4ca
- Merge branch 'master' of ssh://private.flyautomation.net:1022/~/hemei · e181b1fe
  潘栩锋 authored Dec 20, 2018
  
  e181b1fe
- 删去layout · 6b683a7f
  潘栩锋 authored Dec 20, 2018
  
  6b683a7f
- Merge branch 'master' of ssh://private.flyautomation.net:1022/~/hemei · e2fcd79b
  潘栩锋 authored Dec 20, 2018
  
  e2fcd79b
- 看过341 · b47079b5
  潘栩锋 authored Dec 20, 2018
  
  b47079b5
18 Dec, 2018 4 commits
- 1 · c3c46c1d
  潘栩锋 authored Dec 18, 2018
  
  c3c46c1d
- 修改， MainWindow 忘记了添加mSysParam_PropertyChanged · 107d8129
  潘栩锋 authored Dec 18, 2018
  
  107d8129
- Merge remote-tracking branch 'git/master' · 7d4961bb
  潘栩锋 authored Dec 18, 2018
  
  7d4961bb
- 1.修改winder 主界面 dynarea 显示的单位 · dfec0311
  潘栩锋 authored Dec 18, 2018
```
2.旋转塔，反向限位 与 反转信号 调换了
```
  dfec0311
17 Dec, 2018 8 commits
- 1 · 896ed1e5
  潘栩锋 authored Dec 17, 2018
  
  896ed1e5
- Merge remote-tracking branch 'remotes/git/master' · 38f8a34a
  潘栩锋 authored Dec 17, 2018
  
  38f8a34a
- 添加blowing资料 · ea683036
  潘栩锋 authored Dec 17, 2018
  
  ea683036
- Merge remote-tracking branch 'remotes/git/master' · da498879
  潘栩锋 authored Dec 17, 2018
  
  da498879
- 1 · 1f72a18c
  潘栩锋 authored Dec 17, 2018
  
  1f72a18c
- 恢复删错的 Project.FLY.Thick.RemoteHistory · 8ba0ce8b
  潘栩锋 authored Dec 17, 2018
  
  8ba0ce8b
- Merge remote-tracking branch 'remotes/git/master' · 82074f6b
  潘栩锋 authored Dec 17, 2018
  
  82074f6b
- 修改Resource/称重名字 · 4da26086
  潘栩锋 authored Dec 17, 2018
  
  4da26086
14 Dec, 2018 3 commits
- 由于 PropertyChanged2.Fody 有bug · f58ff22e
  潘栩锋 authored Dec 14, 2018
```
feedbackheat 修改 Bads 绑定
```
  f58ff22e
- 合并 · c07bac0f
  潘栩锋 authored Dec 14, 2018
  
  c07bac0f
- 123 · 86dcbc67
  潘栩锋 authored Dec 14, 2018
  
  86dcbc67
13 Dec, 2018 5 commits
- 更新.gitignore，HMI.zip，PLC.zip 这两个不能忽略 · 843e109b
  潘栩锋 authored Dec 13, 2018
  
  843e109b
- 删除和美安装包 · 8b399b0b
  潘栩锋 authored Dec 13, 2018
  
  8b399b0b
- 安装包制作 · 583dd936
  潘栩锋 authored Dec 13, 2018
  
  583dd936
- AirRing 修正厚度数据补齐功能 · d2a0c34c
  潘栩锋 authored Dec 13, 2018
  
  d2a0c34c
- 安装包 · 616aa497
  潘栩锋 authored Dec 13, 2018
  
  616aa497
12 Dec, 2018 4 commits
- 修复检测加热棒出错 bug · 57d3c2ea
  潘栩锋 authored Dec 12, 2018
  
  57d3c2ea
- 修改由于线速度变化，导致加热一直被复位的bug · aff3b62f
  潘栩锋 authored Dec 12, 2018
  
  aff3b62f
- 修改旋转时间的限制。现在最大25min · c50d3c7f
  潘栩锋 authored Dec 12, 2018
  
  c50d3c7f
- 修复当修改旋转参数，图不会变化的bug · e35eee20
  潘栩锋 authored Dec 12, 2018
  
  e35eee20