Skip to content

Commit

Permalink
updateFromGitHub
Browse files Browse the repository at this point in the history
  • Loading branch information
tillepille authored and tillepille committed Mar 25, 2016
1 parent 39ae0a0 commit 0483112
Show file tree
Hide file tree
Showing 3 changed files with 215 additions and 14 deletions.
20 changes: 15 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,15 @@ https://github.com/Panzenbaby/Raspberry-Remote-for-Windows-10-IoT-Core

## Usage
Try if all is working with the send program
* Switch on single socket: `./send.cpp 00001 1 1`
* Switch on single socket: `./send 00001 1 1`
* Switch on multiple sockets: `./send 00001 1 00001 2 00001 3 1`

Pass the `-b`-option to use binary socket numbering instead of the common "only one switch up"-numbering. See [Binary Mode](#binary-mode) for further details.
### Options
* `-b`, `--binary`: Use binary socket numbering instead of the common "only one switch up"-numbering. See [Binary Mode](#binary-mode) for further details.
* `-p X`, `--pin=X` (X=pin number): Sets the pin number to use. Default is 0 in normal mode and 17 in [user mode](#user-mode).
* `-u`, `--user`: Run in user mode. This mode does not need root permissions, but the GPIO pin has to be exported beforehand using the `gpio` command. See [User Mode](#user-mode) for further details.
* `-s`, `--silent`: Disables all text output except for error messages.
* `-h`, `--help`: Display help.

## Binary Mode
Most sockets available for purchase use the following numbering scheme:
Expand All @@ -43,7 +49,7 @@ no. | address
C | 00100
D | 00010
E | 00001

Of course, this doesn't make much sense, because it limits the maximum of supported sockets to 5 (or 6, if 00000 is included), and is less intuitive. Using real binary numbering would increase the limit of supported sockets per system to 31, and be more intutive. In binary mode, the sockets need to be numbered as below:

no. | address
Expand All @@ -56,9 +62,13 @@ no. | address
8 | 01000
16 | 10000
31 | 11111

Note that you need to configure your sockets to this kind of numbering to use this feature. This often includes that the dedicated remote that gets shipped with the sockets often is rendered useless, since it only supports the former way of numbering.


## User Mode
Use this mode if you want to use `send` without root permission. The pin must be exported with the `gpio` utility beforehand because it will be used via the `/sys/class/gpio` interface. The command for the default pin is `gpio export 17 out`. The user must be a member of the *gpio* group to access exported gpio pins!.
**Important Note:** pin numbering is different in this mode! While wiringPi uses its own numbering scheme in default mode, this mode requires the native Broadcom GPIO numbers (the default port 0 is 17 in this mode). See the [wiringPi documentation](http://wiringpi.com/pins/) for further details.

## Daemon
Use the daemon in combination with the webinterface
* Copy the files in webinterface in your http directory
Expand Down
197 changes: 197 additions & 0 deletions send.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "RCSwitch.h"
#include <stdlib.h>
#include <stdio.h>
<<<<<<< HEAD
#include <string.h>

int main(int argc, char *argv[]) {
Expand Down Expand Up @@ -142,4 +143,200 @@ int main(int argc, char *argv[]) {
}
}
return 0;
=======
#include <string>
#include <getopt.h>
//#include <iostream>

void printUsage() {
printf("This is rasperry remote, an application to control remote plugs with the\nRaspberry Pi.\n");
printf("Based on RCSwitch and wiringPi. See github.com/xkonni/raspberry-remote for\nfurther reference.\n");
printf("Usage: \n sudo send [options] <systemCode> <unitCode> [<systemCode> <unitCode>] <command>\n or: sudo send -h\n\n");
printf("Options:\n\n");
printf(" -b, --binary:\n");
printf(" Switches the instance to binary mode.\n");
printf(" Binary mode means, that instead numbering the sockets by 00001 00010 00100\n");
printf(" 01000 10000, the sockets are numbered in real binary numbers as following:\n");
printf(" 00001 00010 00011 00100 00101 00110 and so on.\n");
printf(" This means that your sockets need to be setup in this manner, which often\n");
printf(" includes that the dedicated remote is rendered useless, but more than\n");
printf(" 6 sockets are supported.\n\n");
printf(" -h, --help:\n");
printf(" displays this help\n\n");
printf(" -p X, --pin=X\n");
printf(" Sets the pin to use to communicate with the sender.\n");
printf(" Important note: when running as root, pin numbers are wiringPi numbers while\n");
printf(" in user mode (-u, --user) pin numbers are BCM_GPIO numbers.\n");
printf(" See http://wiringpi.com/pins/ for details.\n");
printf(" Default: 0 in normal mode, 17 in user mode\n\n");
printf(" -s, --silent:\n");
printf(" Don't print any text, except for errors\n\n");
printf(" -u, --user:\n");
printf(" Switches the instance to user mode.\n");
printf(" In this mode this program does not need root privileges. It is required to\n");
printf(" export the GPIO pin using the gpio utility. Note that pin numbers are\n");
printf(" BCM_GPIO numbers in this mode! the export command for the default port is\n");
printf(" \"gpio export 17 out\". For more information about port numbering see\n");
printf(" http://wiringpi.com/pins/.\n\n");
}

int main(int argc, char *argv[]) {
bool silentMode = false;
bool binaryMode = false;
bool userMode = false;
int pin = 0;
int controlArgCount = 0;
char *systemCode;
int unitCode;
int command;
bool multiMode;

int c;
while (1) {
static struct option long_options[] =
{
{"binary", no_argument, 0, 'b'},
{"help", no_argument, 0, 'h'},
{"pin", required_argument, 0, 'p'},
{"silent", no_argument, 0, 's'},
{"user", no_argument, 0, 'u'},
0
};
int option_index = 0;

c = getopt_long (argc, argv, "bhp:su",long_options, &option_index);
/* Detect the end of the options. */
if (c == -1)
break;

switch (c) {
case 'b':
binaryMode = true;
break;
case 'p':
pin = atoi(optarg);
break;
case 's':
silentMode = true;
break;
case 'u':
userMode = true;
break;
case 'h':
printUsage();
return 0;
}
}

// When started in user mode, wiringPiSetupSys() is used. In this mode
// wiringPi uses the /sys/class/gpio interface and the GPIO pin are numbered
// by the native Broadcom GPIO numbers, where wiringPi-number 0 translates to
// bcm-number 17... so use this as default if no pin was set with -p
// reference:
// http://wiringpi.com/reference/setup/
// http://wiringpi.com/pins/
if (pin == 0 && userMode) {
pin = 17;
}

controlArgCount = argc - optind;
// we need at least 3 args: systemCode, unitCode and command
if (controlArgCount >= 3) {
if (!silentMode) {
if (binaryMode) {
printf("operating in binary mode\n");
}
if (userMode) {
printf("operating in user mode\n");
}
printf("using pin %d\n", pin);
}

char *controlArgs[controlArgCount];
int i = 0;
while (optind < argc && i < controlArgCount) {
controlArgs[i] = argv[optind++];
i++;
}

multiMode = controlArgCount > 3;

int numberOfActuators = (controlArgCount - 1) / 2;
// check if there are enough arguments supplied, we need (numberOfActuators * 2) + 1

if (controlArgCount != (numberOfActuators * 2) + 1) {
printf("invalid set of control arguments\nuse <systemCode> <unitCode> <command> or\n");
printf("<systemCode> <unitCode> [<systemCode> <unitCode>...] <command>\n");
return 1;
}

if (multiMode && !silentMode) {
printf("multi mode\n");
}

command = atoi(controlArgs[controlArgCount - 1]);
if (userMode) {
if (wiringPiSetupSys() == -1) return 1;
} else {
if (wiringPiSetup() == -1) return 1;
}
piHiPri(20);
RCSwitch mySwitch = RCSwitch();
mySwitch.setPulseLength(300);
mySwitch.enableTransmit(pin);

for (i = 0; i < numberOfActuators; i++) {
int indexSystemCode = i * 2;
int indexUnitCode = indexSystemCode + 1;
systemCode = controlArgs[indexSystemCode];
unitCode = atoi(controlArgs[indexUnitCode]);

if (!silentMode) {
printf("sending systemCode[%s] unitCode[%i] command[%i]\n", systemCode, unitCode, command);
}
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);
printUsage();
if (!multiMode) {
return -1;
}
}
} 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);
printUsage();
if (!multiMode) {
return -1;
}
}
}
}
return 0;
} else {
printUsage();
return -1;
>>>>>>> xkonni/master
}
12 changes: 3 additions & 9 deletions webinterface/config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,12 @@

/*
* specify configuration of sockets to use
* array("group", "plug", "description");
* array("systemcode", "group" , "plug", "description");
* use empty string to create empty box
* ""
*
*/
$config=array(
array("1", "00100", "01", "Steckdose1"),
array("1", "00100", "02", "Steckdose2"),
array("1", "00100", "03", "Steckdose3"),
array("1", "00100", "04", "Steckdose4"),
array("1", "00100", "05", "Steckdose5"),
array("1", "00100", "06", "Steckdose6"),
array("2", "7" , "02", "Kueche"),
)
array("1", "00100", "01", "PowerPlug1"),
)
?>

0 comments on commit 0483112

Please sign in to comment.