Pārlūkot izejas kodu

Merge branch 'master' of github.com:xythobuz/LED-Cube

Max Nuding 12 gadus atpakaļ
vecāks
revīzija
fbf2f18661
3 mainītis faili ar 6 papildinājumiem un 3 dzēšanām
  1. 0
    1
      CubeControl/helper/unixSerial.c
  2. 2
    2
      CubeControl/makefile
  3. 4
    0
      README.md

+ 0
- 1
CubeControl/helper/unixSerial.c Parādīt failu

134
 		tmp[3] = 'v';
134
 		tmp[3] = 'v';
135
 		tmp[4] = '/';
135
 		tmp[4] = '/';
136
 		files[i] = strncat(tmp, files[i], strlen(files[i]));
136
 		files[i] = strncat(tmp, files[i], strlen(files[i]));
137
-		free(tmp);
138
 	}
137
 	}
139
 
138
 
140
 	*siz = size;
139
 	*siz = size;

+ 2
- 2
CubeControl/makefile Parādīt failu

15
 INJAR = *.class *.png
15
 INJAR = *.class *.png
16
 
16
 
17
 
17
 
18
-all: CubeControl.jar
18
+all: CubeControl.jar libSerial
19
 
19
 
20
 doc: doc/index.html
20
 doc: doc/index.html
21
 
21
 
22
-CubeControl.jar: libSerial HelperUtility.class manifest.txt
22
+CubeControl.jar: HelperUtility.class manifest.txt
23
 	jar -cmf manifest.txt "CubeControl.jar" $(INJAR)
23
 	jar -cmf manifest.txt "CubeControl.jar" $(INJAR)
24
 
24
 
25
 serialInterface.h: HelperUtility.class
25
 serialInterface.h: HelperUtility.class

+ 4
- 0
README.md Parādīt failu

16
 We also build a software to create and load animations into the cube. This software is written in Java and C and is Compatible between Windows and Unix.
16
 We also build a software to create and load animations into the cube. This software is written in Java and C and is Compatible between Windows and Unix.
17
 It's source is in the "Cube Control" directory. It has it's own makefile, in which you can specify the Target OS. "unix" means any Unix like OS (Linux, OS X...), "win" means Windows.
17
 It's source is in the "Cube Control" directory. It has it's own makefile, in which you can specify the Target OS. "unix" means any Unix like OS (Linux, OS X...), "win" means Windows.
18
 You obviously need a working JDK and a C Compiler Environment (we use gcc).
18
 You obviously need a working JDK and a C Compiler Environment (we use gcc).
19
+
20
+## Build instructions
21
+
22
+Theres a global makefile in the top folder. If you run it, it will (probably) create CubeControl.jar, CubeFirmware.hex and a OS-dependent serial library (Serial.dll or libSerial.jnilib...). If not, you should take a look at the makefile in CubeControl. Hard-Coded include directorys are probably different than on your system...

Notiek ielāde…
Atcelt
Saglabāt