Changeset 243

Timestamp:

Jun 15, 2016, 4:09:12 PM (8 years ago)

Author:

ertl-honda

Message:

IoTパッケージの内容に合わせて更新

Location:

rtos_arduino/trunk/examples/NCESIoT_RTOS

Files:

• ChainableLED (added)
• ChainableLED/ChainableLED.cpp (added)
• ChainableLED/ChainableLED.h (added)
• ChainableLED/LICENSE (added)
• ChainableLED/README.md (added)
• ChainableLED/examples (added)
• ChainableLED/examples/CycleThroughColors (added)
• ChainableLED/examples/CycleThroughColors/CycleThroughColors.ino (added)
• ChainableLED/examples/FadeInOut (added)
• ChainableLED/examples/FadeInOut/FadeInOut.ino (added)
• ChainableLED/examples/SimpleCycle (added)
• ChainableLED/examples/SimpleCycle/SimpleCycle.ino (added)
• ChainableLED/keywords.txt (added)
• Makefile (modified) (1 diff)
• rca_app.cpp (modified) (6 diffs)
• rca_app.h (modified) (1 diff)

rtos_arduino/trunk/examples/NCESIoT_RTOS/Makefile

@@ -62 +62 @@
 APPL_COBJS   += 
 
+APPL_DIR     += ./ChainableLED
+APPL_CXXOBJS += ChainableLED.o
+APPL_COBJS   += 
+
 include $(RCA_DIR)/lib/Makefile.rca

rtos_arduino/trunk/examples/NCESIoT_RTOS/rca_app.cpp

@@ -6 +6 @@
 #include <Digital_Light_TSL2561.h>
 #include <SeeedOLED.h>
+#include <ChainableLED.h>
+
+#define LED_PIN  4
+
+void setup()
+{
+    Serial.begin(115200);
+    pinMode(LED_PIN, OUTPUT);
+}
+
+void loop() 
+{
+    digitalWrite(LED_PIN, HIGH);   // turn the LED on (HIGH is the voltage level)
+    delay(1000);                   // wait for a second
+    digitalWrite(LED_PIN, LOW);    // turn the LED off by making the voltage LOW
+    delay(1000);                   // wait for a second    
+}
+
 
 #define TOUCH_PIN 3
@@ -11 +29 @@
 int is_update_oled;
 
-void setup() 
+void task1_setup() 
 {
-    Serial.begin(115200);
     Wire.begin();
     TSL2561.init();
@@ -23 +40 @@
 } 
  
-void loop() 
-{    
+void task1_loop() 
+{
+    int lux;
+
+    lux = TSL2561.readVisibleLux();
     Serial.print("The Light value is: ");
-    Serial.println(TSL2561.readVisibleLux());
+    Serial.println(lux);
 
     if (is_update_oled == 1) {
         wai_sem(OLED_SEM);
-        SeeedOled.clearDisplay();
-        SeeedOled.putNumber(TSL2561.readVisibleLux());
+        SeeedOled.setTextXY(0, 0);        
+        SeeedOled.putNumber(lux);
+        SeeedOled.putString("    ");        
         sig_sem(OLED_SEM);
     }
@@ -45 +66 @@
 #endif /* USE_INTERRUPT */
 
-void task1_setup()
+void task2_setup()
 {
     pinMode(TOUCH_PIN, INPUT_PULLUP);
@@ -53 +74 @@
 }
 
-void task1_loop() 
+void task2_loop() 
 {
 #ifdef USE_INTERRUPT    
@@ -75 +96 @@
     }
 }
+
+#define NUM_LEDS  1
+
+ChainableLED leds(8, 9, NUM_LEDS);
+
+void task3_setup()
+{
+    leds.init();
+}
+
+float hue = 0.0;
+boolean up = true;
+int count = 0;
+
+void task3_loop()
+{
+    for (byte i=0; i<NUM_LEDS; i++)
+      leds.setColorHSB(i, hue, 1.0, 0.5);
+    
+    delay(50);
+    
+    if (up)
+      hue+= 0.025;
+    else
+      hue-= 0.025;
+    
+    if (hue>=1.0 && up)
+      up = false;
+    else if (hue<=0.0 && !up)
+      up = true;
+}

rtos_arduino/trunk/examples/NCESIoT_RTOS/rca_app.h

@@ -2 +2 @@
 #define _RCA_APP_H_
 
-#define RCA_NUM_TASK 1
+#define RCA_NUM_TASK 3
 
 #endif /* _RCA_APP_H_ */