diff --git a/db/zmalter-0.0.1.sql b/db/zmalter-0.0.1.sql index 2f0d60d99..a82bdfb82 100644 --- a/db/zmalter-0.0.1.sql +++ b/db/zmalter-0.0.1.sql @@ -13,6 +13,9 @@ alter table Monitors add column PostEventCount smallint unsigned NOT NULL defaul alter table Monitors add column AlarmFrameCount smallint unsigned NOT NULL default '1'; alter table Monitors add column FPSReportInterval smallint unsigned NOT NULL default '250'; alter table Monitors add column RefBlendPerc tinyint unsigned NOT NULL default '10'; +alter table Monitors add column X10Active char(32); +alter table Monitors add column X10Alarm char(32); +alter table Monitors modify column Function enum('None','Passive','Active','X10') default 'Passive' not null; update Monitors set LabelFormat = '%%s - %y/%m/%d %H:%M:%S'; update Monitors set LabelX = 0; update Monitors set LabelY = Height-8; diff --git a/db/zmschema.sql.z b/db/zmschema.sql.z index b7c2f4c9c..53d55b539 100644 --- a/db/zmschema.sql.z +++ b/db/zmschema.sql.z @@ -74,7 +74,7 @@ CREATE TABLE Frames ( CREATE TABLE Monitors ( Id int(10) unsigned NOT NULL auto_increment, Name tinytext NOT NULL, - Function enum('None','Passive','Active') NOT NULL default 'Passive', + Function enum('None','Passive','Active','X10') NOT NULL default 'Passive', Device tinyint(3) unsigned NOT NULL default '0', Channel tinyint(3) unsigned NOT NULL default '0', Format tinyint(3) unsigned NOT NULL default '0', @@ -91,6 +91,8 @@ CREATE TABLE Monitors ( AlarmFrameCount smallint(5) unsigned NOT NULL default '1', FPSReportInterval smallint(5) unsigned NOT NULL default '250', RefBlendPerc tinyint(3) unsigned NOT NULL default '10', + X10Active varchar(32) default NULL, + X10Alarm varchar(32) default NULL, PRIMARY KEY (Id) ) TYPE=MyISAM;