Deliver V19

Author: remibert

build.py

@@ -164,13 +164,13 @@
 cd "%(OUTPUT_DIR)s/%(MICROPYTHON_S1)s""
 make -C mpy-cross
 
-#####################
+########################
 # Build %(MICROPYTHON_S1)s" #
-#####################
-cd "%(OUTPUT_DIR)s/%(MICROPYTHON_S1)s"/ports/rp2"
+########################
+cd "%(OUTPUT_DIR)s/%(MICROPYTHON_S1)s/ports/rp2"
 make submodules
 make BOARD=%(BOARD)s
-cp "%(OUTPUT_DIR)s/%(MICROPYTHON_S1)s"/ports/rp2/build-%(BOARD)s/firmware.uf2" "%(PYCAMERESP_DIR)s/delivery/%(BOARD)s-firmware.uf2"
+cp "%(OUTPUT_DIR)s/%(MICROPYTHON_S1)s/ports/rp2/build-%(BOARD)s/firmware.uf2" "%(PYCAMERESP_DIR)s/delivery/%(BOARD)s-firmware.uf2"
 
 '''
 
@@ -180,7 +180,7 @@
 # Build distri zip #
 ####################
 cd %(PYCAMERESP_DIR)s
-python3 "%(PYCAMERESP_DIR)s/scripts/zip_mpy.py" "%(OUTPUT_DIR)s" "%(BOARD)s" "%(PYCAMERESP_DIR)s"
+python3 "%(PYCAMERESP_DIR)s/scripts/zip_mpy.py" "%(OUTPUT_DIR)s" "%(BOARD)s" "$(MICRO)" "%(BOARD_VARIANT_FIRMWARE)s" "%(PYCAMERESP_DIR)s"
 
 '''
 
@@ -408,7 +408,7 @@ def main():
 			execute(PATCH_COMMANDS, args.s3)
 
 		if args.zippy:
-			execute(ZIP_MODULES)
+			execute(ZIP_MODULES, args.s3)
 
 		if args.build or args.all:
 			if args.rp2:
@@ -433,7 +433,7 @@ def main():
 								execute(SET_ESP_COMMANDS, args.s3)
 								print("IDF_PATH='%s'"%os.environ["IDF_PATH"])
 								execute(BUILD_ESP_COMMANDS, args.s3)
-							execute(ZIP_MODULES)
+							execute(ZIP_MODULES, args.s3)
 
 if __name__ == "__main__":
 	import sys

doc/CAMFLASHER.md

@@ -9,7 +9,7 @@ It offer the possibility to access the esp32 shell, edit files from esp32 and ex
 
 It is also a VT100 console which allows to operate the text editor, and to display colored texts thanks to the VT100 escape sequences. Not all VT100 commands are supported, but the most common ones are available.
 
-Camflasher with shell commands **upload** and **download**, allows to upload or download files easily from the device.
+Camflasher with shell commands **upload** and **download**, allows to upload or download files easily from the device, and also the drag and drop of file or directory, allows you to easily install files on the board, to do this you must be in shell mode (Ctrl-Z to enter in shell mode and "exit" command after to restart server).
 
 - Download computer drivers for your device :
 	- [CH341 drivers](http://www.wch.cn/download/CH341SER_ZIP.html)
@@ -18,29 +18,26 @@ Camflasher with shell commands **upload** and **download**, allows to upload or
 
 - Download the firmware associated with your device :
 
-	- [ESP32-CAM, ESP32-CAM-MB, ESP32ONE, M5Stack Camera](https://github.com/remibert/pycameresp/releases/download/V18/ESP32CAM-firmware.bin)
+	- [ESP32-CAM, ESP32-CAM-MB, ESP32ONE, M5Stack Camera](https://github.com/remibert/pycameresp/releases/download/V19/ESP32CAM-firmware.bin)
 
-	- [ESP32-TTGO-T8 or ESP32 with SPIRAM ](https://github.com/remibert/pycameresp/releases/download/V18/GENERIC_SPIRAM-firmware.bin)
+	- [ESP32-TTGO-T8 or ESP32 with SPIRAM ](https://github.com/remibert/pycameresp/releases/download/V19/GENERIC_SPIRAM-firmware.bin)
 
+	- [Freenove CAM S3](https://github.com/remibert/pycameresp/releases/download/V19/FREENOVE_CAM_S3-SPIRAM_OCT-firmware.bin)
 
-- Or download the zip for standard micropython firmware :
+	- [For other devices see releases](https://github.com/remibert/pycameresp/releases)
 
-	- [Shell with editor](https://github.com/remibert/pycameresp/releases/download/V18/shell.zip)
+The firmwares contains a micropython version, patched to support the camera, and some microsd, as well as all servers and other features. But if you are not interested in the whole platform, just the camera support, you can replace the main.py with your own implementation, it remains a standard micropython platform.
 
-	- [Wifi manager, Http server](https://github.com/remibert/pycameresp/releases/download/V18/server.zip)
-
-- Text editor source files running on python3 and micropython :
-
-	- [Text editor](https://github.com/remibert/pycameresp/releases/download/V18/editor.zip)
-
-It is possible to run the shell with editor, or the servers on a standard micropython platform. The servers, the wifi manager, requires having enough ram and wifi support (ESP32 with SPIRAM for example). Unzip archive and install it with rshell.
+ The servers, the wifi manager, requires having enough ram and wifi support (ESP32 with SPIRAM for example). Unzip archive and install it with rshell.
 
 - Download the camflasher application and unzip it :
-	- [CamFlasher for Windows 10 64 bits](https://github.com/remibert/pycameresp/releases/download/V18/CamFlasher_windows_10_64.zip)
+	- [CamFlasher for Windows 10 64 bits](https://github.com/remibert/pycameresp/releases/download/V19/CamFlasher_windows_10_64.zip)
+
+	- [CamFlasher for OSX Ventura Intel](https://github.com/remibert/pycameresp/releases/download/V19/CamFlasher_osx_i386.zip)
 
-	- [CamFlasher for OSX Ventura Intel](https://github.com/remibert/pycameresp/releases/download/V18/CamFlasher_osx_i386.zip)
+	- [CamFlasher for OSX Ventura M1](https://github.com/remibert/pycameresp/releases/download/V19/CamFlasher_osx_arm.zip)
 
-	- [CamFlasher for OSX Ventura M1](https://github.com/remibert/pycameresp/releases/download/V18/CamFlasher_osx_arm.zip)
+	- [CamFlasher for linux](https://github.com/remibert/pycameresp/releases/download/V19/CamFlasher_linux.zip)
 
 - Connect the device to the USB port of your computer.
 
@@ -55,10 +52,10 @@ It is possible to run the shell with editor, or the servers on a standard microp
 ![CamFlasher](/images/1_CamFlasher.png "CamFlasher")
 
 - Select firmware and check "Erase flash" the first time. The firmware can be download directly from web site. 
-- For Esp32 S3 the address must be 0x0
-- For others Esp32 the address must be 0x1000.
+- **For Esp32 S3 the address must be 0x0**
+- **For others Esp32 the address must be 0x1000**.
 
-**If the device resets in a loop, it is necessary to do a flash with erase**.
+**If the device resets in a loop, it is necessary to do a flash with erase, and check if the address is correct**.
 
 ![CamFlasher](/images/2_CamFlasher_SelectFirmware.png "CamFlasher")
 

doc/FIRMWARE.md

@@ -44,16 +44,19 @@ And after juste for rebuild use command :
 Replace **ESP32CAM** by your prefered firmware, add double quote if you want to use wildcards for build many firmwares, for example ESP32 GENERIC SPIRAM :
 - **python3 build.py --patch --build "GENERIC_SPIRAM"** 
 
-Or for all ESP32 S2
+Or for all ESP32 Camera
 - **python3 build.py --patch --build "ESP32CAM" "GENERIC_SPIRAM"** 
 
-To build ESP32 S3 :
-- **python3 build.py --s3 --patch --boardvariant SPIRAM --build "ESP32_GENERIC_S3"**
+To build ESP32 S3 with SPIRAM:
+- **python3 build.py --patch --build --s3 --boardvariant SPIRAM  "ESP32_GENERIC_S3"**
+
+To build ESP32 S3 without SPIRAM:
+- **python3 build.py --patch --build --s3 "ESP32_GENERIC_S3"**
 
 To build Freenove CAM S3 :
-- **build.py --build --patch --s3  FREENOVE_CAM_S3   --boardvariant SPIRAM_OCT**
+- **python3 build.py --patch --build --s3  --boardvariant SPIRAM_OCT  "FREENOVE_CAM_S3"**
 
 To build Pico PI W you must clean all and enter command :
-- **python3 build.py --rp2 --patch --build "PICO_W"**
+- **python3 build.py --patch --build --rp2 "PICO_W"**
 
-I no longer use the same version of micropython between the esp32 and the esp32-S3, the reason is simple, I can no longer link the firmware, so I stayed on a version 1.20 of micropython, which has the merit of working perfectly.
+I no longer use the same version of micropython between the esp32 and the esp32-S3, the reason is simple, I can't link the firmware, so I stayed on a version 1.20 of micropython, which has the merit of working perfectly.

doc/REQUIREMENTS.md

@@ -20,6 +20,6 @@ Below are the devices compatible with pycameresp :
 ![NODEMCU](/images/Device_NODEMCU.jpg "NODE MCU")
 ![LOLIN32](/images/Device_LOLIN32.jpg "LOLIN32")
 ![PicoPi](/images/Device_PicoPi.png "Pico PI W")
-![SONOFF R3](/images/Device_SonoffR3.png "SONOFF R3")
+![Freenove CAM S3](/images/Device_FREENOVE_CAM_S3.png "Freenove CAM S3")
 
 Note on the freenove cam S3, I had problems with wifi disruption, which limited the video streaming speed, to correct this I unsoldered the two connectors from the edges of the card, it's tedious, but the speed has become maximum.

doc/lib/index.html

@@ -26,14 +26,6 @@ <h1 class="title">Namespace <code>lib</code></h1>
 <section>
 <h2 class="section-title" id="header-submodules">Sub-modules</h2>
 <dl>
-<dt><code class="name"><a title="lib.device" href="device/index.html">lib.device</a></code></dt>
-<dd>
-<div class="desc"></div>
-</dd>
-<dt><code class="name"><a title="lib.electricmeter" href="electricmeter/index.html">lib.electricmeter</a></code></dt>
-<dd>
-<div class="desc"><p>Class to manage the electricmeter</p></div>
-</dd>
 <dt><code class="name"><a title="lib.htmltemplate" href="htmltemplate/index.html">lib.htmltemplate</a></code></dt>
 <dd>
 <div class="desc"><p>Class to manage the html templates</p></div>
@@ -42,7 +34,7 @@ <h2 class="section-title" id="header-submodules">Sub-modules</h2>
 <dd>
 <div class="desc"><p>Class to manage motion detection with ESP32CAM</p></div>
 </dd>
-<dt><code class="name"><a title="lib.sample" href="sample/index.html">lib.sample</a></code></dt>
+<dt><code class="name"><a title="lib.plugins" href="plugins/index.html">lib.plugins</a></code></dt>
 <dd>
 <div class="desc"></div>
 </dd>
@@ -87,11 +79,9 @@ <h1>Index</h1>
 <ul id="index">
 <li><h3><a href="#header-submodules">Sub-modules</a></h3>
 <ul>
-<li><code><a title="lib.device" href="device/index.html">lib.device</a></code></li>
-<li><code><a title="lib.electricmeter" href="electricmeter/index.html">lib.electricmeter</a></code></li>
 <li><code><a title="lib.htmltemplate" href="htmltemplate/index.html">lib.htmltemplate</a></code></li>
 <li><code><a title="lib.motion" href="motion/index.html">lib.motion</a></code></li>
-<li><code><a title="lib.sample" href="sample/index.html">lib.sample</a></code></li>
+<li><code><a title="lib.plugins" href="plugins/index.html">lib.plugins</a></code></li>
 <li><code><a title="lib.server" href="server/index.html">lib.server</a></code></li>
 <li><code><a title="lib.shell" href="shell/index.html">lib.shell</a></code></li>
 <li><code><a title="lib.tools" href="tools/index.html">lib.tools</a></code></li>