MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #169 from fallberg/fixes

Browse Source 
Renamed illegaly named sketches so they can be built
This commit is contained in:
Patrick Fallberg
2015-08-14 00:57:33 +02:00
parent c11dd37a38 21166528f8
commit 841326d4f9
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/MySensors/examples/CO2Sensor/AirQualityCO2 → libraries/MySensors/examples/CO2Sensor/CO2Sensor.ino
View File
libraries/MySensors/examples/DustSensorDSM/DustDSM501Sensor.ino → libraries/MySensors/examples/DustSensorDSM/DustSensorDSM.ino
View File
libraries/MySensors/examples/ParkingSensor/ParkingSensor.ino
+4 -4
View File
@@ -68,16 +68,16 @@ NewPing sonar(TRIGGER_PIN, ECHO_PIN, MAX_DISTANCE); // NewPing setup of pins and
MySensor gw; MySensor gw;
MyMessage msg(CHILD_ID,V_TRIPPED); MyMessage msg(CHILD_ID,V_TRIPPED);
int oldParkedStatus=-1; int oldParkedStatus=-1;
int sendInterval = 5000; // Send park status at maximum every 5 second. unsigned long sendInterval = 5000; // Send park status at maximum every 5 second.
unsigned long lastSend; unsigned long lastSend;
#endif #endif
int blinkInterval = 100; // blink interval (milliseconds) unsigned long blinkInterval = 100; // blink interval (milliseconds)
unsigned long lastBlinkPeriod; unsigned long lastBlinkPeriod;
bool blinkColor = true; bool blinkColor = true;
// To make a fading motion on the led ring/tape we only move one pixel/distDebounce time // To make a fading motion on the led ring/tape we only move one pixel/distDebounce time
int distDebounce = 30; unsigned long distDebounce = 30;
unsigned long lastDebouncePeriod; unsigned long lastDebouncePeriod;
int numLightPixels=0; int numLightPixels=0;
int skipZero=0; int skipZero=0;
@@ -161,4 +161,4 @@ void loop() {
} }
pixels.show(); // This sends the updated pixel color to the hardware. pixels.show(); // This sends the updated pixel color to the hardware.
} }
} }
libraries/MySensors/examples/RGB-3D/RGB-3D.ino
+6 -6
View File
@@ -78,9 +78,9 @@ void setup()
pinMode(BLUE_PIN, OUTPUT); pinMode(BLUE_PIN, OUTPUT);
// Correct saved RGB value for first start // Correct saved RGB value for first start
gw.saveState(RED_PIN, constrain(gw.loadState(RED_PIN), 0, 100)); gw.saveState(RED_PIN, constrain((int8_t)gw.loadState(RED_PIN), 0, 100));
gw.saveState(GREEN_PIN, constrain(gw.loadState(GREEN_PIN), 0, 100)); gw.saveState(GREEN_PIN, constrain((int8_t)gw.loadState(GREEN_PIN), 0, 100));
gw.saveState(BLUE_PIN, constrain(gw.loadState(BLUE_PIN), 0, 100)); gw.saveState(BLUE_PIN, constrain((int8_t)gw.loadState(BLUE_PIN), 0, 100));
// Get value from eeprom and write to output // Get value from eeprom and write to output
analogWrite(RED_PIN, 255 * gw.loadState(RED_PIN) / 100); analogWrite(RED_PIN, 255 * gw.loadState(RED_PIN) / 100);
@@ -105,7 +105,7 @@ void setup()
gw.send( BlueStatus.set(gw.loadState(BLUE_PIN)), false ); gw.send( BlueStatus.set(gw.loadState(BLUE_PIN)), false );
// Correct RGB show state for first start and load it (set to 'On' at first start) // Correct RGB show state for first start and load it (set to 'On' at first start)
gw.saveState(0, constrain(gw.loadState(0), 0, 1)); gw.saveState(0, constrain((int8_t)gw.loadState(0), 0, 1));
isShow=gw.loadState(0); isShow=gw.loadState(0);
// Send RGB show state to controler (request ack back: true/false) // Send RGB show state to controler (request ack back: true/false)
@@ -189,7 +189,7 @@ void incomingMessage(const MyMessage &message)
// Save old value to eeprom if it'was not zero // Save old value to eeprom if it'was not zero
if ( gw.loadState(message.sensor) != 0 ) if ( gw.loadState(message.sensor) != 0 )
{ {
gw.saveState(10*message.sensor, constrain(gw.loadState(message.sensor), 0, 100)); gw.saveState(10*message.sensor, constrain((int8_t)gw.loadState(message.sensor), 0, 100));
} }
// Save new value to eeprom // Save new value to eeprom
gw.saveState(message.sensor, 0); gw.saveState(message.sensor, 0);
@@ -212,7 +212,7 @@ void incomingMessage(const MyMessage &message)
{ {
uint8_t incomingDimmerStatus = message.getByte(); uint8_t incomingDimmerStatus = message.getByte();
// limits range of sensor values to between 0 and 100 // limits range of sensor values to between 0 and 100
incomingDimmerStatus = constrain(incomingDimmerStatus, 0, 100); incomingDimmerStatus = constrain((int8_t)incomingDimmerStatus, 0, 100);
// Change Dimmer level // Change Dimmer level
analogWrite(message.sensor, 255 * incomingDimmerStatus / 100); analogWrite(message.sensor, 255 * incomingDimmerStatus / 100);
//Save value to eeprom //Save value to eeprom