From 9626d8fbfe2b2cb770cf5df599a663410eceb3e0 Mon Sep 17 00:00:00 2001
From: Bernhard Tittelbach <xro@realraum.at>
Date: Thu, 12 Aug 2010 20:14:19 +0000
Subject: [PATCH] unfinished

---
 .../rf433ctl_timer_consolidation_experiment.pde    |  627 ++++++++++++++++++++
 1 file changed, 627 insertions(+)
 create mode 100644 rf433ctl/rf433ctl_timer_consolidation_experiment.pde

diff --git a/rf433ctl/rf433ctl_timer_consolidation_experiment.pde b/rf433ctl/rf433ctl_timer_consolidation_experiment.pde
new file mode 100644
index 0000000..2fa4d79
--- /dev/null
+++ b/rf433ctl/rf433ctl_timer_consolidation_experiment.pde
@@ -0,0 +1,627 @@
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <inttypes.h>
+#include <OneWire.h>
+#include <DallasTemperature.h>
+#include <IRremote.h>
+
+//********************************************************************//
+
+#define RF_DATA_OUT_PIN 13
+#define IR_MOVEMENT_PIN 9
+#define ONE_WIRE_PIN 8
+#define PANIC_BUTTON_PIN 7
+#define PANICLED_PWM_PIN 6
+#define BLUELED_PWM_PIN 11
+#define PHOTO_ANALOGPIN 0
+//movement is reported if during IR_SAMPLE_DURATION at least IR_TRESHOLD ir signals are detectd
+#define IR_SAMPLE_DURATION 12000
+#define IR_TRESHOLD 8000
+//duration PanicButton needs to be pressed before status change occurs (i.e. for two PanicButton Reports, the buttons needs to be pressed 1000 cycles, releases 1000 cycles and again pressed 1000 cycles)
+#define PB_TRESHOLD 1000
+#define PHOTO_SAMPLE_INTERVAL 4000
+#define IRREMOTE_SEND_PIN 3   //hardcoded in library
+//WARNING IRremote Lib uses TCCR2
+
+OneWire  onewire(ONE_WIRE_PIN);
+DallasTemperature dallas_sensors(&onewire);
+DeviceAddress onShieldTemp = { 0x10, 0xE7, 0x77, 0xD3, 0x01, 0x08, 0x00, 0x3F };
+IRsend irsend; 
+#define TEMPC_OFFSET_ARDUINO_GENEREATED_HEAT 
+
+//********************************************************************//
+// IR Codes, 32 bit, NEC
+const int YAMAHA_CODE_BITS = 32;
+const unsigned long int YAMAHA_CODE_BASE = 0x0000000005EA10000;
+
+const char YAMAHA_POWER_TOGGLE =0xF8; //Power On/Off
+const char YAMAHA_POWER_OFF =0x78; //Power Off !!!
+const char YAMAHA_SLEEP =0xEA; //Toggle Sleep 120/90/60/30min or Off
+
+const char YAMAHA_CD =0xA8; //Input CD
+const char YAMAHA_TUNER =0x68; //Input Tuner
+const char YAMAHA_TAPE =0x18; //Input Toggle Tape/CD
+const char YAMAHA_DVD_SPDIF =0xE8; //Input Toggle DVD Auto / DVD Analog
+const char YAMAHA_SAT_SPDIFF =0x2A; //Input Toggle Sat-DTV Auto / Sat-DTV Analog
+const char YAMAHA_AUX =0xAA;  //Input AUX (mode)
+const char YAMAHA_VCR =0xF0; //Input VCR
+const char YAMAHA_EXT51DEC =0xE1; //Input Ext. Decoder On/Off
+
+const char YAMAHA_TUNER_PLUS =0x08; //Tuner Next Station 1-7  (of A1 - E7)
+const char YAMAHA_TUNER_MINUS =0x88; //Tuner Prev Station 1-7  (of A1 - E7)
+const char YAMAHA_TUNER_ABCDE =0x48; //Tuner Next Station Row A-E (of A1 - E7)
+
+const char YAMAHA_MUTE =0x38;
+const char YAMAHA_VOLUME_UP =0x58;
+const char YAMAHA_VOLUME_DOWN =0xD8;
+
+//const char YAMAHA_FRONT_LEVEL_P =0x01;  //no function
+//const char YAMAHA_FRONT_LEVEL_M =0x81; //no function
+//const char YAMAHA_CENTRE_LEVEL_P =0x41;  //no function
+//const char YAMAHA_CENTRE_LEVEL_M =0xC1; //no function
+//const char YAMAHA_REAR_LEVEL_P =0x7A; //no function
+//const char YAMAHA_REAR_LEVEL_M =0xFA; //no function
+const char YAMAHA_PLUS =0x4A;  //unteres Steuerkreuz: Taste Rechts (Plus)
+const char YAMAHA_MINUS =0xCA; //unteres Steuerkreuz: Taste Links (Minus)
+const char YAMAHA_MENU =0x39; // Menu: Settings
+const char YAMAHA_TEST =0xA1; // Test Sounds
+const char YAMAHA_TIME_LEVEL =0x19; //Settings for Delay, Subwfs, Right Surround, Left Surround, Center
+const char YAMAHA_TIME_LEVEL2 =0x61; //(also) Settings for Delay, Subwfs, Right Surround, Left Surround, Center
+const char YAMAHA_TIME_LEVEL3 =0x99; //(also) Settings for Delay, Subwfs, Right Surround, Left Surround, Center
+
+const char YAMAHA_EFFECT_TOGGLE =0x6A; //Effect Toggle On/Off
+const char YAMAHA_PRG_DOWN =0x9A; //Effect/DSP Programm Toggle in down direction
+const char YAMAHA_PRG_UP =0x1A; //Effect/DSP Programm Toggle in up direction
+const char YAMAHA_EFFECT1 =0x31; //Effect TV Sports
+const char YAMAHA_EFFECT2 =0x71; //Effect Rock Concert
+const char YAMAHA_EFFECT3 =0xB1;  //Effect Disco
+const char YAMAHA_EFFECT4 =0xD1;  //Mono Movie
+const char YAMAHA_EFFECT5 =0x91; //Effect Toggle 70mm Sci-Fi / 70mm Spectacle
+const char YAMAHA_EFFECT6 =0x51; //Effect Toggle 70mm General / 70mm Adventure
+const char YAMAHA_P5 =0xFB; //P5 PRT (1 Main Bypass)? (1587674115)
+
+//********************************************************************//
+
+typedef struct {
+  byte offset;
+  byte state;
+} rf_bit_t;
+
+// offset is number of alphas (0.08ms)
+
+const rf_bit_t zero_bit[] = { {  4, 1 },
+                              { 16, 0 },
+                              { 20, 1 },
+                              { 32, 0 },
+                              {  0, 0 } };
+
+const rf_bit_t one_bit[] = { { 12, 1 },
+                             { 16, 0 },
+                             { 28, 1 },
+                             { 32, 0 },
+                             {  0, 0 } };
+
+const rf_bit_t float_bit[] = { {  4, 1 },
+                               { 16, 0 },
+                               { 28, 1 },
+                               { 32, 0 },
+                               {  0, 0 } };
+
+const rf_bit_t sync_bit[] = { {   4, 1 },
+                              { 128, 0 },
+                              {   0, 0 } };
+
+typedef enum { ZERO = 0, ONE , FLOAT , SYNC } adbit_t;
+typedef byte ad_bit_t;
+#define WORD_LEN 13
+typedef ad_bit_t word_t[WORD_LEN];
+
+const rf_bit_t* bit_defs[] = { zero_bit, one_bit, float_bit, sync_bit };
+
+byte alpha_cnt = 0;
+byte bit_cnt = 0;
+byte chunk_cnt = 0;
+byte word_cnt = 0;
+const ad_bit_t* current_word;
+byte volatile frame_finished = 1;
+
+#define FRAME_LEN 8
+
+#define A1_ON  0
+#define A1_OFF 1
+#define A2_ON  2
+#define A2_OFF 3
+
+#define B1_ON  4
+#define B1_OFF 5
+#define B2_ON  6
+#define B2_OFF 7
+
+#define C1_ON  8
+#define C1_OFF 9
+#define C2_ON  10
+#define C2_OFF 11
+
+#define D1_ON  12
+#define D1_OFF 13
+#define D2_ON  14
+#define D2_OFF 15
+
+const word_t words[]  = { 
+{ ZERO,  ZERO,  FLOAT, FLOAT, ZERO,  ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, FLOAT, SYNC }, // A1_ON
+{ ZERO,  ZERO,  FLOAT, FLOAT, ZERO,  ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO,  SYNC }, // A1_OFF
+{ ZERO,  ZERO,  FLOAT, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, FLOAT, SYNC }, // A2_ON
+{ ZERO,  ZERO,  FLOAT, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO,  SYNC }, // A2_OFF
+
+{ FLOAT, ZERO,  FLOAT, FLOAT, ZERO,  ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, FLOAT, SYNC }, // B1_ON
+{ FLOAT, ZERO,  FLOAT, FLOAT, ZERO,  ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO,  SYNC }, // B1_OFF
+{ FLOAT, ZERO,  FLOAT, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, FLOAT, SYNC }, // B2_ON
+{ FLOAT, ZERO,  FLOAT, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO,  SYNC }, // B2_OFF
+
+{ ZERO,  FLOAT, FLOAT, FLOAT, ZERO,  ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, FLOAT, SYNC }, // C1_ON
+{ ZERO,  FLOAT, FLOAT, FLOAT, ZERO,  ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO,  SYNC }, // C1_OFF
+{ ZERO,  FLOAT, FLOAT, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, FLOAT, SYNC }, // C2_ON
+{ ZERO,  FLOAT, FLOAT, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO,  SYNC }, // C2_OFF
+
+{ FLOAT, FLOAT, FLOAT, FLOAT, ZERO,  ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, FLOAT, SYNC }, // D1_ON
+{ FLOAT, FLOAT, FLOAT, FLOAT, ZERO,  ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO,  SYNC }, // D1_OFF
+{ FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, FLOAT, SYNC }, // D2_ON
+{ FLOAT, FLOAT, FLOAT, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO, FLOAT, FLOAT, ZERO,  SYNC }  // D2_OFF
+};
+
+
+//********************************************************************//
+
+int save_tcnt2=0;
+int save_tccr2a=0;
+int save_tccr2b=0;
+int save_timsk2=0;
+void reset_timer2()
+{
+  TCNT2 = save_tcnt2;
+  TCCR2A = save_tccr2a;  // normal mode
+  TCCR2B = save_tccr2b;
+  TIMSK2 = save_timsk2;
+}
+
+void start_timer()
+{
+  // timer 1: 2 ms
+  TCCR2A = 0;                    // prescaler 1:8, WGM = 4 (CTC)
+  TCCR2B = 1<<WGM12 | 1<<CS11;   // 
+  OCR2A = 159;        // (1+159)*8 = 1280 -> 0.08ms @ 16 MHz -> 1*alpha
+//  OCR1A = 207;        // (1+207)*8 = 1664 -> 0.104ms @ 16 MHz -> 1*alpha
+  TCNT2 = 0;          // reseting timer
+  TIMSK2 = 1<<OCIE2A; // enable Interrupt
+}
+
+void stop_timer() // stop the timer
+{
+  // timer1
+  TCCR2B = 0; // no clock source
+  TIMSK2 = 0; // disable timer interrupt
+}
+
+void init_word(const word_t w)
+{
+  current_word = w;
+  alpha_cnt = 0;
+  chunk_cnt = 0;
+  bit_cnt = 0;
+
+  if(bit_defs[current_word[bit_cnt]][chunk_cnt].state)
+    digitalWrite(RF_DATA_OUT_PIN, LOW); //neue 12V MosFET Verstärkung invertiert Logik !
+  else
+    digitalWrite(RF_DATA_OUT_PIN, HIGH);
+
+  start_timer();
+}
+
+ISR(TIMER2_COMPA_vect)
+{
+  alpha_cnt++;
+  if(alpha_cnt < bit_defs[current_word[bit_cnt]][chunk_cnt].offset)
+    return;
+
+  chunk_cnt++;
+  if(bit_defs[current_word[bit_cnt]][chunk_cnt].offset != 0) {
+    if(bit_defs[current_word[bit_cnt]][chunk_cnt].state)
+      digitalWrite(RF_DATA_OUT_PIN, LOW); //neue 12V MosFET Verstärkung invertiert Logik !
+    else
+      digitalWrite(RF_DATA_OUT_PIN, HIGH);
+    return;
+  }
+  
+  bit_cnt++;
+  if(bit_cnt < WORD_LEN) {
+    alpha_cnt = 0;
+    chunk_cnt = 0;
+    if(bit_defs[current_word[bit_cnt]][chunk_cnt].state)
+      digitalWrite(RF_DATA_OUT_PIN, LOW); //neue 12V MosFET Verstärkung invertiert Logik !
+    else
+      digitalWrite(RF_DATA_OUT_PIN, HIGH);
+    return;
+  }
+  stop_timer();
+  digitalWrite(RF_DATA_OUT_PIN, HIGH);
+
+  word_cnt++;
+  if(word_cnt < FRAME_LEN)
+    init_word(current_word);
+  else
+    frame_finished = 2;
+}
+
+//***********//
+
+
+void send_frame(const word_t w)
+{
+  if (frame_finished != 1)
+    for(;;) //wait until sending of previous frame finishes
+      if (frame_finished)
+      {
+        delay(150);
+        break;
+      }
+  word_cnt = 0;
+  frame_finished = 0;
+  init_word(w);
+}
+
+void check_frame_done()
+{
+  if (frame_finished==2)
+  {
+    Serial.println("Ok");
+    frame_finished=1;
+    reset_timer2();
+    delay(120);
+  }
+}
+
+//********************************************************************//
+
+void printTemperature(DeviceAddress deviceAddress)
+{
+  dallas_sensors.requestTemperatures();
+  float tempC = dallas_sensors.getTempC(deviceAddress);
+  //Serial.print("Temp C: ");
+  Serial.println(tempC TEMPC_OFFSET_ARDUINO_GENEREATED_HEAT);
+  //Serial.print(" Temp F: ");
+  //Serial.println(DallasTemperature::toFahrenheit(tempC)); // Converts tempC to Fahrenheit
+}
+
+//********************************************************************//
+
+unsigned int light_level_mean_ = 0;
+unsigned int light_sample_time_ = 0;
+
+void updateLightLevel(unsigned int pin)
+{
+  light_sample_time_++;
+  if (light_sample_time_ < PHOTO_SAMPLE_INTERVAL)
+    return;
+  light_sample_time_ = 0;
+  
+  unsigned int value = analogRead(pin);
+  if (value == light_level_mean_)
+    return;
+  
+  unsigned int diff = abs(value - light_level_mean_);
+  if (diff > 100)
+    light_level_mean_ = value;
+  else
+      light_level_mean_=(unsigned int) ( ((float) light_level_mean_) * 0.90 + ((float)value)*0.10 );
+}
+
+void printLightLevel()
+{
+  Serial.println(light_level_mean_);
+}
+
+//********************************************************************//
+
+unsigned long wm_start_[3]={0,0,0};
+bool wait_millis(unsigned long *start_time, unsigned long ms)
+{
+  if (ms == 0)
+    return false;
+  else if (*start_time > 0)
+  {
+    if (millis() < *start_time || millis() > (*start_time) + ms)
+    {
+      *start_time = 0;
+      return false;
+    }
+    else
+      return true;
+  }
+  else
+  {
+    *start_time=millis();
+    return true;
+  }
+}
+#define NUM_LEDS 2
+char flash_led_pins_[NUM_LEDS]={BLUELED_PWM_PIN,PANICLED_PWM_PIN};
+unsigned int flash_led_time_[3]={0,0,0};
+unsigned int flash_led_brightness_[3]={255,255,255};
+unsigned int flash_led_delay_[3]={8,8,8};
+unsigned int flash_led_initial_delay_[3]={0,0,0};
+void calculate_led_level()
+{
+  for (int ledid = 0; ledid < NUM_LEDS; ledid++)
+  {
+    if (flash_led_time_[ledid] == 0)
+      continue;
+    if (wait_millis(wm_start_ + ledid, flash_led_initial_delay_[ledid]))
+      continue;
+    flash_led_initial_delay_[ledid]=0;
+    if (wait_millis(wm_start_ + ledid, flash_led_delay_[ledid]))
+      continue;
+    flash_led_time_[ledid]--;
+    int c = abs(sin(float(flash_led_time_[ledid]) / 100.0)) * flash_led_brightness_[ledid];
+    //int d = abs(sin(float(flash_led_time_) / 100.0)) * flash_led_brightness_;
+    analogWrite(flash_led_pins_[ledid], 255-c);
+  }
+}
+
+ISR(TIMER1_COMPA_vect)
+{
+  calculate_led_level();
+}
+// id: id of LED to flash (0,1)
+// times: # of times the LED should flash
+// brightness_divisor: 1: full brightness, 2: half brightness, ...
+// delay_divisor: 1: slow... 8: fastest
+// phase_divisor: 0.. same phase; 2.. pi/2 phase, 4.. pi phase, 6.. 3pi/2 phase
+void flash_led(unsigned int id, unsigned int times, unsigned int brightness_divisor, unsigned int delay_divisor, unsigned int phase_divisor)
+{
+  if (id >= NUM_LEDS)
+    return;
+  unsigned int new_flash_led_brightness = 255;
+  unsigned int new_flash_led_delay = 8;
+  if (times == 0)
+  {
+    analogWrite(flash_led_pins_[id],255); //off
+    return;
+  }
+  if (brightness_divisor > 1) //guard against div by zero
+    new_flash_led_brightness /= brightness_divisor;
+  if (delay_divisor > 1)  //guard against div by zero
+    new_flash_led_delay /= delay_divisor;
+  if (flash_led_time_[id] == 0 || new_flash_led_brightness > flash_led_brightness_[id])
+    flash_led_brightness_[id]=new_flash_led_brightness;
+  if (flash_led_time_[id] == 0 || new_flash_led_delay < flash_led_delay_[id])
+    flash_led_delay_[id]=new_flash_led_delay;
+  flash_led_time_[id] += 314*times;
+  flash_led_initial_delay_[id] = flash_led_delay_[id]*314*phase_divisor/8;
+}
+
+void start_led_timer()
+{
+  // timer 1: 2 ms
+  TCCR1A = 0;                    // prescaler 1:8, WGM = 4 (CTC)
+  TCCR1B = 1<<WGM12 | 1<<CS11;   // 
+  OCR1A = 15999;        // (1+15999) = 16000 -> 1ms @ 16 MHz
+  TCNT1 = 0;          // reseting timer
+  TIMSK1 = 1<<OCIE1A; // enable Interrupt
+}
+
+void stop_led_timer() // stop the timer
+{
+  // timer1
+  TCCR1B = 0; // no clock source
+  TIMSK1 = 0; // disable timer interrupt
+}
+
+//********************************************************************//
+
+void send_yamaha_ir_signal(char codebyte)
+{
+  unsigned long int code = codebyte & 0xFF;
+  code <<= 8;
+  code |= (0xff ^ codebyte) & 0xFF;
+  code |= YAMAHA_CODE_BASE;
+  
+  //irsend changes PWM Timer Frequency among other things
+  //.. doesn't go well with PWM output using the same timer
+  //.. thus we just set output to 255 so whatever frequency is used, led is off for the duration
+  //analogWrite(BLUELED_PWM_PIN,255); // switch led off
+
+  irsend.sendNEC(code,YAMAHA_CODE_BITS);
+
+  reset_timer2();
+  analogWrite(BLUELED_PWM_PIN,255); // switch off led again to be sure
+                                      //is actually not necessary, since we are not multitasking/using interrupts, but just to be sure in case this might change
+
+  Serial.println("Ok");
+}
+
+//********************************************************************//
+
+void setup()
+{
+  pinMode(RF_DATA_OUT_PIN, OUTPUT);
+  digitalWrite(RF_DATA_OUT_PIN, HIGH);
+  pinMode(IR_MOVEMENT_PIN, INPUT);      // set pin to input
+  digitalWrite(IR_MOVEMENT_PIN, LOW);  // turn off pulldown resistors  
+  pinMode(PANIC_BUTTON_PIN, INPUT);      // set pin to input
+  digitalWrite(PANIC_BUTTON_PIN, LOW);  // turn on pulldown resistors 
+  analogWrite(PANICLED_PWM_PIN,255);
+  analogWrite(BLUELED_PWM_PIN,255); //pwm sink(-) instead of pwm + (better for mosfets)
+  pinMode(IRREMOTE_SEND_PIN, OUTPUT);
+  digitalWrite(IRREMOTE_SEND_PIN, HIGH);
+  
+  Serial.begin(9600);
+  
+  onewire.reset();
+  onewire.reset_search();
+  dallas_sensors.begin();
+  //in case we change temp sensor:
+  if (!dallas_sensors.getAddress(onShieldTemp, 0)) 
+    Serial.println("Error: Unable to find address for Device 0"); 
+  dallas_sensors.setResolution(onShieldTemp, 9);  
+
+  //save prev timer states:
+  save_tcnt2 = TCNT2;
+  save_tccr2a = TCCR2A;  // normal mode
+  save_tccr2b = TCCR2B;
+  start_led_timer();
+}
+
+unsigned int ir_time=IR_SAMPLE_DURATION;
+unsigned int ir_count=0;
+boolean pb_last_state=0;
+boolean pb_state=0;
+boolean pb_postth_state=0;
+unsigned int pb_time=0;
+
+void sensorEchoCommand(char command)
+{
+  Serial.print("Sensor ");
+  Serial.print(command);
+  Serial.print(": ");
+}
+
+void loop()
+{
+  ir_time--;
+  ir_count += (digitalRead(IR_MOVEMENT_PIN) == HIGH);
+
+  if (pb_time < PB_TRESHOLD)
+    pb_time++;
+  pb_state=(digitalRead(PANIC_BUTTON_PIN) == HIGH);
+  
+  if (ir_time == 0)
+  {
+    if (ir_count >= IR_TRESHOLD)
+    {
+      flash_led(0, 1, 8, 1, 0 );
+      Serial.println("movement");
+    }
+    ir_time=IR_SAMPLE_DURATION;
+    ir_count=0;
+  }
+  
+  if (pb_state == pb_last_state && pb_time >= PB_TRESHOLD)
+  {
+    if (pb_state && ! pb_postth_state)
+    {   
+      pb_postth_state=1;
+      Serial.println("PanicButton");
+      flash_led(0, 28, 1, 4, 0 );
+      flash_led(1, 28, 1, 4, 4 );
+    }
+    else if (!pb_state)
+      pb_postth_state=0;
+  }
+  else if (pb_state != pb_last_state)
+  {
+    pb_time=0;
+    pb_last_state=pb_state;
+  }
+  
+  updateLightLevel(PHOTO_ANALOGPIN);
+  //calculate_led_level();
+  check_frame_done();
+  
+  if(Serial.available()) {
+    char command = Serial.read();
+    
+    if(command == 'A')
+      send_frame(words[A1_ON]);
+    else if(command == 'a')
+      send_frame(words[A1_OFF]);
+    else if(command == 'B')
+      send_frame(words[A2_ON]);
+    else if(command == 'b')
+      send_frame(words[A2_OFF]);
+
+    else if(command == 'C')
+      send_frame(words[B1_ON]);
+    else if(command == 'c')
+      send_frame(words[B1_OFF]);
+    else if(command == 'D')
+      send_frame(words[B2_ON]);
+    else if(command == 'd')
+      send_frame(words[B2_OFF]);
+
+    else if(command == 'E')
+      send_frame(words[C1_ON]);
+    else if(command == 'e')
+      send_frame(words[C1_OFF]);
+    else if(command == 'F')
+      send_frame(words[C2_ON]);
+    else if(command == 'f')
+      send_frame(words[C2_OFF]);
+
+    else if(command == 'G')
+      send_frame(words[D1_ON]);
+    else if(command == 'g')
+      send_frame(words[D1_OFF]);
+    else if(command == 'H')
+      send_frame(words[D2_ON]);
+    else if(command == 'h')
+      send_frame(words[D2_OFF]);
+    else if(command == 'T')
+    {
+      sensorEchoCommand(command);
+      printTemperature(onShieldTemp);
+    }
+    else if(command == 'P')
+    {
+      sensorEchoCommand(command);
+      printLightLevel();
+    }
+    else if (command == '^')
+      flash_led(1, 1, 2, 1, 0);
+    else if (command == '0')
+      send_yamaha_ir_signal(YAMAHA_POWER_OFF);
+    else if (command == '1')
+      send_yamaha_ir_signal(YAMAHA_POWER_TOGGLE);
+    else if (command == '2')
+      send_yamaha_ir_signal(YAMAHA_VOLUME_UP);
+    else if (command == '3')
+      send_yamaha_ir_signal(YAMAHA_VOLUME_DOWN);
+    else if (command == '4')
+      send_yamaha_ir_signal(YAMAHA_MUTE);
+    else if (command == '5')
+      send_yamaha_ir_signal(YAMAHA_CD);
+    else if (command == '6')
+      send_yamaha_ir_signal(YAMAHA_TUNER);
+    else if (command == '7')
+      send_yamaha_ir_signal(YAMAHA_DVD_SPDIF);
+    else if (command == '8')
+      send_yamaha_ir_signal(YAMAHA_MENU);
+    else if (command == '+')
+      send_yamaha_ir_signal(YAMAHA_PLUS);
+    else if (command == '-')
+      send_yamaha_ir_signal(YAMAHA_MINUS);
+    else if (command == 0xa7) // §
+      send_yamaha_ir_signal(YAMAHA_TEST);
+    else if (command == '$')
+      send_yamaha_ir_signal(YAMAHA_TIME_LEVEL);
+    else if (command == '%')
+      send_yamaha_ir_signal(YAMAHA_EFFECT_TOGGLE);
+    else if (command == '&')
+      send_yamaha_ir_signal(YAMAHA_PRG_DOWN);
+    else if (command == '/')
+      send_yamaha_ir_signal(YAMAHA_PRG_UP);
+    else if (command == '(')
+      send_yamaha_ir_signal(YAMAHA_TUNER_PLUS);
+    else if (command == '[')
+      send_yamaha_ir_signal(YAMAHA_TUNER_MINUS);
+    else if (command == ')')
+      send_yamaha_ir_signal(YAMAHA_TUNER_ABCDE);
+    else if (command == '9')
+      send_yamaha_ir_signal(YAMAHA_TAPE);
+    else if (command == '?')
+      send_yamaha_ir_signal(YAMAHA_VCR);
+    else if (command == '=')
+      send_yamaha_ir_signal(YAMAHA_EXT51DEC);
+    else
+      Serial.println("Error: unknown command");
+  }
+}
-- 
1.7.10.4