From 0ffd9194e8e064c367287b14a8392250bbba8262 Mon Sep 17 00:00:00 2001 From: gitbjo Date: Mon, 16 Sep 2019 18:52:47 +0200 Subject: [PATCH] Fixes for !IN and Status.Level --- .../GPIO Modules/GPIO_Modules.hgx | 55 +++++++------------ .../Raspberry Pi/GPIO Modules/README.md | 16 ++++-- .../Raspberry Pi/GPIO Modules/package.json | 4 +- 3 files changed, 33 insertions(+), 42 deletions(-) diff --git a/packages/Single Board Computers/Raspberry Pi/GPIO Modules/GPIO_Modules.hgx b/packages/Single Board Computers/Raspberry Pi/GPIO Modules/GPIO_Modules.hgx index f7abaaa..2308d48 100644 --- a/packages/Single Board Computers/Raspberry Pi/GPIO Modules/GPIO_Modules.hgx +++ b/packages/Single Board Computers/Raspberry Pi/GPIO Modules/GPIO_Modules.hgx @@ -1,33 +1,16 @@ - - OnTrue - - - HomeAutomation.ZWave - 37 - Sensor.DoorWindow - Equals - 255 - - - - - HomeAutomation.ZWave - 4 - Control.Off - - - - Program.AddOption("GPIO4", "OUT", "GPIO04 (IN, OUT or OFF)", "text"); + + +Program.AddOption("GPIO4", "OFF", "GPIO04 (IN, OUT or OFF)", "text"); Program.AddOption("GPIO17", "OFF", "GPIO17 (IN, OUT or OFF)", "text"); Program.AddOption("GPIO18", "OFF", "GPIO18 (IN, OUT or OFF)", "text"); -Program.AddOption("GPIO21", "OUT", "GPIO21 (IN, OUT or OFF)", "text"); -Program.AddOption("GPIO22", "OUT", "GPIO22 (IN, OUT or OFF)", "text"); -Program.AddOption("GPIO23", "OUT", "GPIO23 (IN, OUT or OFF)", "text"); -Program.AddOption("GPIO24", "OUT", "GPIO24 (IN, OUT or OFF)", "text"); -Program.AddOption("GPIO25", "OUT", "GPIO25 (IN, OUT or OFF)", "text"); +Program.AddOption("GPIO21", "OFF", "GPIO21 (IN, OUT or OFF)", "text"); +Program.AddOption("GPIO22", "OFF", "GPIO22 (IN, OUT or OFF)", "text"); +Program.AddOption("GPIO23", "OFF", "GPIO23 (IN, OUT or OFF)", "text"); +Program.AddOption("GPIO24", "OFF", "GPIO24 (IN, OUT or OFF)", "text"); +Program.AddOption("GPIO25", "OFF", "GPIO25 (IN, OUT or OFF)", "text"); Program.Run(); - + var moduleDomain = "RaspberryPi.Gpio"; var pinMapping = new List<dynamic>(); @@ -59,6 +42,7 @@ for (int p = 0; p < pinMapping.Count; p++) if (pc.Direction == PinDirection.Input) { configuration[p] = new InputPinConfiguration(PinMapping.ToProcessor(pc.Pin)); + ((InputPinConfiguration)configuration[p]).Reversed = pc.Reversed; if (pc.Config.EndsWith("+")) { ((InputPinConfiguration)configuration[p]).Resistor = PinResistor.PullUp; @@ -94,9 +78,7 @@ catch var pinChanged = new EventHandler<PinStatusEventArgs>((sender, args) => { var address = args.Configuration.Name; var module = Modules.InDomain(moduleDomain).WithAddress(address).Get(); - Program.RaiseEvent(module, "Status.Level", - args.Enabled == !args.Configuration.Reversed ? "1" : "0", - address); + module.RaiseEvent("Status.Level", args.Enabled ? "1" : "0", "Update GPIO Status.Level"); }); connection.PinStatusChanged += pinChanged; @@ -113,7 +95,7 @@ for (int p = 0; p < pinMapping.Count; p++) var pc = pinMapping[p]; var address = pc.Address; var module = Modules.InDomain(moduleDomain).WithAddress(address).Get(); - module.Parameter("Status.Level").Value = (connection[address] == !pc.Reversed ? "1" : "0"); + module.Parameter("Status.Level").Value = (connection[address] ? "1" : "0"); } // implement web serice API Control.On, Control.Off, Control.Toggle @@ -153,21 +135,22 @@ When.WebServiceCallReceived(moduleDomain, ( args ) => { }); Program.GoBackground(); - + [] HomeAutomation.HomeGenie.Automation
100
GPIO Modules Raspberry Pi GPIO mapped to HG modules. Each GPIO can be configured as input (IN), output (OUT) or can be disabled (OFF). Use IN+ to activate the internal PullUp resistor or IN- to activate the internal PullDown resistor. -Use !OUT or !IN to Reverse the pin level On = 0 and Off = 1. -GPIOs configured as IN are mapped to a Sensor module with a Status.Level field displaying current pin level (0, 1). +Use !OUT or !IN+ or !IN- to Reverse the pin level On = 0 and Off = 1. +GPIOs configured as IN are mapped to a Sensor module with a Status.Level field displaying current pin level (0, 1) or inverted in case of !IN. GPIOs configured as OUT are mapped to a Switch module that can be controlled with on/off commands. Raspberry Pi + false - 2016-04-16T01:12:51.89715Z + CSharp - true - \ No newline at end of file + false + diff --git a/packages/Single Board Computers/Raspberry Pi/GPIO Modules/README.md b/packages/Single Board Computers/Raspberry Pi/GPIO Modules/README.md index 9d59607..82e389e 100644 --- a/packages/Single Board Computers/Raspberry Pi/GPIO Modules/README.md +++ b/packages/Single Board Computers/Raspberry Pi/GPIO Modules/README.md @@ -4,13 +4,14 @@ Raspberry Pi GPIO mapped to HG modules. From the program options, each GPIO can be configured as input (IN), output (OUT) or can be disabled (OFF). -Use IN+ to activate the internal PullUp resistor or IN- to activate the internal PullDown resistor. +Use `IN+` to activate the internal PullUp resistor or `IN-` to activate the internal PullDown resistor. -Use !OUT to Reverse the pin level On = 0 and Off = 1. +Use `!OUT` or `!IN+` or `!IN-` to Reverse the pin level `On = 0` and `Off = 1`. -GPIOs configured as IN are mapped to a Sensor module with a Status.Level field displaying current pin level (0, 1). +GPIOs configured as IN are mapped to a *Sensor module* with a `Status.Level` field displaying current pin level (0, 1) or inverted in case of `!IN`. + +GPIOs configured as OUT are mapped to a *Switch module* that can be controlled with on/off commands. -GPIOs configured as OUT are mapped to a Switch module that can be controlled with on/off commands. ## Videos @@ -21,3 +22,10 @@ GPIOs configured as OUT are mapped to a Switch module that can be controlled wit HomeGenie meets Banana Pi +## Changes + +### v1.1 - Fixes for !IN and Status.Level + +- Fix reverted change for `!IN` commit [c95cd6e](https://github.com/genielabs/homegenie-packages/commit/c95cd6e359b7bde04cf1a49a8b878aa6d21f211d) +- Status.Level logic has been changes for `!IN` and `!OUT`, but is wrong as they only change the pin level not the logical level (i.e. `!OUT Status.Level = On` pin level` = 0`). +- Update deprecated api call from `Program.RaiseEvent()` to `module.RaiseEvent()` diff --git a/packages/Single Board Computers/Raspberry Pi/GPIO Modules/package.json b/packages/Single Board Computers/Raspberry Pi/GPIO Modules/package.json index 4d98dca..6ddfc91 100644 --- a/packages/Single Board Computers/Raspberry Pi/GPIO Modules/package.json +++ b/packages/Single Board Computers/Raspberry Pi/GPIO Modules/package.json @@ -1,9 +1,9 @@ { "author": "genielabs", - "version": "v1.0", + "version": "v1.1", "title": "GPIO Modules", "description": "Raspberry Pi GPIO mapped to HG modules", - "published": "2015-02-12T00:00:00Z", + "published": "2019-09-16T00:00:00Z", "sourcecode": "", "homepage": "", "widgets": [ ],