updated for change in led output

ikdekker · Nov 14, 2016 · b86b778 · b86b778
1 parent 690bb83
commit b86b778
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/ac#�8d�� b/ac#�8d��
diff --git a/build/Debug/GNU-Linux/main.o.d b/build/Debug/GNU-Linux/main.o.d
@@ -2,9 +2,8 @@ build/Debug/GNU-Linux/main.o: main.cpp src/StorageManagement.h \
  include/json.hpp src/ConfigFactory.h src/ModuleEntity.h \
  src/ModuleServer.h src/DatabaseAdapter.h src/MatrixControl.h \
  src/ModuleEntity.h src/ModuleServer.h src/ModuleEntity.h \
- src/MatrixControl.h src/ScannerReader.h \
- /home/nick/hidapi/hidapi/hidapi.h src/MatrixControl.h \
- src/DatabaseAdapter.h
+ src/MatrixControl.h src/ScannerReader.h lib/hidapi/hidapi/hidapi.h \
+ src/MatrixControl.h src/DatabaseAdapter.h
 
 src/StorageManagement.h:
 
@@ -30,7 +29,7 @@ src/MatrixControl.h:
 
 src/ScannerReader.h:
 
-/home/nick/hidapi/hidapi/hidapi.h:
+lib/hidapi/hidapi/hidapi.h:
 
 src/MatrixControl.h:
 

diff --git a/build/Debug/GNU-Linux/src/StorageManagement.o.d b/build/Debug/GNU-Linux/src/StorageManagement.o.d
@@ -3,7 +3,7 @@ build/Debug/GNU-Linux/src/StorageManagement.o: src/StorageManagement.cxx \
  src/ModuleEntity.h src/ModuleServer.h src/DatabaseAdapter.h \
  src/MatrixControl.h src/ModuleEntity.h src/ModuleServer.h \
  src/ModuleEntity.h src/MatrixControl.h src/ScannerReader.h \
- /home/nick/hidapi/hidapi/hidapi.h src/ScannerReader.h
+ lib/hidapi/hidapi/hidapi.h src/ScannerReader.h
 
 src/StorageManagement.h:
 
@@ -29,6 +29,6 @@ src/MatrixControl.h:
 
 src/ScannerReader.h:
 
-/home/nick/hidapi/hidapi/hidapi.h:
+lib/hidapi/hidapi/hidapi.h:
 
 src/ScannerReader.h:
diff --git a/config/modules.json b/config/modules.json
@@ -1,7 +1,7 @@
 [
   {
     "id" : 0,
-    "rows": 4,
+    "rows": 6,
     "columns": 8,
     "disableRows": ""
   },
@@ -11,4 +11,4 @@
     "columns": 8,
     "disableRows": ""
   }
-]
+]
diff --git a/src/MatrixControl.cpp b/src/MatrixControl.cpp
@@ -26,6 +26,7 @@ MatrixControl::MatrixControl(ModuleServer* serv) : server(serv) {
         shiftData *s = new shiftData();
         s->id = (*it)->getId();
         //        cout << s->id << "id";
+	//change to reset
         s->reg1 = 0;
         s->reg2 = 0;
         moduleData.insert(moduleData.begin(), s);
@@ -44,7 +45,7 @@ Point MatrixControl::indexToLocation(int index, int modId) {
     int rows = ent->getRows();
     pt.y = floor(index / cols);
     pt.x = index - (pt.y * cols);
-
+	cout << pt.y << " = y " << pt.x << " = x \n";
     return pt;
 }
 

diff --git a/src/StorageManagement.cxx b/src/StorageManagement.cxx
@@ -89,6 +89,7 @@ void StorageManagement::run() {
 
 	scanReader->start();
 	string lastCode;
+	int change = 1;
 	while (1) {
 		if (scanReader->isRunning()) {
 			if (scanReader->hasRead()) {
@@ -98,10 +99,12 @@ void StorageManagement::run() {
                                 int modId = 0;
                                 int index = dbAdapter->addOrder(findFreeSpot(modId), lastCode, modId);
                                 matrix->ledOn(index, modId);
-
+                                change = 1;
 				cout << index << endl;
 			}
 		}
-                matrix->update();
+		if (change) {
+                matrix->update(); change = 0;
+		}
 	}
 }