diff --git a/python/res/devlib/json/CPG_1.0.devlib.json b/python/res/devlib/json/CPG_1.0.devlib.json index 86d255e..e40420a 100644 --- a/python/res/devlib/json/CPG_1.0.devlib.json +++ b/python/res/devlib/json/CPG_1.0.devlib.json @@ -1707,14 +1707,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "dev_version": [ diff --git a/python/res/devlib/json/Elite_BAT_0.1.devlib.json b/python/res/devlib/json/Elite_BAT_0.1.devlib.json index 24c9464..5d59e69 100644 --- a/python/res/devlib/json/Elite_BAT_0.1.devlib.json +++ b/python/res/devlib/json/Elite_BAT_0.1.devlib.json @@ -1638,14 +1638,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "dev_version": [ diff --git a/python/res/devlib/json/Elite_BAT_1.0.devlib.json b/python/res/devlib/json/Elite_BAT_1.0.devlib.json index dee5651..5701cfc 100644 --- a/python/res/devlib/json/Elite_BAT_1.0.devlib.json +++ b/python/res/devlib/json/Elite_BAT_1.0.devlib.json @@ -1638,14 +1638,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "dev_version": [ diff --git a/python/res/devlib/json/Elite_EDC_1.5.devlib.json b/python/res/devlib/json/Elite_EDC_1.5.devlib.json index 185dbec..7c7ac18 100644 --- a/python/res/devlib/json/Elite_EDC_1.5.devlib.json +++ b/python/res/devlib/json/Elite_EDC_1.5.devlib.json @@ -1706,14 +1706,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "dev_version": [ diff --git a/python/res/devlib/json/Elite_EDC_1.5r2.devlib.json b/python/res/devlib/json/Elite_EDC_1.5r2.devlib.json index 1ca961d..9d2e3a3 100644 --- a/python/res/devlib/json/Elite_EDC_1.5r2.devlib.json +++ b/python/res/devlib/json/Elite_EDC_1.5r2.devlib.json @@ -1706,14 +1706,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "dev_version": [ diff --git a/python/res/devlib/json/Elite_EDC_1.5re.devlib.json b/python/res/devlib/json/Elite_EDC_1.5re.devlib.json index 27e3983..120fc13 100644 --- a/python/res/devlib/json/Elite_EDC_1.5re.devlib.json +++ b/python/res/devlib/json/Elite_EDC_1.5re.devlib.json @@ -1706,14 +1706,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "dev_version": [ diff --git a/python/res/devlib/json/Elite_EIS_1.0.devlib.json b/python/res/devlib/json/Elite_EIS_1.0.devlib.json index ca9b1aa..2b67b1a 100644 --- a/python/res/devlib/json/Elite_EIS_1.0.devlib.json +++ b/python/res/devlib/json/Elite_EIS_1.0.devlib.json @@ -633,14 +633,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "dev_version": [ diff --git a/python/res/devlib/json/Elite_EIS_1.1.devlib.json b/python/res/devlib/json/Elite_EIS_1.1.devlib.json index 48e87ae..e8f7695 100644 --- a/python/res/devlib/json/Elite_EIS_1.1.devlib.json +++ b/python/res/devlib/json/Elite_EIS_1.1.devlib.json @@ -633,14 +633,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "dev_version": [ diff --git a/python/res/devlib/json/Elite_EIS_MINI_1.0.devlib.json b/python/res/devlib/json/Elite_EIS_MINI_1.0.devlib.json index 3c9dc2a..427f84a 100644 --- a/python/res/devlib/json/Elite_EIS_MINI_1.0.devlib.json +++ b/python/res/devlib/json/Elite_EIS_MINI_1.0.devlib.json @@ -633,14 +633,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "dev_version": [ diff --git a/python/res/devlib/json/Elite_TRIG_0.1.devlib.json b/python/res/devlib/json/Elite_TRIG_0.1.devlib.json index 5abb6ae..3fee4c7 100644 --- a/python/res/devlib/json/Elite_TRIG_0.1.devlib.json +++ b/python/res/devlib/json/Elite_TRIG_0.1.devlib.json @@ -429,14 +429,9 @@ "_cdr('20X>ADC_VALUE_I')" ], "ble_write": { - "type": "RIS", + "type": "ALL", "data": [ - "XFF;", - "1B>BLE_WRITE[0];1B>BLE_WRITE[1];1B>BLE_WRITE[2];1B>BLE_WRITE[3];", - "1B>BLE_WRITE[4];1B>BLE_WRITE[5];1B>BLE_WRITE[6];1B>BLE_WRITE[7];", - "1B>BLE_WRITE[8];1B>BLE_WRITE[9];1B>BLE_WRITE[10];1B>BLE_WRITE[11];", - "1B>BLE_WRITE[12];1B>BLE_WRITE[13];1B>BLE_WRITE[14];1B>BLE_WRITE[15];", - "1B>BLE_WRITE[16];" + "255X>BLE_WRITE;" ] }, "curve_acc": { diff --git a/python/res/devlib/json/PEL_1.0.devlib.json b/python/res/devlib/json/PEL_1.0.devlib.json index d740316..7b3be96 100644 --- a/python/res/devlib/json/PEL_1.0.devlib.json +++ b/python/res/devlib/json/PEL_1.0.devlib.json @@ -1,122 +1,339 @@ { - "name": "PEL_1.0", - "version": "1.2.30", - "match_rule": { - "local_name_pattern": "Elite-PEL.*", - "major_product_number": 0, - "minor_product_number": 7, - "major_version_number": 0, - "minor_version_number": 0 + "name": "PEL_1.0", + "version": "1.2.30", + "match_rule": { + "local_name_pattern": "Elite-PEL.*", + "major_product_number": 0, + "minor_product_number": 7, + "major_version_number": 0, + "minor_version_number": 0 + }, + "constant": { + "TIME_MAX": 100000, + "VOLT_MAX": 65536, + "Const_Current_Range": 1500001, + "BLE_WRITE_MAX": 255, + "DROP_10MS":5, + "NOTIFY_DATA": 10 + }, + "parameters": { + "CHANNEL": { + "description": "record channels", + "record_meta": true, + "domain": "property", + "value": "[0, 1, 2]" }, - "constant": { - "TIME_MAX": 100000, - "VOLT_MAX": 65536, - "Const_Current_Range": 1500001, - "BLE_WRITE_MAX": 255 + "SAMPLE_RATE": { + "description": "data sampling rate", + "record_meta": true, + "initial": 100, + "domain": [ + 1001 + ], + "value": { + "expression": "VALUE" + }, + "on_change": "set_sample_rate" }, - "parameters": { - "CHANNEL": { - "description": "record channels", - "record_meta": true, - "domain": "property", - "value": "[0, 1, 2]" + "AMP_GAIN": { + "description": "amp gain", + "record_meta": true, + "domain": "constant", + "value": 1 + }, + "MODE": { + "description": "working mode", + "record_meta": true, + "initial": 0, + "value": [ + "Select Resistor Pick Mode", + "Select Resistor Full Mode", + "Dev Mode", + "IOPH", + "IOPL", + "R-external calibration" + ] + }, + "BLE_WRITE": { + "description": "send msg to elite", + "domain": { + "list": [ + "BLE_WRITE_MAX" + ] }, - "SAMPLE_RATE": { - "description": "data sampling rate", - "record_meta": true, - "initial": 1000, - "domain": [ - 1001 - ], - "value": { - "expression": "VALUE" - }, - "on_change": "set_sample_rate" - }, - "AMP_GAIN": { - "description": "amp gain", - "record_meta": true, - "domain": "constant", - "value": 1 - }, - "PATTERN_SWITCH": { - "description": "switch of pattern", - "initial": 1, - "domain": [ - 2 - ], - "value": { - "expression": "VALUE" - } - }, - "PULSE": { - "description": "Pulse Mode Segment Duration 2", - "record_meta": true, - "initial": [ - 0, - 0, - 0 - ], - "domain": { - "list": [ - 66536 - ] - }, - "value": { - "expression": "VALUE" - } - }, - "PATTERN": { - "description": "Pulse Mode Segment Duration 2", - "record_meta": true, - "initial": 1, - "domain": [ - 44 - ], - "value": { - "expression": "VALUE" - } + "initial": "[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]", + "value": "VALUE" + }, + "BLE_READ": { + "description": "receive msg from elite", + "domain": "int" + }, + "ADC_VALUE_I": { + "description": "ADC value current value", + "domain": "int" + }, + "PATTERN_SWITCH": { + "description": "switch of pattern", + "initial": 1, + "domain": [ + 2 + ], + "value": { + "expression": "VALUE" } }, - "instruction": { - "start": [ - "pulse_e_load" + "PULSE": { + "description": "Pulse Mode Segment Duration 2", + "record_meta": true, + "initial": [ + 0, + 0, + 0 ], - "pulse_e_load": [ - { - "expression": "PATTERN_SWITCH", - "when": { - "0": "pattern", - "1": "manual" - } - } - ], - "manual": { - "type": "RIS", - "parameter": { - "pa": "PULSE[0]", - "pb": "PULSE[1]", - "pc": "PULSE[2]" - }, - "data": [ - "XFF;", - "X62;", - "4b1;4b>pa;4b>pb;4b>pc;" + "domain": { + "list": [ + 66536 ] }, - "pattern": { - "type": "RIS", - "parameter": { - "pa": "PATTERN" - }, - "data": [ - "XFF;X62;", - "4b>0;12b>pa;" - ] - }, - "ble_instru_send": [ - "ble_write", - "_cdr('20X>ADC_VALUE_I')" - ] + "value": { + "expression": "VALUE" + } + }, + "PATTERN": { + "description": "Pulse Mode Segment Duration 2", + "record_meta": true, + "initial": 1, + "domain": [ + 44 + ], + "value": { + "expression": "VALUE" + } + }, + "PATTERN_MAX": { + "description": "Pulse Mode Segment Duration 2", + "record_meta": true, + "initial": 43, + "domain": [ + 100 + ], + "value": { + "expression": "VALUE" + } + }, + "PATTERN_MIN": { + "description": "Pulse Mode Segment Duration 2", + "record_meta": true, + "initial": 1, + "domain": [ + 100 + ], + "value": { + "expression": "VALUE" + } } - } \ No newline at end of file + }, + "instruction": { + "start": [ + "data_format", + "_notify(True)", + { + "expression": "MODE", + "when": { + "0": "start_manual_scan_mode", + "1": "start_manual_scan_mode", + "2": "", + "3": "start_auto_scan_mode", + "4": "start_auto_scan_mode", + "5": "start_R_external_cali_mode" + } + }, + "_sync(True)" + ], + "get_data": [ + "manual_scan_mode_set_R_pattern" + ], + "stop": [ + "_notify(False)", + { + "expression": "MODE", + "when": { + "0": "stop_manual_scan_mode", + "1": "stop_manual_scan_mode", + "2": "", + "3": "stop_auto_scan_mode", + "4": "stop_auto_scan_mode", + "5": "stop_R_external_cali_mode" + } + }, + "_sync(False)" + ], + "data_format": [ + "_data_format('PEL_FMT1_')", + { + "expression": "MODE", + "when": { + "0": "_disable_cache(True)", + "1": "_disable_cache(True)", + "*": "_disable_cache(False)" + } + } + ], + "start_manual_scan_mode": [ + { + "expression": "PATTERN_SWITCH", + "when": { + "0": "start_manual_scan_mode_use_pattern", + "1": "start_manual_scan_mode_use_bit" + } + } + ], + "start_manual_scan_mode_use_pattern": { + "type": "RIS", + "parameter": { + "pa": "PATTERN", + "ca": "DROP_10MS", + "cb": "NOTIFY_DATA" + }, + "data": [ + "X01;X01;", + "X00;X01;", + "16b>pa;", + "16b>ca;", + "16b>cb;" + ] + }, + "start_manual_scan_mode_use_bit": { + "type": "RIS", + "parameter": { + "pa": "PULSE[0]", + "pb": "PULSE[1]", + "pc": "PULSE[2]", + "ca": "DROP_10MS", + "cb": "NOTIFY_DATA" + }, + "data": [ + "X01;X01;", + "X00;X00;", + "4b>0;4b>pa;4b>pb;4b>pc;", + "16b>ca;", + "16b>cb;" + ] + }, + "manual_scan_mode_set_R_pattern": [ + { + "expression": "PATTERN_SWITCH", + "when": { + "0": "pattern", + "1": "bit" + } + } + ], + "pattern": { + "type": "RIS", + "parameter": { + "pa": "PATTERN", + "ca": "DROP_10MS", + "cb": "NOTIFY_DATA" + }, + "data": [ + "X01;X02;", + "X00;X01;", + "16b>pa;", + "16b>ca;", + "16b>cb;" + ] + }, + "bit": { + "type": "RIS", + "parameter": { + "pa": "PULSE[0]", + "pb": "PULSE[1]", + "pc": "PULSE[2]", + "ca": "DROP_10MS", + "cb": "NOTIFY_DATA" + }, + "data": [ + "X01;X02;", + "X00;X00;", + "4b>0;4b>pa;4b>pb;4b>pc;", + "16b>ca;", + "16b>cb;" + ] + }, + "stop_manual_scan_mode": { + "type": "RIS", + "data": [ + "X01;X00;" + ] + }, + "start_auto_scan_mode": { + "type": "RIS", + "parameter": { + "ca": "DROP_10MS", + "cb": "NOTIFY_DATA" + }, + "data": [ + "X02;X01;", + "2B>PATTERN_MAX;", + "2B>PATTERN_MIN;", + "16b>ca;", + "16b>cb;" + ] + }, + "stop_auto_scan_mode": { + "type": "RIS", + "data": [ + "X02;X00;" + ] + }, + "start_R_external_cali_mode": { + "type": "RIS", + "parameter": { + "ca": "DROP_10MS", + "cb": "NOTIFY_DATA" + }, + "data": [ + "X03;X01;", + "16b>ca;", + "16b>cb;" + ] + }, + "stop_R_external_cali_mode": { + "type": "RIS", + "data": [ + "X03;X00;" + ] + }, + "enable_notify": { + "type": "RIS", + "data": [ + "XFF;XA3;X04;" + ] + }, + "disable_notify": { + "type": "RIS", + "data": [ + "XFF;XA3;X05;" + ] + }, + "ble_instru_send": [ + "ble_write", + "_cdr('20X>ADC_VALUE_I')" + ], + "ble_write": { + "type": "ALL", + "data": [ + "255X>BLE_WRITE;" + ] + }, + "dev_version": [ + "CIS_VERSION", + "_cdr('20X>ADC_VALUE_I')" + ], + "dev_battery": [ + "CIS_VOLT", + "_cdr('20X>ADC_VALUE_I')" + ] + } +} \ No newline at end of file