Merge pull request #3 from ams-OSRAM/v4.0

upgraded to evm_2.2.6 v4

Author: amsret1

CHANGELOG.md

@@ -2,3 +2,4 @@
 1.0 first released version
 2.0 arduino zmq server improved
 3.0 hexfile changed; support for _hv_cp_overload_detect, i2c_slave_address
+4.0 in stop measurement check for device is wake up; for standby timed mode

tmf8829/CHANGELOG.md

@@ -2,3 +2,4 @@
 1.0 first released version
 2.0 arduino zmq server improved
 3.0 hexfile changed; support for _hv_cp_overload_detect, i2c_slave_address
+4.0 in stop measurement check for device is wake up; for standby timed mode

tmf8829/tmf8829_application.py

@@ -24,7 +24,7 @@ class Tmf8829Application(Tmf8829Bootloader, Tmf8829AppCommon):
     """The TMF8829 application class for the Shield Evm Board.
     """
 
-    VERSION = 1.12
+    VERSION = 1.13
     """Version log
     - 1.0 First  version
     - 1.1 add FP mode 48x32
@@ -39,6 +39,7 @@ class Tmf8829Application(Tmf8829Bootloader, Tmf8829AppCommon):
     - 1.10 added support for dual mode
     - 1.11 splitted up tmf8829_application to tmf8829_application_common and tmf8829_application
     - 1.12 support for motion detection and proximity 
+    - 1.13 check in stop Measurement if device is wakeup; for standby timed mode
     """
 
     def __init__(self, hal:HalRegisterIo, gpio_hal:HalRegisterIo=None ):
@@ -122,6 +123,10 @@ def stopMeasure(self):
         Return:
             int: the read-back response
         """
+
+        if not self.isDeviceWakeup():
+            self.wakeUp()
+            
         self.enableInt( 0 )                                             # disable all interrupts  
         self.clearIntStatus( 0xFF )                                     # clear any old pending interrupts
         return self.sendCommand(cmd=Tmf8829AppRegs.TMF8829_CMD_STAT._cmd_stat._CMD_STOP, wait_only_for_ok=True)

tmf8829/tmf8829_application_registers.py

@@ -4,6 +4,7 @@
 # *                                                                           *
 # *FOR FULL LICENSE TEXT SEE LICENSES-MIT.TXT                                 *
 # *****************************************************************************
+
 import ctypes
 
 class Tmf8829_application_registers:

tmf8829/tmf8829_conv.py

@@ -27,20 +27,25 @@
 TOF_GPIO5 = 1 << corefw_c.evm_h5.PioId.IXC2_SDA
 TOF_GPIO6 = 1 << corefw_c.evm_h5.PioId.GPIO0
 
-def createTmf8829( use_spi=True, i2c_slave_addr=FRESNEL_I2C_ADDR, spi_mode= 0, log=False):
+def createTmf8829( use_spi=True, i2c_slave_addr=FRESNEL_I2C_ADDR, spi_mode=0, log=False, use_i3c=False ):
     """Function creates the needed communication """
     import sys
     from tmf8829_application import Tmf8829Application
 
     print(sys.path)
 
     com = Host( log=log )
-    if use_spi:
-        from aos_com.spi_hal_register_io import SpiHalRegisterIo as Hal
-        hal = Hal( ic_com=com, spi_mode=spi_mode)
-    else:
-        from aos_com.i2c_hal_register_io import I2cHalRegisterIo as Hal
+    
+    if use_i3c:
+        from aos_com.i3c_hal_register_io import I3cHalRegisterIo as Hal
         hal = Hal( ic_com=com, dev_addr = i2c_slave_addr )
+    else:
+        if use_spi:
+            from aos_com.spi_hal_register_io import SpiHalRegisterIo as Hal
+            hal = Hal( ic_com=com, spi_mode=spi_mode)
+        else:
+            from aos_com.i2c_hal_register_io import I2cHalRegisterIo as Hal
+            hal = Hal( ic_com=com, dev_addr = i2c_slave_addr )
 
     return Tmf8829Application( hal=hal, gpio_hal=hal )
 

tmf8829/zeromq/tmf8829_host_com_reg.py

@@ -134,7 +134,7 @@ class Union(ctypes.Union, AsDictMixin):
 TMF8829_ZEROMQ_HOST_H5_BOARD = 4 # macro
 TMF8829_ZEROMQ_HEADER_INFO_SIZE = 64 # macro
 TMF8829_ZEROMQ_IDENTIFY_INFO_SIZE = 56 # macro
-EVM_VERSION = "2.2.5   " # macro
+EVM_VERSION = "2.2.6   " # macro
 class struct__tmf8829ZmqDeviceInfo(Structure):
     pass
 

tmf8829/zeromq/tmf8829_zeromq_server.py

@@ -31,13 +31,14 @@ class ZeroMqEVMServer(ZeroMqServer):
     to allow to configure the device.
     The data socket provides unidirectional measurement results and optional histograms.
     """
-    VERSION = 0x0003
+    VERSION = 0x0004
     """Version 
     - 1 First zeromq server release version
     - 2 Second zeromq server release version
         SET_PRE_CONFIGURATION added
     - 3 Dual mode support
     -   EVM Version 2.2.5 Set wakeup with startup  
+    - 4 for standby timed mode: check in stop measurement if device is Wakeup
     """
 
     APPLICATION_ID = 0x01

tmf8829/zeromq/tmf8829_zeromq_server_core.py

@@ -317,7 +317,7 @@ def stop(self) -> None:
     def process(self):
         """Function checks on both sockets if there are things to be done. """
         _time = time.time()
-        if not self._meas_running or self._last_cmd_poll + self._cmd_poll_interval < _time: # when not running poll faster for commands
+        if (not self._meas_running) or ((self._last_cmd_poll + self._cmd_poll_interval) < _time): # when not running poll faster for commands
             if self._cmd_socket.poll(timeout=1) != 0:     # events queued within our time limit
                 request = Tmf8829zeroMQRequestMessage(client_id=TMF8829_ZEROMQ_CLIENT_NOT_IDENTIFIED,buffer=self._cmd_socket.recv())
                 logger.debug("Received: %s", request)