Commits · 484b879b25c9405da89efc618475fc991e400df6 · HadCon2 / Firmware / HadCon2

17 Mar, 2016 1 commit
- merged in dev, containing all up to 4.6.3 · 484b879b
  Peter Zumbruch authored Mar 17, 2016
  
  484b879b
12 Jan, 2015 12 commits
- renamed README -> README.md · eac6d845
  Peter Zumbruch authored Jan 12, 2015
  
  eac6d845
- Merge branch 'master' of github.com:zumbruch/HadCon2 · ae5873ff
  Peter Zumbruch authored Jan 12, 2015
  
  ae5873ff
- Update README · a26a366a
  Peter Zumbruch authored Jan 12, 2015
```
removed wrong line
```
  a26a366a
- added EUPL licence note to all files (German/English) · c368855c
  Peter Zumbruch authored Jan 12, 2015
  
  c368855c
- Merge remote-tracking branch 'github_pz-ssh/master' · e7135c60
  Peter Zumbruch authored Jan 12, 2015
```
got github file
Conflicts:
	README

git-svn-id: https://subversion.gsi.de/epics/trunk/hadcon/API-Slave@420 50339f28-a4cd-11e1-ab1f-8360dde1fe65
```
  e7135c60
- Merge branch 'dev' · b20e4e31
  Peter Zumbruch authored Jan 12, 2015
```
git-svn-id: https://subversion.gsi.de/epics/trunk/hadcon/API-Slave@419 50339f28-a4cd-11e1-ab1f-8360dde1fe65
```
  b20e4e31
- Merge branch 'dev' pre4.6.3 · 80c6c8d6
  Peter Zumbruch authored Jan 12, 2015
```
Conflicts:
	api_define.h
	spiApi.h

git-svn-id: https://subversion.gsi.de/epics/trunk/hadcon/API-Slave@418 50339f28-a4cd-11e1-ab1f-8360dde1fe65
```
  80c6c8d6
- Merge branch '4.6.2.1' · 0d1a82f0
  Peter Zumbruch authored Jan 12, 2015
```
git-svn-id: https://subversion.gsi.de/epics/trunk/hadcon/API-Slave@417 50339f28-a4cd-11e1-ab1f-8360dde1fe65
```
  0d1a82f0
- merged in 4.6.2 · 28788e6b
  Peter Zumbruch authored Jan 12, 2015
```
git-svn-id: https://subversion.gsi.de/epics/trunk/hadcon/API-Slave@416 50339f28-a4cd-11e1-ab1f-8360dde1fe65
```
  28788e6b
- merged in 4.6.1 including new SPI interface, CAN changes, global fixes · 9c6fbd9b
  Peter Zumbruch authored Jan 12, 2015
```
git-svn-id: https://subversion.gsi.de/epics/trunk/hadcon/API-Slave@415 50339f28-a4cd-11e1-ab1f-8360dde1fe65
```
  9c6fbd9b
- Merge branch 'SPI' · 060d6295
  Peter Zumbruch authored Jan 12, 2015
```
git-svn-id: https://subversion.gsi.de/epics/trunk/hadcon/API-Slave@414 50339f28-a4cd-11e1-ab1f-8360dde1fe65
```
  060d6295
- added .gitignore · 701f5b7d
  Peter Zumbruch authored Jan 12, 2015
```
git-svn-id: https://subversion.gsi.de/epics/trunk/hadcon/API-Slave@413 50339f28-a4cd-11e1-ab1f-8360dde1fe65
```
  701f5b7d
09 Jan, 2015 1 commit
- Merge remote-tracking branch 'github_pz-ssh/master' · 9a160f73
  Peter Zumbruch authored Jan 09, 2015
```
got github file
Conflicts:
	README
```
  9a160f73
14 Nov, 2014 7 commits
- Merge branch 'dev' · 0684ae3d
  Peter Zumbruch authored Nov 14, 2014
  
  0684ae3d
- removed nasty Makefile output, producing empty file · 2280133b
  Peter Zumbruch authored Nov 14, 2014
  
  2280133b
- Merge branch 'dev' pre4.6.3 · 9ac8467e
  Peter Zumbruch authored Nov 14, 2014
```
Conflicts:
	api_define.h
	spiApi.h
```
  9ac8467e
- Merge branch '4.6.2.1' · 634a138b
  Peter Zumbruch authored Nov 14, 2014
  
  634a138b
- Conflicts: · 7aa91b31
  Peter Zumbruch authored Nov 14, 2014
```
	api_define.h
resolved by using new version number
```
  7aa91b31
- merge · 4abae87d
  Peter Zumbruch authored Nov 14, 2014
```
gcc4.8.3: 
- adjusting PGM_P arrays to be const char* const array[]
- new paths and symbols
```
  4abae87d
- gcc4.8.3: · aaa7ce37
  Peter Zumbruch authored Nov 14, 2014
```
- adjusting PGM_P arrays to be const char* const array[]
- new paths and symbols
```
  aaa7ce37
13 Nov, 2014 2 commits
- Merge branch 'pre4.6.3' into dev · a088be3f
  Peter Zumbruch authored Nov 13, 2014
  
  a088be3f
- Merge branch 'spi2apiCmds' into dev · 262a16f3
  Peter Zumbruch authored Nov 13, 2014
  
  262a16f3
07 May, 2014 1 commit
- merged in SPI-fix3 · 5721c923
  Peter Zumbruch authored May 07, 2014
  
  5721c923
06 May, 2014 2 commits
- moved general api parts from spiApi to api · f459f499
  Peter Zumbruch authored May 06, 2014
  
  f459f499
- refactoring of non spi.... function · 120e3840
  Peter Zumbruch authored May 06, 2014
  
  120e3840
05 May, 2014 8 commits
- Release file · 9e461d2d
  Peter Zumbruch authored May 05, 2014
  
  9e461d2d
- added IDN command to get an identificaton string · b4303df1
  Peter Zumbruch authored May 05, 2014
  
  b4303df1
- Merge branch 'twi-master' into 4.6.3 · 7a123e64
  Peter Zumbruch authored May 05, 2014
```
Conflicts:
	api_define.h
resolved
```
  7a123e64
- changed version number · c359794b
  Peter Zumbruch authored May 05, 2014
  
  c359794b
- solved conflicts with old rebase · cc07cbfb
  Peter Zumbruch authored May 05, 2014
  
  cc07cbfb
- initial commit · 040cc9b7
  Peter Zumbruch authored May 05, 2014
  
  040cc9b7
- Changed Version number to 4.6.3 · 727c6ca9
  Peter Zumbruch authored Jan 31, 2014
  
  727c6ca9
- merged in 4.6.2 · 2459434a
  Peter Zumbruch authored May 05, 2014
  
  2459434a
03 Mar, 2014 2 commits
- Update README · e01e443f
  Peter Zumbruch authored Mar 03, 2014
  
  e01e443f
- Update README · cb42c4bd
  Peter Zumbruch authored Mar 03, 2014
  
  cb42c4bd
22 Aug, 2013 2 commits

main.c: added initial values to ready states, can.c: moved debug levels · 4d85ce34
Peter Zumbruch authored Aug 22, 2013

4d85ce34

api.c: check for CR in addition to LF allowing MS windows terminals · 4ea40009

Peter Zumbruch authored Aug 22, 2013

	- added check for CR in addition to LF 
		to allow for MS windows terminals
	- added debug function to view received UART input 
		and possible ctrl characters
 	- apiFindCommandKeywordIndex:
		- determines maximal keyword length by in addition 
			to MAX_LENGTH_PARAMETER by looking to the 
  			first occurrence of a ctrl characters
  		- correct printout in debug statements

4ea40009

24 Jul, 2013 2 commits
- changed version number to 4.6.2 · 8246c90b
  Peter Zumbruch authored Jul 24, 2013
  
  8246c90b
- merged in 4.6.1 including new SPI interface, CAN changes, global fixes · 4207b882
  Peter Zumbruch authored Jul 24, 2013
  
  4207b882