Skip to content

Commit

Permalink
Add Shelly Mini1G3, Mini1PMG3 and MiniPMG3 (#36)
Browse files Browse the repository at this point in the history
Co-authored-by: Thomas Brasser <thomas@brasser.family>
  • Loading branch information
tbrasser and Thomas Brasser committed Dec 23, 2023
1 parent cd54b14 commit ab7b7f8
Show file tree
Hide file tree
Showing 18 changed files with 2,482 additions and 0 deletions.
Binary file added raw/esp32c3/Shelly_Mini1G3/Partition_Wizard.tapp
Binary file not shown.
Binary file not shown.
108 changes: 108 additions & 0 deletions raw/esp32c3/Shelly_Mini1G3/bootloader.be
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
#
# Flash bootloader from URL or filesystem
#

class bootloader
static var _addr = [0x1000, 0x0000] # possible addresses for bootloader
static var _sign = bytes('E9') # signature of the bootloader
static var _addr_high = 0x8000 # address of next partition after bootloader

# get the bootloader address, 0x1000 for Xtensa based, 0x0000 for RISC-V based (but might have some exception)
# we prefer to probed what's already in place rather than manage a hardcoded list of architectures
# (there is a low risk of collision if the address is 0x0000 and offset 0x1000 is actually E9)
def get_bootloader_address()
import flash
# let's see where we find 0xE9, trying first 0x1000 then 0x0000
for addr : self._addr
if flash.read(addr, size(self._sign)) == self._sign
return addr
end
end
return nil
end

#
# download from URL and store to `bootloader.bin`
#
def download(url)
# address to flash the bootloader
var addr = self.get_bootloader_address()
if addr == nil raise "internal_error", "can't find address for bootloader" end

var cl = webclient()
cl.begin(url)
var r = cl.GET()
if r != 200 raise "network_error", "GET returned "+str(r) end
var bl_size = cl.get_size()
if bl_size <= 8291 raise "internal_error", "wrong bootloader size "+str(bl_size) end
if bl_size > (0x8000 - addr) raise "internal_error", "bootloader is too large "+str(bl_size / 1024)+"kB" end

cl.write_file("bootloader.bin")
cl.close()
end

# returns true if ok
def flash(url)
var fname = "bootloader.bin" # default local name
if url != nil
if url[0..3] == "http" # if starts with 'http' download
self.download(url)
else
fname = url # else get from file system
end
end
# address to flash the bootloader
var addr = self.get_bootloader_address()
if addr == nil tasmota.log("OTA: can't find address for bootloader", 2) return false end

var bl = open(fname, "r")
if bl.readbytes(size(self._sign)) != self._sign
tasmota.log("OTA: file does not contain a bootloader signature", 2)
return false
end
bl.seek(0) # reset to start of file

var bl_size = bl.size()
if bl_size <= 8291 tasmota.log("OTA: wrong bootloader size "+str(bl_size), 2) return false end
if bl_size > (0x8000 - addr) tasmota.log("OTA: bootloader is too large "+str(bl_size / 1024)+"kB", 2) return false end

tasmota.log("OTA: Flashing bootloader", 2)
# from now on there is no turning back, any failure means a bricked device
import flash
# read current value for bytes 2/3
var cur_config = flash.read(addr, 4)

flash.erase(addr, self._addr_high - addr) # erase the bootloader
var buf = bl.readbytes(0x1000) # read by chunks of 4kb
# put back signature
buf[2] = cur_config[2]
buf[3] = cur_config[3]
while size(buf) > 0
flash.write(addr, buf, true) # set flag to no-erase since we already erased it
addr += size(buf)
buf = bl.readbytes(0x1000) # read next chunk
end
bl.close()
tasmota.log("OTA: Booloader flashed, please restart", 2)
return true
end
end

return bootloader

#-
### FLASH
import bootloader
bootloader().flash('https://raw.githubusercontent.com/espressif/arduino-esp32/master/tools/sdk/esp32/bin/bootloader_dio_40m.bin')
#bootloader().flash('https://raw.githubusercontent.com/espressif/arduino-esp32/master/tools/sdk/esp32/bin/bootloader_dout_40m.bin')
### FLASH from local file
bootloader().flash("bootloader-tasmota-c3.bin")
#### debug only
bl = bootloader()
print(format("0x%04X", bl.get_bootloader_address()))
-#
4 changes: 4 additions & 0 deletions raw/esp32c3/Shelly_Mini1G3/init.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Br load("Shelly_Mini1G3.autoconf#migrate_shelly.be")
Template {"NAME":"Shelly Mini1G3","GPIO":[320,32,0,4736,0,0,0,224,0,0,192,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
Module 0
AdcParam1 2,10000,10000,3350
70 changes: 70 additions & 0 deletions raw/esp32c3/Shelly_Mini1G3/migrate_shelly.be
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# migration script for Shelly

# simple function to copy from autoconfig archive to filesystem
# return true if ok
def cp(from, to)
import path
if to == nil to = from end # to is optional
if !path.exists(to)
try
# tasmota.log("f_in="+tasmota.wd + from)
var f_in = open(tasmota.wd + from)
var f_content = f_in.readbytes()
f_in.close()
var f_out = open(to, "w")
f_out.write(f_content)
f_out.close()
except .. as e,m
tasmota.log("OTA: Couldn't copy "+to+" "+e+" "+m,2)
return false
end
return true
end
return true
end

# make some room if there are some leftovers from shelly
import path
path.remove("index.html.gz")

# copy some files from autoconf to filesystem
var ok
ok = cp("bootloader-tasmota-c3.bin")
ok = cp("Partition_Wizard.tapp")

# use an alternative to partition_core that can read Shelly's otadata
tasmota.log("OTA: loading "+tasmota.wd + "partition_core_shelly.be", 2)
load(tasmota.wd + "partition_core_shelly.be")

# load bootloader flasher
tasmota.log("OTA: loading "+tasmota.wd + "bootloader.be", 2)
load(tasmota.wd + "bootloader.be")


# all good
if ok
# do some basic check that the bootloader is not already in place
import flash
if flash.read(0x1000, 4) == bytes('CD3F6395')
tasmota.log("OTA: bootloader already in place, not flashing it")
else
ok = global.bootloader().flash("bootloader-tasmota-c3.bin")
end
if ok
var p = global.partition_core_shelly.Partition()
p.save() # save with otadata compatible with new bootloader
tasmota.log("OTA: Shelly migration successful", 2)
end
end

# dump logs to file
var lr = tasmota_log_reader()
var f_logs = open("migration_logs.txt", "w")
var logs = lr.get_log(2)
while logs != nil
f_logs.write(logs)
logs = lr.get_log(2)
end
f_logs.close()

# Done
Loading

0 comments on commit ab7b7f8

Please sign in to comment.