Merge pull request #498 from SUPLA/develop

v24.12
SUPLA · Dec 3, 2024 · f956dc5 · f956dc5
2 parents 84c39b3 + c4adf00
commit f956dc5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/supla-server/src/mqtt/mqtt_abstract_state_message_provider.cpp b/supla-server/src/mqtt/mqtt_abstract_state_message_provider.cpp
@@ -94,7 +94,7 @@ void supla_mqtt_abstract_state_message_provider::set_ids(int user_id,
 }
 
 void supla_mqtt_abstract_state_message_provider::set_channel_function_and_flags(
-    int channel_function, int channel_flags) {
+    int channel_function, unsigned _supla_int64_t channel_flags) {
   this->channel_function = channel_function;
 
   this->channel_flags = channel_flags;

diff --git a/supla-server/src/mqtt/mqtt_abstract_state_message_provider.h b/supla-server/src/mqtt/mqtt_abstract_state_message_provider.h
@@ -35,7 +35,7 @@ class supla_mqtt_abstract_state_message_provider
 
   supla_channel_availability_status channel_availability_status;
   int channel_function;
-  int channel_flags;
+  unsigned _supla_int64_t channel_flags;
 
   supla_channel_value *channel_value;
   supla_channel_extended_value *channel_extended_value;
@@ -168,7 +168,8 @@ class supla_mqtt_abstract_state_message_provider
                                     const char *topic_prefix, char **topic_name,
                                     void **message, size_t *message_size);
   void set_ids(int user_id, int device_id, int channel_id);
-  void set_channel_function_and_flags(int channel_function, int channel_flags);
+  void set_channel_function_and_flags(int channel_function,
+                                      unsigned _supla_int64_t channel_flags);
   void set_user_suid(char *user_suid);
   void set_user_suid(void);
 };

diff --git a/supla-server/src/mqtt/mqtt_db.cpp b/supla-server/src/mqtt/mqtt_db.cpp
@@ -504,7 +504,7 @@ void *supla_mqtt_db::open_channelquery(int UserID, int DeviceID, int ChannelID,
     rbind[10].buffer = (char *)&query->row->channel_func;
     rbind[10].buffer_length = sizeof(query->row->channel_func);
 
-    rbind[11].buffer_type = MYSQL_TYPE_LONG;
+    rbind[11].buffer_type = MYSQL_TYPE_LONGLONG;
     rbind[11].buffer = (char *)&query->row->channel_flags;
     rbind[11].buffer_length = sizeof(query->row->channel_flags);
 

diff --git a/supla-server/src/mqtt/mqtt_db.h b/supla-server/src/mqtt/mqtt_db.h
@@ -61,7 +61,7 @@ typedef struct {
   int channel_number;
   int channel_type;
   int channel_func;
-  int channel_flags;
+  unsigned _supla_int64_t channel_flags;
   char channel_location[SUPLA_LOCATION_CAPTION_MAXSIZE];
   char channel_caption[SUPLA_CHANNEL_CAPTION_MAXSIZE];
   bool channel_hidden;

diff --git a/supla-server/src/svrcfg.h b/supla-server/src/svrcfg.h
@@ -28,7 +28,7 @@ extern "C" {
 #define CFG_OAUTH_URL_MAXSIZE 96
 #define CFG_OAUTH_TOKEN_SIZE 86
 
-#define SERVER_VERSION "24.11"
+#define SERVER_VERSION "24.12"
 
 #define CFG_UID 0
 #define CFG_GID 1