Skip to content

Commit

Permalink
Implementing a new method D that will generate a signal with true bin…
Browse files Browse the repository at this point in the history 
…ary adressing instead of the old "fake-binary adressing" depending on which switch is turned on
  • Loading branch information
Lukas Rose committed Jun 23, 2015
1 parent ce47537 commit cdbee2b
Show file tree
Hide file tree
Showing 3 changed files with 188 additions and 25 deletions.
121 changes: 120 additions & 1 deletion RCSwitch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
*/

#include "RCSwitch.h"
#include <iostream>
#include <bitset>

unsigned long RCSwitch::nReceivedValue = NULL;
unsigned int RCSwitch::nReceivedBitlength = 0;
Expand Down Expand Up @@ -171,6 +173,26 @@ void RCSwitch::switchOff(char* sGroup, int nChannel) {
this->sendTriState( this->getCodeWordA(sGroup, nChannel, false) );
}

/**
* Switch a remote switch on (Type A with 10 pole DIP switches), now with real-binary numbering (see comments in getCodeWordA and getCodeWordD)
*
* @param sGroup Code of the switch group (refers to DIP switches 1..5 where "1" = on and "0" = off, if all DIP switches are on it's "11111")
* @param nChannelCode Number of the switch itself (1..31)
*/
void RCSwitch::switchOnBinary(char* sGroup, int nChannel) {
this->sendTriState( this->getCodeWordD(sGroup, nChannel, true) );
}

/**
* Switch a remote switch off (Type A with 10 pole DIP switches), now with real-binary numbering (see comments in getCodeWordA and getCodeWordD)
*
* @param sGroup Code of the switch group (refers to DIP switches 1..5 where "1" = on and "0" = off, if all DIP switches are on it's "11111")
* @param nChannelCode Number of the switch itself (1..31)
*/
void RCSwitch::switchOffBinary(char* sGroup, int nChannel) {
this->sendTriState( this->getCodeWordD(sGroup, nChannel, false) );
}

/**
* Returns a char[13], representing the Code Word to be send.
* A Code Word consists of 9 address bits, 3 data bits and one sync bit but in our case only the first 8 address bits and the last 2 data bits were used.
Expand Down Expand Up @@ -225,7 +247,14 @@ char* RCSwitch::getCodeWordB(int nAddressCode, int nChannelCode, boolean bStatus
char* RCSwitch::getCodeWordA(char* sGroup, int nChannelCode, boolean bStatus) {
int nReturnPos = 0;
static char sReturn[13];

/*
* The codeword, that needs to be sent, consists of three main parts:
* char 0 to 4: Group-Number (already binary)
* char 5 to 9: Socket Number (converted to binary, where the socket number 0-5 sets the only active bit in the return string)
* e.g: socket 1 means: bit 1 is on, others off: 10000
* socket 5 means: bit 4 is on, others off: 00010
* char 10 to 11: Power state, where on means '01' and off means '10'
*/
const char* code[6] = { "FFFFF", "0FFFF", "F0FFF", "FF0FF", "FFF0F", "FFFF0" };

if (nChannelCode < 1 || nChannelCode > 5) {
Expand Down Expand Up @@ -254,7 +283,97 @@ char* RCSwitch::getCodeWordA(char* sGroup, int nChannelCode, boolean bStatus) {
sReturn[nReturnPos++] = '0';
}
sReturn[nReturnPos] = '\0';
//std::cout << sReturn;
return sReturn;
}

/**
* Like getCodeWord (Type A)
* Like getCodeWordA, but with real binary socket numbers instead of numbering by position of active bit.
*/

/**
* To use this function, the sockets need to be numbered in real binary after the following scheme:
*
* |no. | old representation | new binary |
* |--------------------------------------|
* | 1| 10000 | 00001 |
* | 2| 01000 | 00010 |
* | 3| 00100 | 00011 |
* | 4| 00010 | 00100 |
* | 5| 00001 | 00101 |
* | 6| ----- | 00110 |
* | 8| ----- | 01000 |
* | 16| ----- | 10000 |
* | 31| ----- | 11111 |
* |--------------------------------------|
*
* This means, that now more than 5 sockets can be used per system.
* It is, indeed, necessary, to set all the sockets used to the new binary numbering system.
* Therefore, most systems won't work with their dedicated remotes anymor, which
* only provide buttons for socket A to E, sending only the old representation as noted
* above.
*/

char* RCSwitch::getCodeWordD(char* sGroup, int nChannelCode, boolean bStatus) {
int nReturnPos = 0;
static char sReturn[13];

/**
* The codeword, that needs to be sent, consists of three main parts:
* char 0 to 4: Group-Number (already binary)
* char 5 to 9: Socket Number (converted to binary, former: the socket number 0-5 sets the only active bit in the return string)
* e.g: socket 1 means: bit 1 is on, others off: 10000
* socket 5 means: bit 4 is on, others off: 00010
* now: real binary representation of decimal socket number
* char 10 to 11: Power state, where on means '01' and off means '10'
*/

//const char* code[6] = { "FFFFF", "0FFFF", "F0FFF", "FF0FF", "FFF0F", "FFFF0" }; //former conversion of socket number to binary

if (nChannelCode < 1 || nChannelCode > 31) {
return '\0';
}

for (int i = 0; i<5; i++) {
if (sGroup[i] == '0') {
sReturn[nReturnPos++] = 'F';
} else if (sGroup[i] == '1') {
sReturn[nReturnPos++] = '0';
} else {
return '\0';
}
}

std::string str = std::bitset<5>(nChannelCode).to_string(); //to binary;
std::string temp = str;
/*if (str.size() == 1) {
str="0000"+temp;
} else if (str.size() == 2) {
str="000"+temp;
} else if (str.size() == 3) {
str="00"+temp;
} else if (str.size() == 4) {
str = "0"+temp;
}*/

for(std::string::size_type i = 0; i < str.size(); ++i) {
if (str[i] == '0') {
sReturn[nReturnPos++] = 'F';
} else if (str[i] == '1') {
sReturn[nReturnPos++] = '0';
}
}

if (bStatus) {
sReturn[nReturnPos++] = '0';
sReturn[nReturnPos++] = 'F';
} else {
sReturn[nReturnPos++] = 'F';
sReturn[nReturnPos++] = '0';
}
sReturn[nReturnPos] = '\0';
//std::cout << sReturn;
return sReturn;
}

Expand Down
8 changes: 8 additions & 0 deletions RCSwitch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ class RCSwitch {
void switchOff(char* sGroup, int nSwitchNumber);
void switchOn(char sFamily, int nGroup, int nDevice);
void switchOff(char sFamily, int nGroup, int nDevice);
/**
* new methods, that use binary representation of
* socket numbering instead of the old represenation
* by switching each a differend switch on.
*/
void switchOnBinary(char* sGroup, int nSwitchNumber);
void switchOffBinary(char* sGroup, int nSwitchNumber);

void sendTriState(char* Code);
void send(unsigned long Code, unsigned int length);
Expand Down Expand Up @@ -90,6 +97,7 @@ class RCSwitch {
private:
char* getCodeWordB(int nGroupNumber, int nSwitchNumber, boolean bStatus);
char* getCodeWordA(char* sGroup, int nSwitchNumber, boolean bStatus);
char* getCodeWordD(char* sGroup, int nSwitchNumber, boolean bStatus);
char* getCodeWordC(char sFamily, int nGroup, int nDevice, boolean bStatus);
void sendT0();
void sendT1();
Expand Down
84 changes: 60 additions & 24 deletions send.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,39 @@
#include "RCSwitch.h"
#include <stdlib.h>
#include <stdio.h>
#include <string>
//#include <iostream>

int main(int argc, char *argv[]) {

/*
/**
* output PIN is hardcoded for testing purposes
* see https://projects.drogon.net/raspberry-pi/wiringpi/pins/
* for pin mapping of the raspberry pi GPIO connector
*/
int PIN = 0;
char* systemCode = argv[1];
int unitCode = atoi(argv[2]);
int command = atoi(argv[3]);
/**
* using old numbering mode by default,
* see RCSwitch.cpp for differences
*/
bool binaryMode = false;
char* systemCode;
int unitCode;
int command;
std::string firstArgument = argv[1];

if (firstArgument == "-b") {
printf("operating in binary mode...\n");
binaryMode = true;
//position of data in input is now shifted by 1 because of '-b'-flag
systemCode = argv[2];
unitCode = atoi(argv[3]);
command = atoi(argv[4]);
} else {
//no binary mode, therefore using normal mode with old numbering
systemCode = argv[1];
unitCode = atoi(argv[2]);
command = atoi(argv[3]);
}

if (wiringPiSetup () == -1) return 1;
piHiPri(20);
Expand All @@ -26,24 +47,39 @@ int main(int argc, char *argv[]) {
mySwitch.setPulseLength(300);
mySwitch.enableTransmit(PIN);

switch(command) {
case 1:
mySwitch.switchOn(systemCode, unitCode);
break;
case 0:
mySwitch.switchOff(systemCode, unitCode);
break;
case 2:
// 00001 2 on binary coded
mySwitch.send("010101010001000101010001");
break;
case 3:
// 00001 2 on as TriState
mySwitch.sendTriState("FFFF0F0FFF0F");
break;
default:
printf("command[%i] is unsupported\n", command);
return -1;
if (binaryMode) {
switch (command){
case 1:
mySwitch.switchOnBinary(systemCode, unitCode);
break;
case 0:
mySwitch.switchOffBinary(systemCode, unitCode);
break;
default:
printf("command[%i] is unsupported\n", command);
return -1;
}
return 0;
} else {
switch(command) {
case 1:
mySwitch.switchOn(systemCode, unitCode);
break;
case 0:
mySwitch.switchOff(systemCode, unitCode);
break;
case 2:
// 00001 2 on binary coded
mySwitch.send("010101010001000101010001");
break;
case 3:
// 00001 2 on as TriState
mySwitch.sendTriState("FFFF0F0FFF0F");
break;
default:
printf("command[%i] is unsupported\n", command);
return -1;
}
return 0;
}
return 0;
}

0 comments on commit cdbee2b

Please sign in to comment.