Merge branch 'main' into food_scale

Author: BlitzCityDIY

Adafruit_Prop_Maker_FeatherWing/Prop_Maker_LED_Simpletest/Prop_Maker_LED_Simpletest.ino

@@ -5,7 +5,7 @@
 /*
 * Adafruit Prop-Maker Featherwing
 * LED Example
-* 
+*
 * Rainbow swirl example for 3W LED.
 */
 
@@ -65,7 +65,7 @@ uint8_t i=0;
 void setup() {
   Serial.begin(115200);
   Serial.println("\nProp-Maker Wing: LED Example");
-  
+
   // set up the power pin
   pinMode(POWER_PIN, OUTPUT);
   // disable the power pin, we're not writing to the LEDs
@@ -84,23 +84,27 @@ void setup() {
     pinMode(GREEN_LED, OUTPUT);
     pinMode(BLUE_LED, OUTPUT);
   #endif
-  
+
   analogWrite(RED_LED, 0);
   analogWrite(GREEN_LED, 0);
   analogWrite(BLUE_LED, 0);
 }
 
+uint32_t Color(uint8_t r, uint8_t g, uint8_t b) {
+  return ((uint32_t)r << 16) | ((uint32_t)g << 8) | b;
+}
+
 uint32_t Wheel(byte WheelPos) {
   WheelPos = 255 - WheelPos;
   if(WheelPos < 85) {
-    return (255 - WheelPos * 3, 0, WheelPos * 3);
+    return Color(255 - WheelPos * 3, 0, WheelPos * 3);
   }
   if(WheelPos < 170) {
     WheelPos -= 85;
-    return (0, WheelPos * 3, 255 - WheelPos * 3);
+    return Color(0, WheelPos * 3, 255 - WheelPos * 3);
   }
   WheelPos -= 170;
-  return (WheelPos * 3, 255 - WheelPos * 3, 0);
+  return Color(WheelPos * 3, 255 - WheelPos * 3, 0);
 }
 
 void loop()

MagTag_Arduino_Demos/shipping_demo/shipping_demo.ino

@@ -40,7 +40,7 @@ void setup() {
   digitalWrite(NEOPIXEL_POWER, LOW); // on
 
   display.begin(THINKINK_MONO);
-  
+
   if (! lis.begin(0x19)) {
     Serial.println("Couldnt start LIS3DH");
     display.clearBuffer();
@@ -81,7 +81,7 @@ void loop() {
   if (j % 10 == 0) {
       sensors_event_t event;
       lis.getEvent(&event);
-    
+
       /* Display the results (acceleration is measured in m/s^2) */
       Serial.print("X: "); Serial.print(event.acceleration.x);
       Serial.print(" \tY: "); Serial.print(event.acceleration.y);
@@ -99,11 +99,11 @@ void loop() {
       if ((abs(event.acceleration.x) < 5) && (event.acceleration.y < -5)) {
         rotation = 2;
       }
-      
+
       int light = analogRead(LIGHT_SENSOR);
       Serial.print("Light sensor: ");
       Serial.println(light);
-  
+
       Serial.print("I2C scanner: ");
       for (int i = 0x07; i <= 0x77; i++) {
         Wire.beginTransmission(i);
@@ -118,12 +118,12 @@ void loop() {
   if (! digitalRead(BUTTON_A)) {
     Serial.println("Button A pressed");
     intneo.fill(0xFF0000);
-    intneo.show();    
+    intneo.show();
   }
   else if (! digitalRead(BUTTON_B)) {
     Serial.println("Button B pressed");
     intneo.fill(0x00FF00);
-    intneo.show();    
+    intneo.show();
   }
   else if (! digitalRead(BUTTON_C)) {
     Serial.println("Button C pressed");
@@ -142,7 +142,7 @@ void loop() {
     for (int i = 0; i < intneo.numPixels(); i++) {
       intneo.setPixelColor(i, Wheel(((i * 256 / intneo.numPixels()) + j) & 255));
     }
-    intneo.show(); 
+    intneo.show();
   }
 
   // Red LED off
@@ -155,7 +155,8 @@ void loop() {
 void play_tune(const uint8_t *audio, uint32_t audio_length) {
   uint32_t t;
   uint32_t prior, usec = 1000000L / SAMPLE_RATE;
-  
+
+  prior = micros();
   for (uint32_t i=0; i<audio_length; i++) {
     while((t = micros()) - prior < usec);
     dacWrite(A0, audio[i]);

Mini_Smart_Home_with_Huzzah/HuzzahCrickitIOT-ESP32/HuzzahCrickitIOT-ESP32.ino

@@ -9,7 +9,7 @@
 #include <seesaw_servo.h>
 #include <seesaw_motor.h>
 #include <seesaw_neopixel.h>
- 
+
 #define NEOPIX_PIN (20)                  /* Neopixel pin */
 #define NEOPIX_NUMBER_OF_PIXELS (7)
 #define LUX CRICKIT_SIGNAL1
@@ -49,14 +49,14 @@ seesaw_NeoPixel strip = seesaw_NeoPixel(NEOPIX_NUMBER_OF_PIXELS, NEOPIX_PIN, NEO
 #define MQTTled5 "house/led/five"
 #define MQTTled5Bright "house/led/five/brightness"
 #define MQTTled5Color "house/led/five/color"
-//***** Light Level Sensor 
+//***** Light Level Sensor
 #define MQTTlux "house/lux"
-//***** Temperature and Humidity Sensor 
+//***** Temperature and Humidity Sensor
 #define MQTTtemp "house/temperature"
 #define MQTThumid "house/humidity"
-//***** Motion Sensor 
+//***** Motion Sensor
 #define MQTTpir "house/motion"
-//***** Door Sensor 
+//***** Door Sensor
 #define MQTTdoor "house/door"
 
 //****************************** Connection Settings
@@ -100,7 +100,7 @@ void setup() {
   crickit.pinMode(LUX, INPUT);
   crickit.pinMode(PIR, INPUT_PULLUP);
   crickit.pinMode(DOOR, INPUT_PULLUP);
-  
+
   myservo.attach(CRICKIT_SERVO1);  // attaches the servo to CRICKIT_SERVO1 pin
   motor_a.attach(CRICKIT_MOTOR_A1, CRICKIT_MOTOR_A2);
   strip.begin();           // INITIALIZE NeoPixel strip object (REQUIRED)
@@ -153,7 +153,7 @@ void callback(char* topic, byte* payload, unsigned int length) {
   StrPayload = String(message_buff);
   int IntPayload = StrPayload.toInt();
   Serial.print(StrPayload);
-  
+
   if (String(topic) == MQTTlock) {
     if (StrPayload == "UNLOCK") {
       myservo.write(180);
@@ -236,7 +236,7 @@ void callback(char* topic, byte* payload, unsigned int length) {
     strip.setPixelColor(1, strip.Color(R[1], G[1], B[1]));
   }
   strip.show();
-  
+
   //.................. Light 3 ......................//
   if (String(topic) == MQTTled3) {
     if (StrPayload == "OFF") {
@@ -263,7 +263,7 @@ void callback(char* topic, byte* payload, unsigned int length) {
     strip.setPixelColor(2, strip.Color(R[2], G[2], B[2]));
   }
   strip.show();
-  
+
 //.................. Light 4 ......................//
   if (String(topic) == MQTTled4) {
     if (StrPayload == "OFF") {
@@ -290,7 +290,7 @@ void callback(char* topic, byte* payload, unsigned int length) {
     strip.setPixelColor(3, strip.Color(R[3], G[3], B[3]));
   }
   strip.show();
-  
+
 //.................. Light 5 ......................//
   if (String(topic) == MQTTled5) {
     if (StrPayload == "OFF") {
@@ -359,7 +359,7 @@ void reconnect() {
       client.subscribe(MQTTled5);
       client.subscribe(MQTTled5Bright);
       client.subscribe(MQTTled5Color);
-      
+
     } else {
       Serial.print("failed, rc=");
       Serial.print(client.state());
@@ -384,9 +384,9 @@ void loop() {
   if (!client.connected()) {
     reconnect();
   }
-  
+
   //************** Lux Smoothing
-  
+
   total = total - lux_R[readIndex]; //            subtract the last reading
   lux_R[readIndex] = crickit.analogRead(LUX);  // read from the sensor
   total = total + lux_R[readIndex];  //           add the reading to the total
@@ -400,7 +400,7 @@ void loop() {
     Serial.print("Lux = ");
     Serial.println(Lux_A);
 
-    snprintf (msg, 75, "%ld", Lux_A);
+    snprintf (msg, 75, "%d", Lux_A);
     Serial.println(msg);
     client.publish(MQTTlux, msg);
 
@@ -412,7 +412,7 @@ void loop() {
       Serial.println("Motion Sensor = STILL");
       client.publish(MQTTpir, "STILL");
     }
-    delay(10); 
+    delay(10);
     if (crickit.digitalRead(DOOR)){
       Serial.println("Door = OPEN");
       client.publish(MQTTdoor, "OPEN");
@@ -421,7 +421,7 @@ void loop() {
       client.publish(MQTTdoor, "CLOSED");
     }
   }
-  delay(10);        // delay in between reads for stability 
+  delay(10);        // delay in between reads for stability
   client.loop();
 }