Merge branch 'master' of gitorious.org:punchingbag/punchingbag

2 files changed, 8 insertions, 5 deletions

diff --git a/Arduino/Libraies/AS1107/AS1107.cpp b/Arduino/Libraies/AS1107/AS1107.cpp
index c61819e..45a722c 100755
--- a/Arduino/Libraies/AS1107/AS1107.cpp
+++ b/Arduino/Libraies/AS1107/AS1107.cpp
@@ -428,8 +428,11 @@ AS1107::AS1107(byte cspin, byte clkpin, byte datapin)
 // ------------------------------------------------------------------------------------

 // Initializes Arduino and AS1107

 // buffer is the initial screen buffer

-void AS1107::Init(byte * buffer)

+void AS1107::Init(byte * buffer, byte _Maxx, byte _Maxy, byte _cNum)

 {

+  Maxx = _Maxx;

+  Maxy = _Maxy;

+  HighestCtrlNum = _cNum;

   _buffer = buffer;

   CalculateCharOffsets();

   // Clear Screen buffer

diff --git a/Arduino/Libraies/AS1107/AS1107.h b/Arduino/Libraies/AS1107/AS1107.h
index 80b01da..7e9b2ab 100755
--- a/Arduino/Libraies/AS1107/AS1107.h
+++ b/Arduino/Libraies/AS1107/AS1107.h
@@ -36,7 +36,7 @@ class AS1107
     void WriteRegister2(byte chip, byte reg, byte data);

     void WriteRegister(byte chip, byte reg, byte data);

     void WriteColumn( byte column, byte data);

-    void Init(byte *buffer);

+    void Init(byte *buffer, byte Maxx, byte Maxy, byte cNum);

     void SetBuffer(byte *buffer);

     void SetLed(int x, int y, byte value);

     void Clear();

@@ -59,9 +59,9 @@ class AS1107
     // ***************************************

     // Set your module configuration here

     // ***************************************

-    static const byte Maxx=8;      // maximum x - Pixels of the Module

-    static const byte Maxy=19;         // maximum y - Pixels of the Module

-    static const byte HighestCtrlNum=5; // Number of Matrix modules -1 (0 = single module)

+    byte Maxx;      // maximum x - Pixels of the Module

+    byte Maxy;         // maximum y - Pixels of the Module

+    byte HighestCtrlNum; // Number of Matrix modules -1 (0 = single module)

 

   private:

     byte _cspin;