Merge remote-tracking branch 'origin/develop' into develop-pandian

Author: pandiannano

docs/make.bat

@@ -7,10 +7,15 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
-set SOURCEDIR=zh_CN
-set BUILDDIR=build
+
+set SOURCEDIR=%1
+set BUILDDIR=build/%SOURCEDIR%
+
+@REM set SOURCEDIR=en
+@REM set BUILDDIR=build/en
 
 if "%1" == "" goto help
+if "%2" == "" goto help
 
 %SPHINXBUILD% >NUL 2>NUL
 if errorlevel 9009 (
@@ -27,7 +32,7 @@ if errorlevel 9009 (
 
 doxygen.exe
 
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+%SPHINXBUILD% -M %2 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 goto end
 
 :help

m5stack/libs/module/relay_4.py

@@ -3,31 +3,31 @@
 import struct
 import time
 
-DEV_I2C_ADDR        = 0x26
-RELAY_REG           = 0x10
-ADC_8BIT_REG        = 0x20
-ADC_16BIT_REG       = 0x30
-I2C_ADDR_REG        = 0xFF
+DEV_I2C_ADDR = 0x26
+RELAY_REG = 0x10
+ADC_8BIT_REG = 0x20
+ADC_16BIT_REG = 0x30
+I2C_ADDR_REG = 0xFF
 
-class Relay_Stack:
 
+class Relay_Stack:
     def __init__(self, i2c, addr):
         self.i2c = i2c
         self.i2c_addr = addr
-    
+
     def _available(self):
         if not (self.i2c_addr in self.i2c.scan()):
             raise ModuleError("4 relay module maybe not connect")
 
     def get_relay_status(self, num):
-        """ 
+        """
         get RELAY Status.
         reg: 0x10
         num: select only 1 to 4
         return 0 or 1
         """
         num = min(4, max(num, 1))
-        return ((self.i2c.readfrom_mem(self.i2c_addr, RELAY_REG, 1)[0] >> (num - 1)) & 0x01)
+        return (self.i2c.readfrom_mem(self.i2c_addr, RELAY_REG, 1)[0] >> (num - 1)) & 0x01
 
     def set_relay_state(self, num, state):
         """
@@ -39,7 +39,7 @@ def set_relay_state(self, num, state):
         num = min(4, max(num, 1))
         data = self.i2c.readfrom_mem(self.i2c_addr, RELAY_REG, 1)[0]
         if state:
-            data |= (0x01 << (num - 1))
+            data |= 0x01 << (num - 1)
         else:
             data &= ~(0x01 << (num - 1))
         self.i2c.writeto_mem(self.i2c_addr, RELAY_REG, bytes([data]))
@@ -51,18 +51,18 @@ def set_all_relay_state(self, state):
         state: value is 0 or 1
         """
         state = min(1, max(state, 0))
-        data = 0x0f if state else 0x00
+        data = 0x0F if state else 0x00
         self.i2c.writeto_mem(self.i2c_addr, RELAY_REG, bytes([data]))
 
-#************************# Version 1.1 #****************************#
+    # ************************# Version 1.1 #****************************#
     def get_adc_8bit_value(self, volt=0):
         """
         get adc raw/volt 8bit value
         """
         val = self.i2c.readfrom_mem(self.i2c_addr, ADC_8BIT_REG, 1)[0]
         if volt:
-            val = (3.3/255) * val * 8
-            return round(val, 2) 
+            val = (3.3 / 255) * val * 8
+            return round(val, 2)
         else:
             return val
 
@@ -71,29 +71,29 @@ def get_adc_12bit_value(self, volt=0):
         get adc raw/volt 12bit value
         """
         buf = self.i2c.readfrom_mem(self.i2c_addr, ADC_16BIT_REG, 2)
-        val = struct.unpack('<H', buf)[0]
+        val = struct.unpack("<H", buf)[0]
         if volt:
-            val = (3.3/4095) * val * 8
+            val = (3.3 / 4095) * val * 8
             return round(val, 2)
         else:
             return val
-            
+
     def set_i2c_address(self, addr):
         """
         set i2c address.
-        addr :  1 to 127 
+        addr :  1 to 127
         """
         if addr >= 1 and addr <= 127:
             if addr != self.i2c_addr:
                 self.i2c.writeto_mem(self.i2c_addr, I2C_ADDR_REG, bytes([addr]))
                 self.i2c_addr = addr
                 time.sleep_ms(100)
 
-#*******************************************************************#  
 
-class Relay4(Relay_Stack):
+# *******************************************************************#
 
+
+class Relay4(Relay_Stack):
     def __init__(self, address: int = DEV_I2C_ADDR):
         super().__init__(i2c1, address)
         self._available()
-   

m5stack/libs/unit/env.py

@@ -49,4 +49,4 @@ def read_humidity(self) -> float:
         return round(self._temp_humid.measure()[1], 2)
 
     def read_pressure(self) -> float:
-        return round((self._pressure.measure()[1]/100), 2)
+        return round((self._pressure.measure()[1] / 100), 2)

m5stack/modules/startup/__init__.py

@@ -69,7 +69,12 @@ def startup(boot_opt, timeout: int = 60) -> None:
 
         pin4 = Pin(4, Pin.OUT)
         pin4.value(1)
-    if board_id in (M5.BOARD.M5AtomS3U, M5.BOARD.M5AtomS3Lite, M5.BOARD.M5StampS3):
+    if board_id in (
+        M5.BOARD.M5AtomS3U,
+        M5.BOARD.M5AtomS3Lite,
+        M5.BOARD.M5StampS3,
+        M5.BOARD.M5Capsule,
+    ):
         # M5AtomS3U may fail to enter the AUTODETECT process, which will cause
         # m5things to fail to obtain the board id.
         nvs = esp32.NVS("M5GFX")

m5stack/modules/startup/manifest_atoms3lite.py

@@ -0,0 +1,10 @@
+package(
+    "startup",
+    (
+        "__init__.py",
+        "atoms3lite.py",
+        "stamps3.py",
+    ),
+    base_path="..",
+    opt=3,
+)