Merge pull request #873 from ladyada/master

fix compiler complaints, add HID example

Author: PaintYourDragon

M4_Eyes/M4_Eyes.ino

@@ -105,7 +105,7 @@ SPISettings settings(DISPLAY_FREQ, MSBFIRST, SPI_MODE0);
 // below, to allow for caching/scheduling fudge). If so, that's our signal
 // that something is likely amiss and we take evasive maneuvers, resetting
 // the affected DMA channel (DMAbuddy::fix()).
-#define DMA_TIMEOUT ((DISPLAY_SIZE * 16 * 4000) / (DISPLAY_FREQ / 1000))
+#define DMA_TIMEOUT (uint32_t)((DISPLAY_SIZE * 16 * 4000) / (DISPLAY_FREQ / 1000))
 
 static inline uint16_t readBoop(void) {
   uint16_t counter = 0;
@@ -142,6 +142,9 @@ void setup() {
 #else
   if(!arcada.filesysBegin())    fatal("No filesystem found!", 250);
 #endif
+
+  user_setup();
+
   arcada.displayBegin();
 
   DISPLAY_SIZE     = min(ARCADA_TFT_WIDTH, ARCADA_TFT_HEIGHT);
@@ -163,15 +166,15 @@ void setup() {
   // config1.eye, config2.eye or config3.eye instead). Keep fingers clear
   // of the nose booper when doing this...it self-calibrates on startup.
   // DO THIS BEFORE THE SPLASH SO IT DOESN'T REQUIRE A LENGTHY HOLD.
-  char *filename = "config.eye";
+  char *filename = (char *)"config.eye";
 
   uint32_t buttonState = arcada.readButtons();
   if((buttonState & ARCADA_BUTTONMASK_UP) && arcada.exists("config1.eye")) {
-    filename = "config1.eye";
+    filename = (char *)"config1.eye";
   } else if((buttonState & ARCADA_BUTTONMASK_A) && arcada.exists("config2.eye")) {
-    filename = "config2.eye";
+    filename = (char *)"config2.eye";
   } else if((buttonState & ARCADA_BUTTONMASK_DOWN) && arcada.exists("config3.eye")) {
-    filename = "config3.eye";
+    filename = (char *)"config3.eye";
   }
 
   yield();
@@ -184,11 +187,11 @@ void setup() {
   #endif
 
   yield();
-  if (arcada.drawBMP("/splash.bmp", 0, 0, (eye[0].display)) == IMAGE_SUCCESS) {
+  if (arcada.drawBMP((char *)"/splash.bmp", 0, 0, (eye[0].display)) == IMAGE_SUCCESS) {
     Serial.println("Splashing");
     if (NUM_EYES > 1) {    // other eye
       yield();
-      arcada.drawBMP("/splash.bmp", 0, 0, (eye[1].display));
+      arcada.drawBMP((char *)"/splash.bmp", 0, 0, (eye[1].display));
     }
     // backlight on for a bit
     for (int bl=0; bl<=250; bl+=20) {
@@ -295,7 +298,6 @@ void setup() {
   // leave some RAM for the stack to operate over the lifetime of this
   // program and to handle small heap allocations.
 
-  ImageReturnCode status;
   uint32_t        maxRam = availableRAM() - stackReserve;
 
   // Load texture maps for eyes
@@ -356,6 +358,7 @@ void setup() {
 
   // Load eyelid graphics.
   yield();
+  ImageReturnCode status;
 
   status = loadEyelid(upperEyelidFilename ?
     upperEyelidFilename : (char *)"upper.bmp",
@@ -415,8 +418,6 @@ void setup() {
     boopThreshold = boopThreshold * 110 / 100; // 10% overhead
   }
 
-  user_setup();
-
   lastLightReadTime = micros() + 2000000; // Delay initial light reading
 }
 

M4_Eyes/file.cpp

@@ -64,6 +64,7 @@ static int32_t dwim(JsonVariant v, int32_t def = 0) { // "Do What I Mean"
   }
 }
 
+/*
 static void getFilename(JsonVariant v, char **ptr) {
   if(*ptr) {          // If string already allocated,
     free(*ptr);       // delete old value...
@@ -73,6 +74,7 @@ static void getFilename(JsonVariant v, char **ptr) {
     *ptr = strdup(v); // Make a copy of string, save that
   }
 }
+*/
 
 void loadConfig(char *filename) {
   File    file;
@@ -135,7 +137,7 @@ void loadConfig(char *filename) {
       if(pMin > pMax) {
         float temp = pMin;
         pMin = pMax;
-        pMax = pMin;
+        pMax = temp;
       }
       irisMin   = (1.0 - pMax);
       irisRange = (pMax - pMin);
@@ -337,7 +339,7 @@ ImageReturnCode loadEyelid(char *filename,
   if(reader->bmpDimensions(filename, &w, &h) == IMAGE_SUCCESS) {
     tempBytes = ((w + 7) / 8) * h; // Bitmap size in bytes
     if (maxRam > tempBytes) {
-      if(tempPtr = (uint8_t *)malloc(maxRam - tempBytes)) {
+      if((tempPtr = (uint8_t *)malloc(maxRam - tempBytes)) != NULL) {
         // Make SOME tempPtr reference, or optimizer removes the alloc!
         tempPtr[0] = 0;
       }
@@ -420,7 +422,7 @@ ImageReturnCode loadTexture(char *filename, uint16_t **data,
   if(reader->bmpDimensions(filename, &w, &h) == IMAGE_SUCCESS) {
     tempBytes = w * h * 2; // Image size in bytes (converted to 16bpp)
     if (maxRam > tempBytes) {
-      if(tempPtr = (uint8_t *)malloc(maxRam - tempBytes)) {
+      if((tempPtr = (uint8_t *)malloc(maxRam - tempBytes)) != NULL) {
         // Make SOME tempPtr reference, or optimizer removes the alloc!
         tempPtr[0] = 0;
       }

M4_Eyes/pdmvoice.cpp

@@ -191,7 +191,7 @@ void voiceGain(float g) {
 void voiceMod(uint32_t freq, uint8_t waveform) {
   if(modBuf) { // Ignore if no modulation buffer allocated
     if(freq < MOD_MIN) freq = MOD_MIN;
-    modLen = (int)(actualPlaybackRate / freq + 0.5);
+    modLen = (uint32_t)(actualPlaybackRate / freq + 0.5);
     if(modLen   < 2) modLen   = 2;
     if(waveform > 4) waveform = 4;
     modWave = waveform;
@@ -204,17 +204,17 @@ void voiceMod(uint32_t freq, uint8_t waveform) {
       memset(&modBuf[modLen / 2], 0, modLen - modLen / 2);
       break;
      case 2: // Sine
-      for(int i=0; i<modLen; i++) {
+      for(uint32_t i=0; i<modLen; i++) {
         modBuf[i] = (int)((sin(M_PI * 2.0 * (float)i / (float)modLen) + 1.0) * 0.5 * 255.0 + 0.5);
       }
       break;
      case 3: // Triangle
-      for(int i=0; i<modLen; i++) {
+      for(uint32_t i=0; i<modLen; i++) {
         modBuf[i] = (int)(fabs(0.5 - (float)i / (float)modLen) * 2.0 * 255.0 + 0.5);
       }
       break;
      case 4: // Sawtooth (increasing)
-      for(int i=0; i<modLen; i++) {
+      for(uint32_t i=0; i<modLen; i++) {
         modBuf[i] = (int)((float)i / (float)(modLen - 1) * 255.0 + 0.5);
       }
       break;

M4_Eyes/user_hid.cpp

@@ -0,0 +1,80 @@
+#if 0 // Change to 1 to enable this code (must enable ONE user*.cpp only!)
+
+#include <Arduino.h>
+#include "Adafruit_TinyUSB.h"
+#include "globals.h"
+
+#define UP_BUTTON_KEYCODE_TO_SEND    HID_KEY_U
+#define A_BUTTON_KEYCODE_TO_SEND     HID_KEY_A
+#define DOWN_BUTTON_KEYCODE_TO_SEND  HID_KEY_D
+#define SHAKE_KEYCODE_TO_SEND        HID_KEY_SPACE
+
+// HID report descriptor using TinyUSB's template
+// Single Report (no ID) descriptor
+uint8_t const desc_hid_report[] =
+{
+  TUD_HID_REPORT_DESC_KEYBOARD(),
+};
+
+Adafruit_USBD_HID usb_hid;
+
+void user_setup(void) {
+  usb_hid.setPollInterval(20);
+  usb_hid.setReportDescriptor(desc_hid_report, sizeof(desc_hid_report));
+
+  usb_hid.begin();
+
+  pinMode(LED_BUILTIN, OUTPUT);
+  digitalWrite(LED_BUILTIN, LOW);
+  arcada.accel.setClick(1, 50);
+  
+  // wait until device mounted
+  while( !USBDevice.mounted() ) delay(1);
+}
+
+void user_loop(void) {
+  if ( !usb_hid.ready() ) {
+    Serial.println("not ready");
+    return;
+  }
+
+  uint8_t keycode[6] = { 0 };
+
+  uint32_t buttonState = arcada.readButtons();
+  if (buttonState & ARCADA_BUTTONMASK_UP) {
+    Serial.println("Up");
+    keycode[0] = UP_BUTTON_KEYCODE_TO_SEND;
+  }
+  if (buttonState & ARCADA_BUTTONMASK_A) {
+    Serial.println("A");
+    keycode[1] = A_BUTTON_KEYCODE_TO_SEND;
+  }
+  if (buttonState & ARCADA_BUTTONMASK_DOWN) {
+    Serial.println("Down");
+    keycode[2] = DOWN_BUTTON_KEYCODE_TO_SEND;
+  }
+
+  uint8_t shake = arcada.accel.getClick();
+  if (shake & 0x30) {
+    Serial.print("shake detected (0x"); Serial.print(shake, HEX); Serial.print("): ");
+    if (shake & 0x10) Serial.println(" single shake");
+    keycode[3] = SHAKE_KEYCODE_TO_SEND;
+  }
+
+  bool anypressed = false;
+  for (int k=0; k<sizeof(keycode); k++) {
+    if (keycode[k] != 0) {
+      anypressed = true;
+      break;
+    }
+  }
+  if (anypressed) {
+    digitalWrite(LED_BUILTIN, HIGH);
+    usb_hid.keyboardReport(0, 0, keycode);
+  } else {
+    digitalWrite(LED_BUILTIN, LOW);   
+    usb_hid.keyboardRelease(0);  
+  }
+}
+
+#endif

M4_Eyes/user_neopixel.cpp

@@ -0,0 +1,34 @@
+#if 0 // Change to 1 to enable this code (must enable ONE user*.cpp only!)
+
+#include <Adafruit_NeoPixel.h>
+
+#define LED_PIN    8
+#define LED_COUNT  4
+Adafruit_NeoPixel strip(LED_COUNT, LED_PIN, NEO_GRB + NEO_KHZ800);
+
+void user_setup(void) {
+  strip.begin();           // INITIALIZE NeoPixel strip object (REQUIRED)
+  strip.show();            // Turn OFF all pixels ASAP
+  strip.setBrightness(50); // Set BRIGHTNESS to about 1/5 (max = 255)
+}
+
+long firstPixelHue = 0;
+
+void user_loop(void) {
+  for(int i=0; i<strip.numPixels(); i++) { // For each pixel in strip...
+    // Offset pixel hue by an amount to make one full revolution of the
+    // color wheel (range of 65536) along the length of the strip
+    // (strip.numPixels() steps):
+    int pixelHue = firstPixelHue + (i * 65536L / strip.numPixels());
+    // strip.ColorHSV() can take 1 or 3 arguments: a hue (0 to 65535) or
+    // optionally add saturation and value (brightness) (each 0 to 255).
+    // Here we're using just the single-argument hue variant. The result
+    // is passed through strip.gamma32() to provide 'truer' colors
+    // before assigning to each pixel:
+    strip.setPixelColor(i, strip.gamma32(strip.ColorHSV(pixelHue)));
+  }
+  strip.show(); // Update strip with new contents
+  firstPixelHue += 256;
+}
+
+#endif // 0