rebellion/libpinproc
1
0
Fork 0
mirror of https://github.com/preble/libpinproc synced 2026-02-24 18:25:23 +01:00
Code Releases Activity

Merging in changes for CMake building, etc.

Browse Source 
Resolved conflict in:
	libpinproc/examples/pinproctest/pinproctest.cpp
This commit is contained in:
Adam Preble
2009-05-25 01:45:28 -04:00
parent c0586312c8 dcd9c560d3
commit 4a47637d99
10 changed files with 51 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/pinproctest/Makefile
View File

@@ -1,13 +1,15 @@
#
# File: Makefile for application
#
PINPROC_PATH=../..
CC=g++
LDFLAGS=-L../.. -L/usr/local/lib -L../../../../yaml-cpp/build/bin
LIBS=-lpinproc -lusb -lftdi -lyaml-cpp
LDFLAGS=-L$(PINPROC_PATH)/bin -L/usr/local/lib
LIBS=-lpinproc -lusb -lftdi
SRC=pinproctest.cpp
CXXFLAGS=-I../../include
CXXFLAGS=-I$(PINPROC_PATH)/include
OBJS=$(SRC:.cpp=.o)
@@ -16,7 +18,7 @@ EXE=pinproctest
all: $(EXE)
# FIXME: This makes the exe require libpinproc but not in a very graceful way.
$(EXE): $(OBJS) ../../libpinproc.a
$(EXE): $(OBJS) $(PINPROC_PATH)/bin/libpinproc.a
@echo application Makefile - linking $<
$(CC) $^ $(LDFLAGS) $(LIBS) -o $@

8
examples/pinproctest/pinproctest.cpp
View File

@@ -224,12 +224,12 @@ void ConfigureDMD(PRHandle proc)
// Display a simple pattern to verify DMD functionality.
// 16 diagonal lines will rotate to the right. Every two rows will get brighter,
// starting with dim dots at the top.
void UpdateDots( unsigned char * dots, unsigned int dotPointer )
void UpdateDots( unsigned char * dots, unsigned int dotOffset )
{
int i,j,k,color,mappedColor,loopCtr,byte_shifter;
const int rate_reduction_divisor = 1;
loopCtr = dotPointer/rate_reduction_divisor;
loopCtr = dotOffset/rate_reduction_divisor;
color = pow(2,kDMDSubFrames) - 1;
byte_shifter = 0x80;
@@ -280,14 +280,14 @@ void RunLoop(PRHandle proc)
// Create dot array using an array of bytes. Each byte holds 8 dots. Need
// space for 4 sub-frames of 128/32 dots.
unsigned char dots[4*((128*32)/8)];
unsigned int dotPointer = 0;
unsigned int dotOffset = 0;
while (runLoopRun)
{
PRDriverWatchdogTickle(proc);
// Create a dot pattern to test the DMD
UpdateDots(dots,dotPointer++);
UpdateDots(dots,dotOffset++);
PRDMDDraw(proc,dots);
int numEvents = PRGetEvents(proc, events, maxEvents);