t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'WIP2' into WIP

Browse Source 
Conflicts:
	SavvyCAN.pro
	config.h
	mainwindow.cpp
	mainwindow.h
	mainwindow.ui

Resolved conflicts between branches
This commit is contained in:
Collin Kidder
2015-12-20 21:29:23 -05:00
parent c699e54548 09ff3f850a
commit 45cd9d6171
27 changed files with 1818 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.h
+2 -2
View File
@@ -1,12 +1,12 @@
#ifndef CONFIG
#define CONFIG
#define VERSION 140
#define VERSION 145
//try to keep this in sync.
//SavvyCAN will complain if you connect a GVRET board with a revision
//less than this number.
#define CURRENT_GVRET_VER 325 //330 is the newest but it is WIP
#define CURRENT_GVRET_VER 331
#endif // CONFIG