jct/deskcontrol
1
0
Fork 0
Code Pull Requests Releases 13 Activity

Compare commits

base: jct:v0.4.0
Branches Tags
jct:master
jct:v.0.5.1 jct:v.0.5.0 jct:v0.4.6 jct:0.4.5 jct:v0.4.3 jct:v0.4.2 jct:v0.4.1 jct:v0.4.0 jct:v0.3.2 jct:v0.3.1 jct:v0.3.0 jct:v0.2.1 jct:v0.2.0 jct:v0.1.2 jct:v0.1.3 jct:v0.1.1
..
compare: jct:8387a0610be37808b36b67c1d53d61d29ec47b06
Branches Tags
jct:master
jct:v.0.5.1 jct:v.0.5.0 jct:v0.4.6 jct:0.4.5 jct:v0.4.3 jct:v0.4.2 jct:v0.4.1 jct:v0.4.0 jct:v0.3.2 jct:v0.3.1 jct:v0.3.0 jct:v0.2.1 jct:v0.2.0 jct:v0.1.2 jct:v0.1.3 jct:v0.1.1

6 Commits
v0.4.0 ... 8387a0610b

Author SHA1 Message Date
Jens True
8387a0610b Updated version number
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details
2019-11-27 17:25:26 +01:00
jct
764b18e539 Moved temp sensor to seperate pin (#3)
Some checks reported errors
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build was killed
Details
2019-11-27 09:19:23 +00:00
jct
e5a64c13ed Renamed drone secret
All checks were successful
continuous-integration/drone/push Build is passing
Details
2019-10-25 08:09:41 +00:00
Jens True
338c90fb8e Moved gitea key into drone secret
All checks were successful
continuous-integration/drone/push Build is passing
Details
2019-10-08 15:35:21 +02:00
Jens True
85c57daf91 Merge branch 'master' of https://code.jcktrue.dk/jct/deskcontrol
All checks were successful
continuous-integration/drone/push Build is passing
Details
2019-10-08 14:24:23 +02:00
Jens True
36ce6f976b Release version
All checks were successful
continuous-integration/drone/tag Build is passing
Details
2019-09-03 15:47:04 +02:00
4 changed files with 6 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
.drone.yml
View File

@ -16,10 +16,10 @@ steps:
- name: release
image: plugins/gitea-release
settings:
api_key: a7f3afc9f77e721951e48b4af66d7565700b7a2e
api_key:
from_secret: DRONE_ACCESS_TOKEN
base_url: https://code.jcktrue.dk
files:
- .pio/build/nodemcu/firmware.bin
- .pio/build/nodemcu/firmware.elf
when:
event: tag

BIN
.vscode/.BROWSE.C_CPP.DB vendored
View File

Binary file not shown.

2
.vscode/settings.json vendored
View File

@ -1,6 +1,6 @@
{
"terminal.integrated.env.windows": {
"PATH": "C:\\Program Files (x86)\\STMicroelectronics\\st_toolset\\asm;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\STMicroelectronics\\STM32 ST-LINK Utility\\ST-LINK Utility;C:\\Program Files\\doxygen\\bin;C:\\Program Files (x86)\\QuickTime\\QTSystem\\;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\gems\\bin;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current;C:\\Users\\furyf\\go\\bin;C:\\Users\\furyf\\scoop\\apps\\composer\\current\\home\\vendor\\bin;C:\\Users\\furyf\\scoop\\apps\\python27\\current\\scripts;C:\\Users\\furyf\\scoop\\apps\\latex\\current\\texmfs\\install\\miktex\\bin;C:\\Users\\furyf\\scoop\\apps\\gcc\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nmap\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Python\\Launcher\\;C:\\Users\\furyf\\scoop\\shims;C:\\Users\\furyf\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\furyf\\scoop\\apps\\msys\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\System\\PATH;%USERPROFILE%\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files (x86)\\STMicroelectronics\\st_toolset\\asm;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\STMicroelectronics\\STM32 ST-LINK Utility\\ST-LINK Utility;C:\\Program Files\\doxygen\\bin;C:\\Program Files (x86)\\QuickTime\\QTSystem\\;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\gems\\bin;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current;C:\\Users\\furyf\\go\\bin;C:\\Users\\furyf\\scoop\\apps\\composer\\current\\home\\vendor\\bin;C:\\Users\\furyf\\scoop\\apps\\python27\\current\\scripts;C:\\Users\\furyf\\scoop\\apps\\latex\\current\\texmfs\\install\\miktex\\bin;C:\\Users\\furyf\\scoop\\apps\\gcc\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nmap\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Python\\Launcher\\;C:\\Users\\furyf\\scoop\\shims;C:\\Users\\furyf\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\furyf\\scoop\\apps\\msys\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\System\\PATH;%USERPROFILE%\\AppData\\Local\\Microsoft\\WindowsApps",
"PATH": "C:\\Program Files (x86)\\STMicroelectronics\\st_toolset\\asm;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\STMicroelectronics\\STM32 ST-LINK Utility\\ST-LINK Utility;C:\\Program Files\\doxygen\\bin;C:\\Program Files (x86)\\QuickTime\\QTSystem\\;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current;C:\\Users\\furyf\\scoop\\apps\\latex\\current\\texmfs\\install\\miktex\\bin\\x64;C:\\Users\\furyf\\scoop\\apps\\latex\\current\\texmfs\\install\\miktex\\bin;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\gems\\bin;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\bin;C:\\Users\\furyf\\go\\bin;C:\\Users\\furyf\\scoop\\apps\\composer\\current\\home\\vendor\\bin;C:\\Users\\furyf\\scoop\\apps\\python27\\current\\scripts;C:\\Users\\furyf\\scoop\\apps\\gcc\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nmap\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Python\\Launcher\\;C:\\Users\\furyf\\scoop\\shims;C:\\Users\\furyf\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\furyf\\scoop\\apps\\msys\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\System\\PATH;%USERPROFILE%\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Program Files (x86)\\STMicroelectronics\\st_toolset\\asm;C:\\Program Files (x86)\\Common Files\\Oracle\\Java\\javapath;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Program Files (x86)\\STMicroelectronics\\STM32 ST-LINK Utility\\ST-LINK Utility;C:\\Program Files\\doxygen\\bin;C:\\Program Files (x86)\\QuickTime\\QTSystem\\;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nodejs\\current;C:\\Users\\furyf\\scoop\\apps\\latex\\current\\texmfs\\install\\miktex\\bin\\x64;C:\\Users\\furyf\\scoop\\apps\\latex\\current\\texmfs\\install\\miktex\\bin;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\gems\\bin;C:\\Users\\furyf\\scoop\\apps\\ruby\\current\\bin;C:\\Users\\furyf\\go\\bin;C:\\Users\\furyf\\scoop\\apps\\composer\\current\\home\\vendor\\bin;C:\\Users\\furyf\\scoop\\apps\\python27\\current\\scripts;C:\\Users\\furyf\\scoop\\apps\\gcc\\current\\bin;C:\\Users\\furyf\\scoop\\apps\\nmap\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Python\\Launcher\\;C:\\Users\\furyf\\scoop\\shims;C:\\Users\\furyf\\AppData\\Local\\Microsoft\\WindowsApps;C:\\Users\\furyf\\scoop\\apps\\msys\\current\\bin;C:\\Users\\furyf\\AppData\\Local\\Programs\\Microsoft VS Code\\bin;C:\\System\\PATH;%USERPROFILE%\\AppData\\Local\\Microsoft\\WindowsApps",
"PLATFORMIO_CALLER": "vscode"
}
}

5
src/main.cpp
View File

@ -6,6 +6,7 @@ const int TEMPERATURE_INTERVAL = 60;
unsigned long lastTemperatureSent = 0;
const int PIN_RELAY = D1;
const int PIN_DHT11 = D2;
#define OUTPUT_SET(x) digitalWrite(PIN_RELAY, x ? LOW : HIGH)
unsigned int timer = 0;
unsigned int next_timer_update = 0;
@ -50,7 +51,7 @@ void setupHandler() {
powerNode.setProperty("timer").send("0");
dht.setup(D1, DHTesp::DHT11); // Connect DHT sensor to GPIO 17
dht.setup(PIN_DHT11, DHTesp::DHT11); // Connect DHT sensor to GPIO 17
}
void loopHandler() {
@ -88,7 +89,7 @@ void loopHandler() {
void setup() {
Serial.begin(115200);
Homie_setFirmware("deskcontrol", "1.1.0");
Homie_setFirmware("deskcontrol", "0.4.2");
Homie.disableResetTrigger();
powerNode.advertise("state").settable(powerStateHandler);