View difference between Paste ID: 16f8C0BN and qHdt30Rh

 // 240824
-// Arduino Digital Light Wand + SD + LCD V1.02
+
-// Fixed the SD init problem (removing card, trying to send a file (which fails) now re-inits the card.
+//LEDType = LPD8806
-// Backlight now fades out, instead of just switching off.
+//HardwareSPI = True
 //LCDDisplay = True
 //DualStrip =True
 //StripControl1 = 22
 //StripControl2 = 23
-#include <SD.h>
+//bitmapWidth = 600
-#include <LEDStrip.h>
+//WandLEDs = 32
 //delayOffset = 0
 //numOffset = 0
-#define SIPIN 30
+//sdiPin1 = 1
-#define DIPIN 31
+//sdiPin2 = 1
-#define CLKPIN 32
+//clkPin1 = 10
-#define LATCHPIN 33
+//clkPin2 = 10
-LEDStrip mystrip(DIPIN,SIPIN,LATCHPIN,CLKPIN);
+//StartDelay = 0
-#define SPULSES 5000
+//EndDelay = 0
-#define STRIP_LENGTH 48
+//StrobeOn = 10
-#define BACKLIGHT 10
+//StrobeOff = 0
-byte BL = B10000000; // Black / Off
+// Lightwand code generated by Phil Wright
-#define SDssPin 53  //SD card CS pin
+#include <avr/pgmspace.h>
-int frameDelay = 10; // default for the frame delay
+#include <SPI.h>
 #include <Wire.h>
 #include <LiquidCrystal.h>
-//BacklightControl to save battery Life
+#include <SdFat.h>
-boolean BackLightTimer = false;
+
-int BackLightTimeout = 2000;
+
-int BackLightTemp =  BackLightTimeout;
+#define STRIP_LENGTH 32 // Total LEDs on this wand
 //#int STRIP_WIDTH 6620 // Width on this strip
-//Stuff for the Keypad
+int SS = 27;  // Move the SS pin out of the way of the LCD Display (if installed)
-int adc_key_val[5] ={
+int StripControl1 = 22; //Channel Select Wire for Dual Strip no. 1
-  30, 150, 360, 535, 760 };
+int StripControl2 = 23; //Channel Select Wire for Dual Strip no. 2
-int NUM_KEYS = 5;
+
-int adc_key_in;
+
-int key=-1;
+
-int oldkey=-1;
+
 boolean firstloop=true;
-File root;
+
-File dataFile;
+
-String m_CurrentFilename = "";
+
-int m_FileIndex = 0;
+
-int m_NumberOfFiles = 0;
+
-String m_FileNames[200]; //yep this is bad, but unless you are going to have over 200 images on your lightwand..
+
 }
 mybitmapblock;
 
 char buf[4];
 int fileVersion;
 uint32_t bitmapOffset;
 int bitmapHeight;
 uint32_t bitmapWidth;
 int StartDelay;
 int EndDelay;
 int StrobeOn;
 int StrobeOff;
 byte VReversed;
 byte HReversed;
 
 
 SdFat sd;
 SdFile myFile;
 
 
 uint32_t readLong()
 {
   uint32_t retValue;
   myFile.read(buf,4);
 
-//Colour weights for the HL1606..
+  retValue=(uint32_t)((byte)buf[0])<<24;
-uint8_t HL1606highred = 100;
+  retValue+=(uint32_t)((byte)buf[1])<<16;
-uint8_t HL1606highgreen = 100;
+  retValue+=(uint32_t)((byte)buf[2])<<8;
-uint8_t HL1606highblue = 100;
+  retValue+=(uint32_t)((byte)buf[3]);
-uint8_t HL1606lowred = 20;
+
-uint8_t HL1606lowgreen = 20;
+
-uint8_t HL1606lowblue = 20;
+
 
 int readInt()
 {
-void setup()
+
   myFile.read(buf,2);
 
-  setupLEDs();
+  retValue=(int)((byte)buf[0])<<8;
-  setupLCDdisplay();
+  retValue+=(int)((byte)buf[1]);
-  setupSDcard();
+
-  BackLightOn();
+
 }
 
-void setupLEDs()
+
 {
-  ClearStrip(100);
+  byte retValue;
   myFile.read(buf,1);
 
-void setupLCDdisplay()
+
   retValue=((byte)buf[0]);
-  lcd.begin(16, 2);
+
-  lcd.print("  *** DLW ***");
+
-  lcd.setCursor(0, 1);
+
-  lcd.print("Initializing...");
+void writeRGB(uint8_t r,uint8_t g,uint8_t b,int nStrip)
-  delay(1000);
+
   if(nStrip==StripControl1) {
-  //pinMode(BACKLIGHT, OUTPUT);
+    digitalWrite(StripControl2, LOW);
-  //digitalWrite(BACKLIGHT,LOW);
+    digitalWrite(StripControl1, HIGH);
   }
   else
   {
-void setupSDcard()
+    digitalWrite(StripControl1, LOW);
     digitalWrite(StripControl2, HIGH);
-  pinMode(SDssPin, OUTPUT);
+
   SPI.transfer(g);
-  while (!SD.begin(SDssPin)) {
+  SPI.transfer(r);
-    BackLightOn();
+  SPI.transfer(b);
-    lcd.print("SD init failed!");
+
-    delay(1000);
+  digitalWrite(StripControl1, LOW);
-    lcd.clear();
+  digitalWrite(StripControl2, LOW);
-    delay(500);
+
 }
 
-  lcd.print("SD init done.");
+void blank_strip()
-  delay(1000);
+
-  root = SD.open("/");
+  for(int x = 0 ; x < STRIP_LENGTH; x++)
     buffer[x] = 0;
-  lcd.print("Scanning files");
+
-  delay(500);
+
-  GetFileNamesFromSD(root);
+  for(int LED_number = 0 ; LED_number < STRIP_LENGTH-1 ; LED_number=LED_number+2) {
-  isort(m_FileNames, m_NumberOfFiles);
+
-  m_CurrentFilename = m_FileNames[0];
+    int r=(((this_led_color>>16) & 0xff)>>1)|0x80;
-  DisplayCurrentFilename();
+    int g=(((this_led_color>>8) & 0xff)>>1)|0x80;
-
+    int b=(((this_led_color) & 0xff)>>1)|0x80;
     delay(50);
     this_led_color = buffer[LED_number+1]; //24 bits of color data
-void latchanddelay(int dur)
+    r=(((this_led_color>>16) & 0xff)>>1)|0x80;
     g=(((this_led_color>>8) & 0xff)>>1)|0x80;
-  mystrip.latch();
+    b=(((this_led_color) & 0xff)>>1)|0x80;
-  delay(dur);
+    delay(50);
   }
   for(int i=0;i<STRIP_LENGTH;i=i+2) {
-void ClearStrip(int duration)
+    writeRGB(0,0,0,StripControl2);
     writeRGB(0,0,0,StripControl1);
-  int x;
+
-  for(x=0;x<STRIP_LENGTH;x++)
+
 void setup() {
-    mystrip.pushCmd(BL);
+  pinMode(SS, OUTPUT);
   pinMode(StripControl1, OUTPUT);
-  latchanddelay(duration);
+  pinMode(StripControl2, OUTPUT);
   digitalWrite(StripControl2, LOW);
   digitalWrite(StripControl1, LOW);
-void MultiPush(int Cmd, int Cnt) {
+
-  while(Cnt-->0) mystrip.pushCmd(Cmd);
+  SPI.begin();
   blank_strip();
 
-int ReadKeypad()
+
 
-  adc_key_in = analogRead(0);    // read the value from the sensor
+
-  digitalWrite(13, HIGH);
+  lcd.print("Lightwand Gen.");
-  key = get_key(adc_key_in);		        // convert into key press
+  delay(0);
 
-  if (key != oldkey)				    // if keypress is detected
+
   pinMode(StripControl1,OUTPUT);
-    delay(50);		// wait for debounce time
+  pinMode(StripControl2,OUTPUT);
-    adc_key_in = analogRead(0);    // read the value from the sensor
+  pinMode(A0,INPUT);    // THIS IS THE BUTTON
-    key = get_key(adc_key_in);		        // convert into key press
+  digitalWrite(StripControl1,LOW);
-    if (key != oldkey)
+  digitalWrite(StripControl2,LOW);
-    {
+
-      oldkey = key;
+  if (!sd.init(SPI_FULL_SPEED, 27)) lcd.print("SDcard failed");
-      if (key >=0){
+
-        return key;
+
 }
-    }
+void loop() {
   // open file in current working directory
-  return key;
+
   while(myFile.openNext(sd.cwd(), O_READ)) {
     myFile.read(buf,4);
     if(strncmp(&buf[0],"WAND",4)==0)
-// Convert ADC value to key number
+
-int get_key(unsigned int input)
+
       //if(!myFile.open("test.LSB",O_READ))
-  int k;
+      //{
-  for (k = 0; k < NUM_KEYS; k++)
+      //  lcd.print("open failed");
       //  while(1) {};
-    if (input < adc_key_val[k])
+      //}
-    {
+
-      return k;
+      myFile.getFilename(&tmpbuffer[0]);
-    }
+      lcd.clear();
       lcd.print(&tmpbuffer[0]);
-  if (k >= NUM_KEYS)
+
-    k = -1;     // No valid key pressed
+      //myFile.read(buf,4);
-  return k;
+      //  if(strncmp(&buf[0],"WAND",4)==0)
       //    Serial.println("this is a bitmap file");
       //  else
       //    Serial.println("this is not a bitmap file");
-//The Main menu starts here...
+
-void loop()
+      fileVersion=readByte();
       bitmapOffset = readLong();
-  int keypress = ReadKeypad();
+      bitmapHeight = readInt();
-  if ( keypress == 1) //up key (step up through the filenames)
+      bitmapWidth = readLong();
       //cout << pstr("Height ") << bitmapHeight << endl;
-    BackLightOn();
+      //cout << pstr("Width ") << bitmapWidth << endl;
-    if (m_FileIndex > 0)
+
       StartDelay = readByte();
-      m_FileIndex--;
+      EndDelay = readByte();
-    }
+      StrobeOn = readInt();
-    else
+      StrobeOff = readInt();
       /*
-      m_FileIndex = m_NumberOfFiles -1; //wrap round to the last file
+cout << pstr("StartDelay ") << StartDelay << endl;
-    }
+       cout << pstr("EndDelay ") << EndDelay << endl;
        cout << pstr("StrobeOn ") << StrobeOn << endl;
-    DisplayCurrentFilename();
+       cout << pstr("StroneOff ") << StrobeOff << endl;
-    delay(500);
+       */
       VReversed = readByte();
       HReversed = readByte();
-  if ( keypress == 2) //down key (step down through the filenames)
+
       //cout << pstr("vReversed ") << VReversed << endl;
-    BackLightOn();
+      //cout << pstr("hReversed ") << HReversed << endl;
-    if (m_FileIndex < m_NumberOfFiles -1)
+#
       blank_strip();
-      m_FileIndex++;
+      post_frame();
-    }
+      lcd.setCursor(0,0);
-    else
+      //lcd.print(Filename);
       //lcd.print(" OK");
-      m_FileIndex = 0;//wrap round to the 1st file again
+      //sprintf(&tmpbuffer[0],"%ld",(long)bitmapWidth);
-    }
+      lcd.print((const String)&tmpbuffer[0]);
-    DisplayCurrentFilename();
+      lcd.setCursor(0,1);
-    delay(500);
+      lcd.print("Waiting 4 Button");
 
       while(analogRead(A0)<900) {
-  if (keypress == 4)//select key (send out the selected file)
+        delay(10);
       }
-    SendFile(m_CurrentFilename);
+
       /*
 for(int a=StartDelay;a>0;a--) {
-  if(keypress == 0) //right key (frame delay +)
+       lcd.setCursor(0,1);
        lcd.print("Start Delay ");
-    BackLightOn();
+       lcd.print(a);
-    if (frameDelay < 200)
+       lcd.print("   ");
        delay(StartDelay*1000);
-      frameDelay+=5;
+       }
-    }
+       */
-    ShowFrameDelay();
+
       myFile.seekSet(bitmapOffset);
       if(readLong()!=0L) sd.errorHalt("Bitmap offset incorrect");
-  if(keypress == 3)//left key (frame delay -)
+
       long filepos=0;
-    BackLightOn();
+      lcd.setCursor(0,1);
-    if (frameDelay > 5)
+      for(int x=0;x<bitmapWidth;x++) {
         int bufpos=0;
-      frameDelay-=5;
+
-    }
+        if(x % (bitmapWidth / 16)==0)
-    ShowFrameDelay();
+
           lcd.print("+");
         }
-  if (BackLightTimer == true) BackLightTime();
+
         while(bufpos<STRIP_LENGTH) {
 
           myFile.read(&mybitmapblock,4);
-void BackLightOn()
+
           if(mybitmapblock.len>bitmapHeight)
-  analogWrite(BACKLIGHT,255);
+          {
-  BackLightTimer = true;
+            lcd.clear();
-  int BackLightTemp =  BackLightTimeout;
+            lcd.print("Error Row ");
             lcd.print(x);
             lcd.setCursor(0,1);
-void BackLightTime()
+            lcd.print("bufpos = ");
             lcd.print(bufpos);
-  if ((BackLightTemp <= 255) && (BackLightTemp >= 0))
+            while(1) {
             };
-    analogWrite(BACKLIGHT,BackLightTemp);
+          }
-    delay(1);
+
           filepos=filepos+4;
-
+
-  if (BackLightTemp <= 0)
+          for(int j=0;j<mybitmapblock.len;j++) {
             buffer[bufpos]=(long)mybitmapblock.r << 16;
-    BackLightTimer = false;
+            buffer[bufpos]|=(long)mybitmapblock.g << 8;
-    BackLightTemp =  BackLightTimeout;
+            buffer[bufpos++]|=(long)mybitmapblock.b;
-    analogWrite(BACKLIGHT,0);
+          }
           if(bufpos>STRIP_LENGTH) {
-  else
+            lcd.print("corrupt data");
             while(1) {
-    BackLightTemp --;
+            };
-    delay(1);
+          }
         }
         post_frame();
         delay(StrobeOn);
-void ShowFrameDelay()
+        if(StrobeOff>0)
         {
           blank_strip();
-  lcd.print("Frame delay:");
+          post_frame();
-  lcd.setCursor(0,1);
+          delay(StrobeOff);
-  lcd.print(frameDelay);
+
-  delay(500);
+
-  DisplayCurrentFilename();
+    } //if bitmap
     myFile.close();
 
   } // while
-void SendFile(String Filename)
+
   lcd.print("End of bitmaps");
 
-  lcd.print("Sending File");
+  blank_strip();
-  lcd.setCursor(0, 1);
+  post_frame();
-  lcd.print(Filename);
+
-  char temp[14];
+  while(1) {
-  Filename.toCharArray(temp,14);
+  };
 
-  dataFile = SD.open(temp);
+  /*
 for(int a=5;a>0;a--) {
-  // if the file is available send it to the LED's
+   lcd.setCursor(0,1);
-  if (dataFile)
+   lcd.print("End Delay ");
-  {
+   lcd.print(a);
-    ReadTheFile();
+   delay(EndDelay*1000);
-    dataFile.close();
+   }*/
-    ClearStrip(100);
+}