fruchti/colorchord
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #54 from OleLL/master

Browse source 
Fixed a few things in Colorchord Embeddedlinux
This commit is contained in:
CNLohr 2017-10-31 12:34:50 -04:00 committed by GitHub
parent 941b75f0a6 ad4f2d6d09
commit 6c6f6cb13d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embeddedlinux/Makefile
View file

@ -7,7 +7,7 @@ LDFLAGS:= -s -Wl,--relax -Wl,-Map=test.map -Wl,--gc-sections -ffunction-section
embeddedcc : ../embeddedcommon/embeddednf.c ../embeddedcommon/DFT32.c embeddedcc.c ../embeddedcommon/embeddedout.c embeddedcc : ../embeddedcommon/embeddednf.c ../embeddedcommon/DFT32.c embeddedcc.c ../embeddedcommon/embeddedout.c
gcc -o $@ $^ $(CFLAGS) $(LDFLAGS) -m32 gcc -o $@ $^ $(CFLAGS) $(LDFLAGS)
dummy_leds : dummy_leds.c dummy_leds : dummy_leds.c
gcc -o $@ $^ -lX11 -lpthread $(CFLAGS) $(LDFLAGS) gcc -o $@ $^ -lX11 -lpthread $(CFLAGS) $(LDFLAGS)

3
embeddedlinux/embeddedcc.c
View file

@ -11,6 +11,7 @@
#include <string.h> #include <string.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> // Added by [olel] for atoi
#include "embeddedout.h" #include "embeddedout.h"
struct sockaddr_in servaddr; struct sockaddr_in servaddr;
@ -64,7 +65,7 @@ int main( int argc, char ** argv )
connect( sock, (struct sockaddr *)&servaddr, sizeof(servaddr) ); connect( sock, (struct sockaddr *)&servaddr, sizeof(servaddr) );
Init(); InitColorChord(); // Changed by [olel] cause this was changed in embeddednf
while( ( ci = getchar() ) != EOF ) while( ( ci = getchar() ) != EOF )
{ {