chris/galvani
1
0
Fork 0
mirror of https://github.com/echemdata/galvani.git synced 2025-12-14 01:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add two new tables that are in 5.26 but not 5.23

Browse Source 
Can_BMS_Info_Table and Can_BMS_Data_Table
This commit is contained in:
Chris Kerr
2020-10-17 18:10:58 +03:00
parent c90d604096
commit a1a056d304
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
galvani/res2sqlite.py
View File

@@ -27,12 +27,17 @@ mdb_5_23_tables = [
'Aux_Global_Data_Table', 'Aux_Global_Data_Table',
'Smart_Battery_Clock_Stretch_Table', 'Smart_Battery_Clock_Stretch_Table',
] ]
mdb_5_26_tables = [
'Can_BMS_Info_Table',
'Can_BMS_Data_Table',
]
mdb_tables_text = { mdb_tables_text = {
'Version_Table', 'Version_Table',
'Global_Table', 'Global_Table',
'Event_Table', 'Event_Table',
'Smart_Battery_Info_Table', 'Smart_Battery_Info_Table',
'Can_BMS_Info_Table',
} }
mdb_tables_numeric = { mdb_tables_numeric = {
'Resume_Table', 'Resume_Table',
@@ -43,6 +48,7 @@ mdb_tables_numeric = {
'MCell_Aci_Data_Table', 'MCell_Aci_Data_Table',
'Aux_Global_Data_Table', 'Aux_Global_Data_Table',
'Smart_Battery_Clock_Stretch_Table', 'Smart_Battery_Clock_Stretch_Table',
'Can_BMS_Data_Table',
} }
mdb_create_scripts = { mdb_create_scripts = {
@@ -257,7 +263,7 @@ CREATE TABLE Smart_Battery_Data_Table
FOREIGN KEY (Test_ID, Data_Point) FOREIGN KEY (Test_ID, Data_Point)
REFERENCES Channel_Normal_Table (Test_ID, Data_Point) REFERENCES Channel_Normal_Table (Test_ID, Data_Point)
); """, ); """,
# The following tables are not present in version 1.14 # The following tables are not present in version 1.14, but are in 5.23
'MCell_Aci_Data_Table': """ 'MCell_Aci_Data_Table': """
CREATE TABLE MCell_Aci_Data_Table CREATE TABLE MCell_Aci_Data_Table
( (
@@ -326,7 +332,29 @@ CREATE TABLE Smart_Battery_Clock_Stretch_Table
VCELL1 INTEGER, VCELL1 INTEGER,
FOREIGN KEY (Test_ID, Data_Point) FOREIGN KEY (Test_ID, Data_Point)
REFERENCES Channel_Normal_Table (Test_ID, Data_Point) REFERENCES Channel_Normal_Table (Test_ID, Data_Point)
);"""} );""",
# The following tables are not present in version 5.23, but are in 5.26
'Can_BMS_Info_Table': """
CREATE TABLE "Can_BMS_Info_Table"
(
Channel_Index INTEGER PRIMARY KEY,
CAN_Cfg_File_Name TEXT,
CAN_Configuration TEXT
);
""",
'Can_BMS_Data_Table': """
CREATE TABLE "Can_BMS_Data_Table"
(
Test_ID INTEGER,
Data_Point INTEGER,
CAN_MV_Index INTEGER,
Signal_Value_X REAL,
PRIMARY KEY (Test_ID, Data_Point, CAN_MV_Index),
FOREIGN KEY (Test_ID, Data_Point)
REFERENCES Channel_Normal_Table (Test_ID, Data_Point)
);
""",
}
mdb_create_indices = { mdb_create_indices = {
"Channel_Normal_Table": """ "Channel_Normal_Table": """
@@ -519,6 +547,8 @@ def convert_arbin_to_sqlite(input_file, output_file):
tables_to_convert = copy(mdb_tables) tables_to_convert = copy(mdb_tables)
if arbin_version >= (5, 23): if arbin_version >= (5, 23):
tables_to_convert.extend(mdb_5_23_tables) tables_to_convert.extend(mdb_5_23_tables)
if arbin_version >= (5, 26):
tables_to_convert.extend(mdb_5_26_tables)
for table in reversed(tables_to_convert): for table in reversed(tables_to_convert):
s3db.execute('DROP TABLE IF EXISTS "%s";' % table) s3db.execute('DROP TABLE IF EXISTS "%s";' % table)