Compare commits

...

6 Commits

Author SHA1 Message Date
Roy 31b6a60046 [update] spi data length = 120 bytes 2022-02-14 14:41:54 +08:00
Roy 12e0ec7c69 Merge branch 'dev/1to8_process_0210' into main 2022-02-14 14:32:14 +08:00
Roy 0034681e55 Merge branch 'rel/v1.2.2_eis1.0_v1' into main 2022-02-10 16:45:16 +08:00
peterlu14 6b3649c8a0 [update] change wifi name auto update 2022-01-20 15:48:46 +08:00
peterlu14 3f1ba0971c [update] change wifi name auto update 2022-01-20 15:29:20 +08:00
Roy 95d27aa6f2 mem data don't save in database 2022-01-19 15:53:22 +08:00
3 changed files with 11 additions and 4 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
self._spi = HardwareImplSpiInterface(device,
spi_speed=12_000_000)
self._elite_data_len = 20
self._elite_data_len = 120
self._mem_header_len = 3
self._mem_tailer_len = 8
self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
+9 -2
View File
@@ -307,8 +307,15 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
if len(controller) == 0:
ControllerAPI.create(hardware_info)
elif len(controller) > 0:
if hardware_info['mac_address'] != controller[0]['mac_address'] or hardware_info['software_version'] != controller[0]['software_version'] or hardware_info['mqtt_id'] != controller[0]['mqtt_id']:
ControllerAPI.updateByAttrs('mac_address', hardware_info['mac_address'], {'software_version': hardware_info['software_version'], 'mqtt_id': mqtt_id })
if hardware_info['mac_address'] != controller[0]['mac_address'] or hardware_info['software_version'] != controller[0]['software_version'] or hardware_info['mqtt_id'] != controller[0]['mqtt_id'] or hardware_info['wifi_name'] != controller[0]['wifi_name']:
ControllerAPI.updateByAttrs (
'mac_address', hardware_info['mac_address'], {
'software_version': hardware_info['software_version'],
'mqtt_id': mqtt_id,
'name': hardware_info['name'],
'wifi_name': hardware_info['wifi_name']
}
)
def _setup_device(self):
# wait data server
+1 -1
View File
@@ -498,7 +498,7 @@ class RecordingProcess(Process):
"""
raw_data = []
index = 0
elite_data_len = 20
elite_data_len = 120
mem_header_len = 3
mem_tailer_len = 8
single_data_len = elite_data_len + mem_header_len + mem_tailer_len