Skip to content

Commit

Permalink
arendst#75 fixed again and again
Browse files Browse the repository at this point in the history 
Fixed an error on using more than one shutter
  • Loading branch information
Stefan Bode committed Oct 17, 2018
1 parent 91aadd5 commit ed7a439
Show file tree
Hide file tree
Showing 5 changed files with 165 additions and 45 deletions.
39 changes: 39 additions & 0 deletions include/readme.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

This directory is intended for project header files.

A header file is a file containing C declarations and macro definitions
to be shared between several project source files. You request the use of a
header file in your project source file (C, C++, etc) located in `src` folder
by including it, with the C preprocessing directive `#include'.

```src/main.c

#include "header.h"

int main (void)
{
...
}
```

Including a header file produces the same results as copying the header file
into each source file that needs it. Such copying would be time-consuming
and error-prone. With a header file, the related declarations appear
in only one place. If they need to be changed, they can be changed in one
place, and programs that include the header file will automatically use the
new version when next recompiled. The header file eliminates the labor of
finding and changing all the copies as well as the risk that a failure to
find one copy will result in inconsistencies within a program.

In C, the usual convention is to give header files names that end with `.h'.
It is most portable to use only letters, digits, dashes, and underscores in
header file names, and at most one dot.

Read more about using header files in official GCC documentation:

* Include Syntax
* Include Operation
* Once-Only Headers
* Computed Includes

https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
3 changes: 2 additions & 1 deletion sonoff/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ struct SYSCFG {

char rules[MAX_RULE_SETS][MAX_RULE_SIZE]; // 800 uses 512 bytes in v5.12.0m, 3 x 512 bytes in v5.14.0b
//STB mod
byte free_680[171]; // A80 give me some space to do configuration without override
byte free_680[131]; // A80 give me some space to do configuration without override
int16_t shuttercoeff[5][MAX_SHUTTERS];
uint8_t interlock_bucket_size; // size if the bucket for an interlock. Typically 1..4
uint8_t shutter_invert[MAX_SHUTTERS];
uint8_t shutter_set50percent[MAX_SHUTTERS];
Expand Down
2 changes: 1 addition & 1 deletion sonoff/sonoff_version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#define VERSION 0x0602010B
//STB mod
#define STB_VERSION 0x0104
#define STB_VERSION 0x0106
//end

#define D_PROGRAMNAME "Sonoff-Tasmota"
Expand Down
82 changes: 52 additions & 30 deletions sonoff/xdrv_97_shutter.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,19 @@ enum ShutterModes { OFF_OPEN__OFF_CLOSE, OFF_ON__OPEN_CLOSE, PULSE_OPEN__PULSE_C
const char JSON_SHUTTER_POS[] PROGMEM = "%s,\"%s-%d\":%d"; // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>

uint8_t Shutter_Open_Time[MAX_SHUTTERS] ; // duration to open the shutter
uint8_t Shutter_Close_Time[MAX_SHUTTERS]; // duratin to close the shutter
int32_t Shutter_Open_Max[MAX_SHUTTERS]; // max value on maximum open calculated
int32_t Shutter_Target_Position[MAX_SHUTTERS] ; // position to go to
uint8_t Shutter_Close_Time[MAX_SHUTTERS]; // duration to close the shutter
int32_t Shutter_Open_Max[MAX_SHUTTERS]; // max value on maximum open calculated
int32_t Shutter_Target_Position[MAX_SHUTTERS] ; // position to go to
int32_t Shutter_Start_Position[MAX_SHUTTERS] ;
uint16_t Shutter_Close_Velocity[MAX_SHUTTERS]; // in relation to open velocity. higher value = faster
uint16_t Shutter_Operations[MAX_SHUTTERS];
int8_t Shutter_Direction[MAX_SHUTTERS]; // 1 == UP , 0 == stop; -1 == down
int32_t Shutter_Real_Position[MAX_SHUTTERS]; // value between 0 and Shutter_Open_Max
power_t shutter_mask = 0; // bit mask with 11 at the position of relays that belong to at least ONE shutter
power_t old_power = power; // preserve old bitmask for power to extract the relay that changes.
power_t SwitchedRelay = 0; // bitmatrix that contain the relays that was lastly changed.
uint16_t m1[MAX_SHUTTERS],m2[MAX_SHUTTERS],b1[MAX_SHUTTERS] ; // slope and constant definition to trim shutter movement behavior.
int8_t Shutter_Direction[MAX_SHUTTERS]; // 1 == UP , 0 == stop; -1 == down
int32_t Shutter_Real_Position[MAX_SHUTTERS]; // value between 0 and Shutter_Open_Max
power_t shutter_mask = 0; // bit mask with 11 at the position of relays that belong to at least ONE shutter
power_t old_power = power; // preserve old bitmask for power to extract the relay that changes.
power_t SwitchedRelay = 0; // bitmatrix that contain the relays that was lastly changed.
uint32_t shutter_time[MAX_SHUTTERS] ;
uint8_t shutterMode = 0; // operstion mode definition. see enum type above OFF_OPEN-OFF_CLOSE, OFF_ON-OPEN_CLOSE, PULSE_OPEN-PULSE_CLOSE
uint8_t shutterMode = 0; // operation mode definition. see enum type above OFF_OPEN-OFF_CLOSE, OFF_ON-OPEN_CLOSE, PULSE_OPEN-PULSE_CLOSE

void Rtc_ms50_Second()
{
Expand All @@ -53,10 +52,28 @@ void Rtc_ms50_Second()
}
}

int32_t percent_to_realposition(uint8_t percent,uint8_t index)
{
if (Settings.shutter_set50percent[index] != 50) {
return percent <= 5 ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
} else {
return percent <= 5 ? Settings.shuttercoeff[2][index] * percent : Settings.shuttercoeff[1][index] * percent + Settings.shuttercoeff[0][index];
}
}

uint8_t realposition_to_percent(int32_t realpos, uint8_t index)
{
if (Settings.shutter_set50percent[index] != 50) {
return Settings.shuttercoeff[2][index] * 5 > realpos ? realpos / Settings.shuttercoeff[2][index] : (realpos-Settings.shuttercoeff[0][index]) / Settings.shuttercoeff[1][index];
} else {
return Settings.shuttercoeff[2][index] * 5 > realpos ? realpos / Settings.shuttercoeff[2][index] : (realpos-Settings.shuttercoeff[0][index]) / Settings.shuttercoeff[1][index];
}
}

void ShutterInit()
{
shutters_present = 0;
//Initalize to get relay that changed
//Initialize to get relay that changed
old_power = power;


Expand All @@ -80,26 +97,27 @@ void ShutterInit()
TickerShutter.attach_ms(50, Rtc_ms50_Second );
// default the 50 percent should not have any impact without changing it. set to 60
Settings.shutter_set50percent[i] = (Settings.shutter_set50percent[i] == 0 ? 50 : Settings.shutter_set50percent[i]);
// use 10 sek as default to allow everybody to play without deep initialize
// use 10 sec. as default to allow everybody to play without deep initialize
Shutter_Open_Time[i] = (Settings.shutter_opentime[i] > 0 ? Settings.shutter_opentime[i] : 10);
Shutter_Close_Time[i] = (Settings.shutter_closetime[i] > 0 ? Settings.shutter_closetime[i] : 10);
// Update Calculation 20 because timeintervall is 0.05 sec
// Update Calculation 20 because time interval is 0.05 sec
Shutter_Open_Max[i] = 2000 * Shutter_Open_Time[i];
Shutter_Close_Velocity[i] = Shutter_Open_Max[i] / Shutter_Close_Time[i] / 20 ;

// calculate a ramp slope at the first 5 percent to compensate that shutters move with down part later than the upper part
m1[i] = Shutter_Open_Max[i] * (100 - Settings.shutter_set50percent[i] ) / 5000;
b1[i] = Shutter_Open_Max[i] - (m1[i] * 100);
m2[i] = (b1[i] + 5 * m1[i]) / 5;
Settings.shuttercoeff[1][i] = Shutter_Open_Max[i] * (100 - Settings.shutter_set50percent[i] ) / 5000;
Settings.shuttercoeff[0][i] = Shutter_Open_Max[i] - (Settings.shuttercoeff[1][i] * 100);
Settings.shuttercoeff[2][i] = (Settings.shuttercoeff[0][i] + 5 * Settings.shuttercoeff[1][i]) / 5;
shutter_mask |= 3 << (Settings.shutter_startrelay[i] -1) ;

Shutter_Real_Position[i] = Settings.shutter_position[i] <= 5 ? m2[i] * Settings.shutter_position[i] : m1[i] * Settings.shutter_position[i] + b1[i];
Shutter_Real_Position[i] = percent_to_realposition(Settings.shutter_position[i], i);
//Shutter_Real_Position[i] = Settings.shutter_position[i] <= 5 ? Settings.shuttercoeff[2][i] * Settings.shutter_position[i] : Settings.shuttercoeff[1][i] * Settings.shutter_position[i] + Settings.shuttercoeff[0,i];
Shutter_Start_Position[i] = Shutter_Real_Position[i];

snprintf_P(log_data, sizeof(log_data), PSTR("Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100 Close Vel.: %d , Max Way: %d, Opentime %d [s], Closetime %d [s], Calc: m1: %d, b1 %d, m2: %d, binmask %d, is inverted %d"), i, Settings.shutter_startrelay[i],Shutter_Real_Position[i],Settings.shutter_position[i], Shutter_Close_Velocity[i] , Shutter_Open_Max[i], Shutter_Open_Time[i], Shutter_Close_Time[i],m1[i],b1[i],m2[i],shutter_mask,Settings.shutter_invert[i]);
snprintf_P(log_data, sizeof(log_data), PSTR("Shutter %d (Relay:%d): Init. Pos: %d [%d %%], Open Vel.: 100 Close Vel.: %d , Max Way: %d, Opentime %d [s], Closetime %d [s], CoedffCalc: c0: %d, c1 %d, c2: %d, c3: %d, c4: %d, binmask %d, is inverted %d, size %d"), i, Settings.shutter_startrelay[i],Shutter_Real_Position[i],Settings.shutter_position[i], Shutter_Close_Velocity[i] , Shutter_Open_Max[i], Shutter_Open_Time[i], Shutter_Close_Time[i],Settings.shuttercoeff[0][i],Settings.shuttercoeff[1][i],Settings.shuttercoeff[2][i],Settings.shuttercoeff[3][i],Settings.shuttercoeff[4][i],shutter_mask,Settings.shutter_invert[i], sizeof(Settings.shuttercoeff));
AddLog(LOG_LEVEL_INFO);
} else {
// teminate loop at first INVALUD shutter.
// terminate loop at first INVALID shutter.
break;
}
}
Expand Down Expand Up @@ -127,7 +145,8 @@ void Schutter_Update_Position()
// calculate relay number responsible for current movement.
uint8_t cur_relay = Settings.shutter_startrelay[i] + (Shutter_Direction[i] == 1 ? 0 : 1) ;

Settings.shutter_position[i] = m2[i] * 5 > Shutter_Real_Position[i] ? (Shutter_Real_Position[i] * 10 / m2[i] + 4)/10 : ((Shutter_Real_Position[i]-b1[i]) *10 / m1[i] +4) / 10;
Settings.shutter_position[i] = realposition_to_percent(Shutter_Real_Position[i], i);
//Settings.shutter_position[i] = Settings.shuttercoeff[2][i] * 5 > Shutter_Real_Position[i] ? (Shutter_Real_Position[i] * 10 / Settings.shuttercoeff[2][i] + 4)/10 : ((Shutter_Real_Position[i]-Settings.shuttercoeff[0,i]) *10 / Settings.shuttercoeff[1][i] +4) / 10;

if (0 < Settings.shutter_position[i] && Settings.shutter_position[i] < 100) {
Shutter_Operations[i]++;
Expand Down Expand Up @@ -168,7 +187,7 @@ void Schutter_Update_Position()
}
break;
}
Shutter_Direction[i] = 0;
Shutter_Direction[i] = 0;
}
}
}
Expand Down Expand Up @@ -208,7 +227,8 @@ boolean ShutterCommand()
snprintf_P(log_data, sizeof(log_data), PSTR("Stop moving shutter %d: direction:%d"), index, Shutter_Direction[index-1]);
AddLog(LOG_LEVEL_INFO);
temp_realpos = Shutter_Start_Position[index-1] + ( (shutter_time[index-1]+10) * (Shutter_Direction[index-1] > 0 ? 100 : -Shutter_Close_Velocity[index-1]));
XdrvMailbox.payload = m2[index-1] * 5 > temp_realpos ? temp_realpos / m2[index-1] : (temp_realpos-b1[index-1]) / m1[index-1];
XdrvMailbox.payload = realposition_to_percent(temp_realpos, index-1);
//XdrvMailbox.payload = Settings.shuttercoeff[2][index-1] * 5 > temp_realpos ? temp_realpos / Settings.shuttercoeff[2][index-1] : (temp_realpos-Settings.shuttercoeff[0,index-1]) / Settings.shuttercoeff[1][index-1];
last_source = SRC_WEBGUI;
command_code = CMND_POSITION;
}
Expand Down Expand Up @@ -276,7 +296,8 @@ boolean ShutterCommand()
XdrvMailbox.payload = Settings.shutter_invert[index-1] && SRC_WEBGUI != last_source ? 100 - XdrvMailbox.payload : XdrvMailbox.payload;
if (XdrvMailbox.payload != -99) {
XdrvMailbox.payload = Settings.shutter_invert[index-1] && SRC_WEBGUI != last_source ? 100 - XdrvMailbox.payload : XdrvMailbox.payload;
Shutter_Target_Position[index-1] = XdrvMailbox.payload < 5 ? m2[index-1] * XdrvMailbox.payload : m1[index-1] * XdrvMailbox.payload + b1[index-1];
Shutter_Target_Position[index-1] = percent_to_realposition(XdrvMailbox.payload, index-1);
//Shutter_Target_Position[index-1] = XdrvMailbox.payload < 5 ? Settings.shuttercoeff[2][index-1] * XdrvMailbox.payload : Settings.shuttercoeff[1][index-1] * XdrvMailbox.payload + Settings.shuttercoeff[0,index-1];
snprintf_P(log_data, sizeof(log_data), PSTR("lastsource %d:, realpos %d, target %d, payload %d"), last_source, Shutter_Real_Position[index-1] ,Shutter_Target_Position[index-1],XdrvMailbox.payload);
AddLog(LOG_LEVEL_DEBUG);
}
Expand Down Expand Up @@ -310,7 +331,8 @@ boolean ShutterCommand()
} else {
uint8_t temp;
if (Shutter_Direction[index-1] != 0) {
temp = m2[index-1] * 5 > Shutter_Real_Position[index-1] ? Shutter_Real_Position[index-1] / m2[index-1] : (Shutter_Real_Position[index-1]-b1[index-1]) / m1[index-1];
temp = realposition_to_percent(Shutter_Real_Position[index-1], index-1);
//temp = Settings.shuttercoeff[2][index-1] * 5 > Shutter_Real_Position[index-1] ? Shutter_Real_Position[index-1] / Settings.shuttercoeff[2][index-1] : (Shutter_Real_Position[index-1]-Settings.shuttercoeff[0,index-1]) / Settings.shuttercoeff[1][index-1];
} else {
temp = Settings.shutter_invert[index-1] ? 100 - Settings.shutter_position[index-1]: Settings.shutter_position[index-1];
}
Expand All @@ -330,7 +352,7 @@ void Schutter_Report_Position()
for (byte i=0; i < shutters_present; i++) {
if (Shutter_Direction[i] != 0) {
char stemp1[20];
//Settings.shutter_position[i] = m2[i] * 5 > Shutter_Real_Position[i] ? Shutter_Real_Position[i] / m2[i] : (Shutter_Real_Position[i]-b1[i]) / m1[i];
//Settings.shutter_position[i] = Settings.shuttercoeff[2][i] * 5 > Shutter_Real_Position[i] ? Shutter_Real_Position[i] / Settings.shuttercoeff[2][i] : (Shutter_Real_Position[i]-Settings.shuttercoeff[0,i]) / Settings.shuttercoeff[1][i];
snprintf_P(log_data, sizeof(log_data), PSTR("Shutter %d: Real Pos: %d, Target %d, source: %s, pos %%: %d, direction: %d, rtcshutter: %ld"), i,Shutter_Real_Position[i], Shutter_Target_Position[i], GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource), Settings.shutter_position[i], Shutter_Direction[i], shutter_time[i]);
AddLog(LOG_LEVEL_INFO);
}
Expand All @@ -342,7 +364,7 @@ void Shutter_Relay_changed()

// SwitchedRelay = binary relay that was recently changed and cause an Action
// powerstate_local = binary powermatrix and relays from shutter: 0..3
// relays_changed = boolen if one of the relays that belong to the shutter changed not by shutter or pulsetimer
// relays_changed = boolean if one of the relays that belong to the shutter changed not by shutter or pulsetimer
char stemp1[10];

for (byte i=0; i < shutters_present; i++) {
Expand All @@ -369,15 +391,15 @@ void Shutter_Relay_changed()
AddLog(LOG_LEVEL_DEBUG);
} else {
last_source = SRC_SHUTTER; // avoid switch off in the next loop
if (((1 << Settings.shutter_startrelay[i] ) & powerstate_local) > 0) { // testing on CLOSE relay, if ON
if (powerstate_local == 2) { // testing on CLOSE relay, if ON
// close with relay two
Shutter_StartInit(i, -1, 0);
} else {
// opens with relay one
Shutter_StartInit(i, 1, Shutter_Open_Max[i]);
}
}
snprintf_P(log_data, sizeof(log_data), PSTR("Shutter %d: Target: %ld"), i, Shutter_Target_Position[i]);
snprintf_P(log_data, sizeof(log_data), PSTR("Shutter %d: Target: %ld, powerstatelocal %d"), i, Shutter_Target_Position[i], powerstate_local);
AddLog(LOG_LEVEL_DEBUG);
}
}
Expand Down Expand Up @@ -435,12 +457,12 @@ boolean Xdrv97(byte function)
break;
case FUNC_SET_POWER:
char stemp1[10];
// extraxt the number of the relay that was switched and save for later in Update Position.
// extract the number of the relay that was switched and save for later in Update Position.
SwitchedRelay = power ^ old_power;
old_power = power;
snprintf_P(log_data, sizeof(log_data), PSTR("Switched relay: %d by %s"), SwitchedRelay,GetTextIndexed(stemp1, sizeof(stemp1), last_source, kCommandSource));
AddLog(LOG_LEVEL_DEBUG_MORE);
Shutter_Relay_changed();
Shutter_Relay_changed();
break;
}
}
Expand Down
Loading

0 comments on commit ed7a439

Please sign in to comment.