Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aligning TuyaMCU code with Tasmota naming conventions #6758

Merged
merged 7 commits into from
Oct 27, 2019
Merged

Aligning TuyaMCU code with Tasmota naming conventions #6758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b2ea36a
TuyaMcu: Implement support for battery powered protocol
Oct 14, 2019
e6f94fe
TuyaMcu: Add TuyaSend command to communicate with Tuya MCU
shantur Oct 22, 2019
8a0765a
TuyaMcu: Add more details to TuyaMcuReceived
shantur Oct 24, 2019
3d7e122
TuyaMcu: Disable fast reset in low power devices
shantur Oct 24, 2019
4944b30
TuyaMcu : Use SetOption66 to enable / disable publishing TuyaMcuRecei…
shantur Oct 25, 2019
30b821b
tuyasen
blakadder Oct 26, 2019
837808b
tuya_mcu_received
blakadder Oct 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sonoff/i18n.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,8 @@
// Commands xdrv_16_tuyadimmer.ino

#define D_CMND_TUYA_MCU "TuyaMCU"
#define D_JSON_TUYA_MCU_RECEIVED "TuyaMcuReceived"
#define D_CMND_TUYA_MCU_SEND_STATE "TuyaSend"
#define D_JSON_TUYA_MCU_RECEIVED "TuyaReceived"

// Commands xdrv_23_zigbee.ino
#define D_CMND_ZIGBEE_PERMITJOIN "ZigbeePermitJoin"
Expand Down
2 changes: 1 addition & 1 deletion sonoff/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ typedef union { // Restricted by MISRA-C Rule 18.4 bu
uint32_t no_power_feedback : 1; // bit 13 (v6.5.0.9) - SetOption63 - Don't scan relay power state at restart
uint32_t use_underscore : 1; // bit 14 (v6.5.0.12) - SetOption64 - Enable "_" instead of "-" as sensor index separator
uint32_t fast_power_cycle_disable : 1; // bit 15 (v6.6.0.20) - SetOption65 - Disable fast power cycle detection for device reset
uint32_t ex_tuya_dimmer_range_255 : 1; // bit 16 (v6.6.0.1) - SetOption66 - Enable or Disable Dimmer range 255 slider control
uint32_t tuya_serial_mqtt_publish : 1; // bit 16 (v6.6.0.21) - SetOption66 - Enable or Disable TuyaMcuReceived messages over Mqtt
uint32_t buzzer_enable : 1; // bit 17 (v6.6.0.1) - SetOption67 - Enable buzzer when available
uint32_t pwm_multi_channels : 1; // bit 18 (v6.6.0.3) - SetOption68 - Enable multi-channels PWM instead of Color PWM
uint32_t ex_tuya_dimmer_min_limit : 1; // bit 19 (v6.6.0.5) - SetOption69 - Limits Tuya dimmers to minimum of 10% (25) when enabled.
Expand Down
4 changes: 2 additions & 2 deletions sonoff/settings.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ void SettingsDelta(void)
}
if (Settings.version < 0x06060008) {
// Move current tuya dimmer range to the new param.
if (Settings.flag3.ex_tuya_dimmer_range_255) {
if (Settings.flag3.tuya_serial_mqtt_publish) { // ex Settings.flag3.ex_tuya_dimmer_range_255 SetOption
Settings.param[P_ex_DIMMER_MAX] = 100;
} else {
Settings.param[P_ex_DIMMER_MAX] = 255;
Expand Down Expand Up @@ -1200,7 +1200,7 @@ void SettingsDelta(void)
if (Settings.version < 0x06060014) {
// Clear unused parameters for future use
/*
Settings.flag3.ex_tuya_dimmer_range_255 = 0;
Settings.flag3.tuya_serial_mqtt_publish = 0; // ex Settings.flag3.ex_tuya_dimmer_range_255
Settings.flag3.ex_tuya_dimmer_min_limit = 0;
Settings.param[P_ex_TUYA_RELAYS] = 0;
Settings.param[P_ex_DIMMER_MAX] = 0;
Expand Down
Loading