Merge branch 'noise-maker'

irkit · Aug 31, 2014 · 0641425 · 0641425
2 parents 7042c74 + 86df7f7
commit 0641425
Show file tree

Hide file tree

Showing 49 changed files with 114 additions and 168 deletions.
diff --git a/firmware/t/microphone/check_flash_size.rb b/firmware/t/microphone/check_flash_size.rb
diff --git a/firmware/t/microphone/src/CRC8.c b/firmware/t/microphone/src/CRC8.c
diff --git a/firmware/t/microphone/src/CRC8.h b/firmware/t/microphone/src/CRC8.h
diff --git a/firmware/t/microphone/src/GSwifi.cpp b/firmware/t/microphone/src/GSwifi.cpp
diff --git a/firmware/t/microphone/src/GSwifi.h b/firmware/t/microphone/src/GSwifi.h
diff --git a/firmware/t/microphone/src/GSwifi_const.h b/firmware/t/microphone/src/GSwifi_const.h
diff --git a/firmware/t/microphone/src/Global.cpp b/firmware/t/microphone/src/Global.cpp
diff --git a/firmware/t/microphone/src/Global.h b/firmware/t/microphone/src/Global.h
diff --git a/firmware/t/microphone/src/Keys.cpp b/firmware/t/microphone/src/Keys.cpp
diff --git a/firmware/t/microphone/src/Keys.h b/firmware/t/microphone/src/Keys.h
diff --git a/firmware/t/microphone/src/MemoryFree.c b/firmware/t/microphone/src/MemoryFree.c
diff --git a/firmware/t/microphone/src/MemoryFree.h b/firmware/t/microphone/src/MemoryFree.h
diff --git a/firmware/t/microphone/src/MorseListener.cpp b/firmware/t/microphone/src/MorseListener.cpp
diff --git a/firmware/t/microphone/src/MorseListener.h b/firmware/t/microphone/src/MorseListener.h
diff --git a/firmware/t/microphone/src/convert.c b/firmware/t/microphone/src/convert.c
diff --git a/firmware/t/microphone/src/convert.h b/firmware/t/microphone/src/convert.h
diff --git a/firmware/t/microphone/src/host.h b/firmware/t/microphone/src/host.h
diff --git a/firmware/t/microphone/src/ipaddr.cpp b/firmware/t/microphone/src/ipaddr.cpp
diff --git a/firmware/t/microphone/src/ipaddr.h b/firmware/t/microphone/src/ipaddr.h
diff --git a/firmware/t/microphone/src/microphone.ino b/firmware/t/microphone/src/microphone.ino
diff --git a/firmware/t/microphone/src/pgmStrToRAM.c b/firmware/t/microphone/src/pgmStrToRAM.c
diff --git a/firmware/t/microphone/src/pgmStrToRAM.h b/firmware/t/microphone/src/pgmStrToRAM.h
diff --git a/firmware/t/microphone/src/pins.h b/firmware/t/microphone/src/pins.h
diff --git a/firmware/t/microphone/src/ringbuffer.c b/firmware/t/microphone/src/ringbuffer.c
diff --git a/firmware/t/microphone/src/ringbuffer.h b/firmware/t/microphone/src/ringbuffer.h
diff --git a/firmware/t/microphone/src/timer.h b/firmware/t/microphone/src/timer.h
diff --git a/firmware/t/microphone/src/version.h b/firmware/t/microphone/src/version.h
diff --git a/firmware/t/microphone/build.sh → firmware/t/noise-maker/build.sh b/firmware/t/microphone/build.sh → firmware/t/noise-maker/build.sh
diff --git a/firmware/t/noise-maker/lib/.holder b/firmware/t/noise-maker/lib/.holder
diff --git a/firmware/t/microphone/serial.sh → firmware/t/noise-maker/serial.sh b/firmware/t/microphone/serial.sh → firmware/t/noise-maker/serial.sh
diff --git a/firmware/t/noise-maker/src/FullColorLed.cpp b/firmware/t/noise-maker/src/FullColorLed.cpp
@@ -0,0 +1 @@
+../../../src/IRKit/FullColorLed.cpp
diff --git a/firmware/t/noise-maker/src/FullColorLed.h b/firmware/t/noise-maker/src/FullColorLed.h
@@ -0,0 +1 @@
+../../../src/IRKit/FullColorLed.h
diff --git a/firmware/t/noise-maker/src/IrCtrl.cpp b/firmware/t/noise-maker/src/IrCtrl.cpp
@@ -0,0 +1 @@
+../../../src/IRKit/IrCtrl.cpp
diff --git a/firmware/t/noise-maker/src/IrCtrl.h b/firmware/t/noise-maker/src/IrCtrl.h
@@ -0,0 +1 @@
+../../../src/IRKit/IrCtrl.h
diff --git a/firmware/t/noise-maker/src/IrPacker.c b/firmware/t/noise-maker/src/IrPacker.c
@@ -0,0 +1 @@
+../../../src/IRKit/IrPacker.c
diff --git a/firmware/t/noise-maker/src/IrPacker.h b/firmware/t/noise-maker/src/IrPacker.h
@@ -0,0 +1 @@
+../../../src/IRKit/IrPacker.h
diff --git a/firmware/t/microphone/src/Makefile → firmware/t/noise-maker/src/Makefile b/firmware/t/microphone/src/Makefile → firmware/t/noise-maker/src/Makefile
@@ -2,10 +2,10 @@ BOARD_TAG    = leonardo
 ARDUINO_PORT = /dev/cu.usb*
 # ARDUINO_LIBS = SoftwareSerial BGLib
 ARDUINO_DIR  = /Applications/Arduino.app/Contents/Resources/Java
-ARDMK_DIR    = ~/proj/Arduino-Makefile
-USER_LIB_PATH = ${HOME}/shared/arduino/imote
+ARDMK_DIR    = ~/src/github.com/sudar/Arduino-Makefile
+USER_LIB_PATH = ../../lib
 
-include ~/proj/Arduino-Makefile/arduino-mk/Arduino.mk
+include ~/src/github.com/sudar/Arduino-Makefile/Arduino.mk
 
 ### flymake
 

diff --git a/firmware/t/noise-maker/src/MemoryFree.c b/firmware/t/noise-maker/src/MemoryFree.c
@@ -0,0 +1 @@
+../../../src/IRKit/MemoryFree.c
diff --git a/firmware/t/noise-maker/src/MemoryFree.h b/firmware/t/noise-maker/src/MemoryFree.h
@@ -0,0 +1 @@
+../../../src/IRKit/MemoryFree.h
diff --git a/firmware/t/noise-maker/src/const.h b/firmware/t/noise-maker/src/const.h
@@ -0,0 +1 @@
+../../../src/IRKit/const.h
diff --git a/firmware/t/noise-maker/src/env.h b/firmware/t/noise-maker/src/env.h
@@ -0,0 +1 @@
+../../../src/IRKit/env.h
diff --git a/firmware/t/noise-maker/src/log.h b/firmware/t/noise-maker/src/log.h
@@ -0,0 +1 @@
+../../../src/IRKit/log.h
diff --git a/firmware/t/noise-maker/src/noise-maker.ino b/firmware/t/noise-maker/src/noise-maker.ino
@@ -0,0 +1,95 @@
+#include "Arduino.h"
+#include "pins.h"
+#include "IrCtrl.h"
+#include "MemoryFree.h"
+#include "pgmStrToRAM.h"
+#include "FullColorLed.h"
+#include "timer.h"
+
+volatile char sharedbuffer[ SHARED_BUFFER_SIZE ];
+static FullColorLed color( FULLCOLOR_LED_R, FULLCOLOR_LED_G, FULLCOLOR_LED_B );
+
+void on_timer();
+void on_ir_receive();
+void on_ir_xmit();
+void send();
+
+void setup() {
+    Serial.begin(115200);
+
+    //--- initialize timer
+
+    timer_init( on_timer );
+    timer_start( TIMER_INTERVAL );
+
+    //--- initialize full color led
+
+    pinMode(FULLCOLOR_LED_R, OUTPUT);
+    pinMode(FULLCOLOR_LED_G, OUTPUT);
+    pinMode(FULLCOLOR_LED_B, OUTPUT);
+    color.setLedColor( 1, 0, 0, false ); // red: error
+
+    //--- initialize IR
+
+    pinMode(IR_OUT,           OUTPUT);
+
+    // pull-up
+    pinMode(IR_IN,            INPUT);
+    digitalWrite(IR_IN,       HIGH);
+
+    IR_initialize( &on_ir_receive );
+    IR_state( IR_IDLE );
+
+    color.setLedColor( 1, 1, 0, true ); // yellow blink: sending
+}
+
+void loop() {
+    IR_loop();
+
+    if (IrCtrl.state == IR_IDLE) {
+        send();
+    }
+}
+
+void send() {
+    // Apple Remote Play/Pause
+    IR_state( IR_WRITING );
+    IR_put(0x46E1); IR_put(0x2325); IR_put(0x04CE); IR_put(0x044C);
+    IR_put(0x04CC); IR_put(0x0D0B); IR_put(0x04CF); IR_put(0x0D09);
+    IR_put(0x049E); IR_put(0x0D3B); IR_put(0x049E); IR_put(0x047C);
+    IR_put(0x04CC); IR_put(0x0D0A); IR_put(0x049E); IR_put(0x0D3A);
+    IR_put(0x049E); IR_put(0x0D3A); IR_put(0x04CE); IR_put(0x0D0A);
+    IR_put(0x049E); IR_put(0x0D3A); IR_put(0x04CD); IR_put(0x0D0C);
+    IR_put(0x04CD); IR_put(0x044C); IR_put(0x04CC); IR_put(0x044C);
+    IR_put(0x04CB); IR_put(0x044D); IR_put(0x049C); IR_put(0x047C);
+    IR_put(0x04CD); IR_put(0x0D19); IR_put(0x049E); IR_put(0x0D3A);
+    IR_put(0x04CA); IR_put(0x0451); IR_put(0x049B); IR_put(0x0D3B);
+    IR_put(0x049D); IR_put(0x047C); IR_put(0x049B); IR_put(0x047E);
+    IR_put(0x04CB); IR_put(0x044E); IR_put(0x04CB); IR_put(0x044D);
+    IR_put(0x04CC); IR_put(0x044C); IR_put(0x049B); IR_put(0x047E);
+    IR_put(0x049A); IR_put(0x047D); IR_put(0x04C9); IR_put(0x044F);
+    IR_put(0x049A); IR_put(0x0D3C); IR_put(0x049C); IR_put(0x0D3B);
+    IR_put(0x04CF); IR_put(0x0D08); IR_put(0x049D); IR_put(0x0D3B);
+    IR_put(0x049C); IR_put(0x0D3E); IR_put(0x049C); IR_put(0xFFFF);
+    IR_put(0x0000); IR_put(0x25DF); IR_put(0x46AD); IR_put(0x1188);
+    IR_put(0x049C);
+
+    Serial.println(P("sending"));
+    IR_xmit();
+}
+
+// inside ISR, be careful
+void on_timer() {
+    color.onTimer(); // 200msec blink
+
+    IR_timer();
+}
+
+void on_ir_receive() {
+    Serial.println("<i");
+}
+
+void on_ir_xmit() {
+    Serial.println("i>");
+}
+
diff --git a/firmware/t/noise-maker/src/pgmStrToRAM.c b/firmware/t/noise-maker/src/pgmStrToRAM.c
@@ -0,0 +1 @@
+../../../src/IRKit/pgmStrToRAM.c
diff --git a/firmware/t/noise-maker/src/pgmStrToRAM.h b/firmware/t/noise-maker/src/pgmStrToRAM.h
@@ -0,0 +1 @@
+../../../src/IRKit/pgmStrToRAM.h
diff --git a/firmware/t/noise-maker/src/pins.h b/firmware/t/noise-maker/src/pins.h
@@ -0,0 +1 @@
+../../../src/IRKit/pins.h
diff --git a/firmware/t/noise-maker/src/timer.c b/firmware/t/noise-maker/src/timer.c
@@ -0,0 +1 @@
+../../../src/IRKit/timer.c
diff --git a/firmware/t/noise-maker/src/timer.h b/firmware/t/noise-maker/src/timer.h
@@ -0,0 +1 @@
+../../../src/IRKit/timer.h
diff --git a/firmware/t/microphone/upload.sh → firmware/t/noise-maker/upload.sh b/firmware/t/microphone/upload.sh → firmware/t/noise-maker/upload.sh