Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set Apache license to Update Library #9446

Merged
merged 14 commits into from
Apr 2, 2024
Merged

Set Apache license to Update Library #9446

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
99bf92f
feat: update license
SuGlider Apr 2, 2024
04abd89
feat: update license
SuGlider Apr 2, 2024
33d7b6a
feat: update license
SuGlider Apr 2, 2024
a299d19
feat: update license
SuGlider Apr 2, 2024
f88c03b
feat: license
SuGlider Apr 2, 2024
dfb990e
Update Update.h
SuGlider Apr 2, 2024
14fa234
Update HttpsOTAUpdate.h
SuGlider Apr 2, 2024
cb26f48
Update HttpsOTAUpdate.cpp
SuGlider Apr 2, 2024
1235477
Merge branch 'master' into SuGlider-patch-2
SuGlider Apr 2, 2024
bff302b
Update HttpsOTAUpdate.cpp
SuGlider Apr 2, 2024
660637e
Update HttpsOTAUpdate.cpp
SuGlider Apr 2, 2024
c0aa20e
Update HttpsOTAUpdate.cpp
SuGlider Apr 2, 2024
996d6d3
Update HttpsOTAUpdate.cpp
SuGlider Apr 2, 2024
4928cc9
Update HttpsOTAUpdate.h
SuGlider Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 deletions libraries/Update/src/HttpsOTAUpdate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/* OTA task
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/

This example code is in the Public Domain (or CC0 licensed, at your option.)

Unless required by applicable law or agreed to in writing, this
software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied.
*/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this change please.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@me-no-dev - reverted.
HttpsOTAUpdate.cpp/.h are marked as CC0
Update.h/Updater.cpp are marked as Apache-2.0

Is it correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wrote Updater, not HttpsOTAUpdate, so the user who wrote it, put that license there :)

#include <stdio.h>
#include <string.h>

Expand Down
6 changes: 6 additions & 0 deletions libraries/Update/src/HttpsOTAUpdate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/

#ifndef HTTPSOTAUPDATE_H
#define HTTPSOTAUPDATE_H
#include "esp_http_client.h"
Expand Down
6 changes: 6 additions & 0 deletions libraries/Update/src/Update.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/

#ifndef ESP32UPDATER_H
#define ESP32UPDATER_H

Expand Down
6 changes: 6 additions & 0 deletions libraries/Update/src/Updater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/

#include "Update.h"
#include "Arduino.h"
#include "spi_flash_mmap.h"
Expand Down