Skip to content

Commit

Permalink
1.9.12 added led option to the serial config menu
Browse files Browse the repository at this point in the history
  • Loading branch information
HomeACcessoryKid committed Apr 6, 2020
1 parent 7a8404b commit 56d0532
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 22 deletions.
49 changes: 48 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog

## 1.9.12 added led option to the serial config menu

## 1.9.11 led back to input mode after restart
- if not, led continues output in last state

Expand Down Expand Up @@ -36,4 +38,49 @@ Else it will break the access to the flash in case it is not compatible.
to [esp-open-rtos#bc97988](https://github.com/SuperHouse/esp-open-rtos/commit/bc979883c27ea57e948daa813e2bca752ebd39e1)
- change the verification of the signature of otamain.bin prior to downloading this file instead of afterwards

## 1.9.4 and before will be updated in the future
## 1.9.4 load initial cert from inside OTABOOT plus details
- clear lcm_beta instead of setting it to 0
- allow for missing trailing / in emergency base URL
- updated README.md and design diagram
- changed order for checking otaboot.sig

## 1.9.3 clear LCM_beta after emergency
- this didn't actually work

## 1.9.2 first test of LANmode fallback
- after GitHub changed their http header this allows to recover
- also called emergency mode

## proof of concept emergency mode

## 1.9.1 fix to make http header parsing more robust
- after GitHub changed the syntax of Location: to location:

## Fixes bug caused by GitHub header changes (#22)

- Fixes case sensitive headers.
- Makes blank space optional for some headers.
- Rename strstr_lc() function to ota_strstr().
- Added '\n' to the beginning of some headers.

## 1.9.0 transfer from LCMdev 1.2.5
- LCM has arrived to a new stage with its own adaptation of rboot -
rboot4lcm - which counts powercycles. These can be used to check
updates, reset wifi or factory reset.
The versions 1.9.x will test at beta level what was started in the repo
LCMdev v1.2.5 and lead up to version 2.0.0

## updates done in LCMdev
- 1.2.5 really erase wifi settings and fix ota_beta readout
- 1.2.4 changed ota_count_step to sysparam string
- 1.2.3 ota_count_step defines power cycle behaviour
- 1.2.2 documentation update
- 1.2.2 improved wifi reset code
- 1.2.1 fixed wifi erase and ota_new_layout
- 1.2.0 read rtc power cycle count and reduce ota-main binary
- 1.1.2 fix boot bits init and serial input
- 1.1.1 fixed the position of boot update code to ota-main-only
- 1.1.0 added update of boot loader and minor fixes
- 1.0.1 initial adjustments after cloning

- 1.0.0 clone of Life-Cycle-Manager 1.0.0

## completed instructions how to integrate with esp-homekit
38 changes: 19 additions & 19 deletions deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@ cd life-cycle-manager
- initial steps to be expanded

#### These are the steps if not introducing a new key pair
- create/update the file versions1/latest-pre-release without new-line and setup 1.9.11 version folder
- create/update the file versions1/latest-pre-release without new-line and setup 1.9.12 version folder
```
mkdir versions1/1.9.11v
echo -n 1.9.11 > versions1/1.9.11v/latest-pre-release
cp versions1/certs.sector* versions1/1.9.11v
cp versions1/public*key* versions1/1.9.11v
mkdir versions1/1.9.12v
echo -n 1.9.12 > versions1/1.9.12v/latest-pre-release
cp versions1/certs.sector* versions1/1.9.12v
cp versions1/public*key* versions1/1.9.12v
```
- set local.mk to the ota-main program
```
make -j6 rebuild OTAVERSION=1.9.11
mv firmware/otamain.bin versions1/1.9.11v
make -j6 rebuild OTAVERSION=1.9.12
mv firmware/otamain.bin versions1/1.9.12v
```
- set local.mk back to ota-boot program
```
make -j6 rebuild OTAVERSION=1.9.11
mv firmware/otaboot.bin versions1/1.9.11v
make -j6 rebuild OTAVERSION=1.9.11 OTABETA=1
cp firmware/otaboot.bin versions1/1.9.11v/otabootbeta.bin
make -j6 rebuild OTAVERSION=1.9.12
mv firmware/otaboot.bin versions1/1.9.12v
make -j6 rebuild OTAVERSION=1.9.12 OTABETA=1
cp firmware/otaboot.bin versions1/1.9.12v/otabootbeta.bin
```
- remove the older version files
#
- update Changelog
- commit this as version 1.9.11
- set up a new github release 1.9.11 as a pre-release using the just commited master...
- commit this as version 1.9.12
- set up a new github release 1.9.12 as a pre-release using the just commited master...
- upload the certs and binaries to the pre-release assets on github
#
- erase the flash and upload the privatekey
Expand All @@ -43,18 +43,18 @@ esptool.py -p /dev/cu.usbserial-* --baud 230400 write_flash 0xf9000 versions1-pr
```
- upload the ota-boot BETA program to the device that contains the private key
```
make flash OTAVERSION=1.9.11 OTABETA=1
make flash OTAVERSION=1.9.12 OTABETA=1
```
- power cycle to prevent the bug for software reset after flash
- setup wifi and select the ota-demo repo without pre-release checkbox
- create the 2 signature files next to the bin file and upload to github one by one
- verify the hashes on the computer
```
openssl sha384 versions1/1.9.11v/otamain.bin
xxd versions1/1.9.11v/otamain.bin.sig
openssl sha384 versions1/1.9.12v/otamain.bin
xxd versions1/1.9.12v/otamain.bin.sig
```

- upload the file versions1/1.9.11v/latest-pre-release to the 'latest release' assets on github
- upload the file versions1/1.9.12v/latest-pre-release to the 'latest release' assets on github

#### Testing

Expand Down Expand Up @@ -107,14 +107,14 @@ esptool.py -p /dev/cu.usbserial-* --baud 230400 write_flash 0xf9000 versionsN-1-
```
- collect public-1.key.sig and store it in the new version folder and copy it to versions1
```
cp versions1/1.9.11v/public-1.key.sig versions1
cp versions1/1.9.12v/public-1.key.sig versions1
```
- then flash the new private key
```
esptool.py -p /dev/cu.usbserial-* --baud 230400 write_flash 0xf9000 versions1-privatekey.der
```
- collect cert.sector.sig and store it in the new version folder and copy it to versions1
```
cp versions1/1.9.11v/certs.sector.sig versions1
cp versions1/1.9.12v/certs.sector.sig versions1
```
- continue with a normal deployment to create the 2 signature files next to the bin files
2 changes: 1 addition & 1 deletion esp-wifi-config
1 change: 0 additions & 1 deletion versions1/1.9.11v/latest-pre-release

This file was deleted.

File renamed without changes.
1 change: 1 addition & 0 deletions versions1/1.9.12v/latest-pre-release
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.9.12
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 56d0532

Please sign in to comment.