Skip to content

Commit

Permalink
Rename branch "master" to "main"
Browse files Browse the repository at this point in the history
  • Loading branch information
amotl committed Sep 17, 2021
1 parent 729bad3 commit eb3a2db
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Tests

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

# Also, run each Monday At 07:00.
schedule:
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Terkin
:target: https://pypi.org/project/terkin/

.. image:: https://img.shields.io/pypi/l/terkin.svg
:target: https://github.com/hiveeyes/terkin-datalogger/blob/master/LICENSE
:target: https://github.com/hiveeyes/terkin-datalogger/blob/main/LICENSE

.. image:: https://img.shields.io/pypi/dm/terkin.svg
:target: https://pypi.org/project/terkin/
Expand Down Expand Up @@ -179,7 +179,7 @@ and adjust each configuration setting appropriately. The
documentation of all parameters is in the file itself
and should be reasonably self-explanatory.
For using Terkin with TTN/LoRaWAN find some more details
`here <https://github.com/hiveeyes/terkin-datalogger/blob/master/client/TTN/README.rst>`_.
`here <https://github.com/hiveeyes/terkin-datalogger/blob/main/client/TTN/README.rst>`_.

Sandbox setup
=============
Expand Down
10 changes: 5 additions & 5 deletions client/TTN/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ has been extended to also encode ``load`` and ``voltage`` readings.
In order to forward those variables into your TTN payload you would need to insert
the given decoder.js code into your TTN App. In TTN console under Payload Formats
switch to Custom and paste the Javascript from
`decoder.js <https://github.com/hiveeyes/terkin-datalogger/blob/master/client/TTN/decoder.js>`_.
`decoder.js <https://github.com/hiveeyes/terkin-datalogger/blob/main/client/TTN/decoder.js>`_.
The decoder function is backwards compatible to the built-in CayenneLPP decoder.

*********************
Expand All @@ -56,15 +56,15 @@ HTTP endpoint URLs for common use are already set up and can be requested from
@thiasB or @ClemensGruber but you can of course set up your own endpoint and use the
Javascript provided in

- `putsreq.hiveeyes.js <https://raw.githubusercontent.com/hiveeyes/terkin-datalogger/master/client/TTN/putsreq.hiveeyes.js>`_ for the Hiveeyes.org target, or
- `putsreq.bee-observer.js <https://raw.githubusercontent.com/hiveeyes/terkin-datalogger/master/client/TTN/putsreq.bee-observer.js>`_ for the bee-observer.org target, or
- `putsreq.beep.js <https://raw.githubusercontent.com/hiveeyes/terkin-datalogger/master/client/TTN/putsreq.beep.js>`_ for the beep.nl target
- `putsreq.hiveeyes.js <https://raw.githubusercontent.com/hiveeyes/terkin-datalogger/main/client/TTN/putsreq.hiveeyes.js>`_ for the Hiveeyes.org target, or
- `putsreq.bee-observer.js <https://raw.githubusercontent.com/hiveeyes/terkin-datalogger/main/client/TTN/putsreq.bee-observer.js>`_ for the bee-observer.org target, or
- `putsreq.beep.js <https://raw.githubusercontent.com/hiveeyes/terkin-datalogger/main/client/TTN/putsreq.beep.js>`_ for the beep.nl target

************
Telegram Bot
************
A Telegram bot for interacting with the device via LoRaWAN downlinks is
available from the `telegram_terkin_ttn_bot.py <https://github.com/hiveeyes/terkin-datalogger/blob/master/client/TTN/telegram_terkin_ttn_bot.py>`_ file.
available from the `telegram_terkin_ttn_bot.py <https://github.com/hiveeyes/terkin-datalogger/blob/main/client/TTN/telegram_terkin_ttn_bot.py>`_ file.

Currently these two capabilities are implemented:

Expand Down
2 changes: 1 addition & 1 deletion doc/source/_resources.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@

.. Terkin
.. _Install and configure the Terkin Datalogger development sandbox on Windows: https://community.hiveeyes.org/t/einrichten-der-micropython-firmware-unter-win10/2110
.. _Getting started with Pycom MicroPython: https://github.com/hiveeyes/terkin-datalogger/blob/master/doc/pycom-getting-started.rst
.. _Getting started with Pycom MicroPython: https://github.com/hiveeyes/terkin-datalogger/blob/main/doc/pycom-getting-started.rst
8 changes: 4 additions & 4 deletions doc/source/attic/hardware.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ configurations based on devices like these:
- `Hiveeyes Buerger`_


.. _Reference hardware: https://github.com/hiveeyes/terkin-datalogger/blob/master/README-HARDWARE.md
.. _Reference hardware: https://github.com/hiveeyes/terkin-datalogger/blob/main/README-HARDWARE.md

.. _EasyHive Pycom-Shield: https://github.com/hiveeyes/terkin-datalogger/blob/master/README-HARDWARE.md#easyhive-pycom-shield
.. _Hiverize Funktionsmuster: https://github.com/hiveeyes/terkin-datalogger/blob/master/README-HARDWARE.md#hiverize-funktionsmuster
.. _Hiveeyes Buerger: https://github.com/hiveeyes/terkin-datalogger/blob/master/README-HARDWARE.md#hiveeyes-buerger
.. _EasyHive Pycom-Shield: https://github.com/hiveeyes/terkin-datalogger/blob/main/README-HARDWARE.md#easyhive-pycom-shield
.. _Hiverize Funktionsmuster: https://github.com/hiveeyes/terkin-datalogger/blob/main/README-HARDWARE.md#hiverize-funktionsmuster
.. _Hiveeyes Buerger: https://github.com/hiveeyes/terkin-datalogger/blob/main/README-HARDWARE.md#hiveeyes-buerger


.. _Pycom FiPy: https://pycom.io/product/fipy/
Expand Down
4 changes: 2 additions & 2 deletions doc/source/development/backlog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ S3
- Doku bei
https://community.hiveeyes.org/t/uberarbeitung-des-terkin-readme-im-repository/3152/5
bzw.
https://github.com/hiveeyes/terkin-datalogger/blob/master/doc/cpython.rst
https://github.com/hiveeyes/terkin-datalogger/blob/main/doc/cpython.rst
aktualisieren und veröffentlichen
- Update credits

Expand Down Expand Up @@ -370,7 +370,7 @@ Prio 1.3
- Add ``alive_timer`` based on ``Timer.Chrono()``
- Battery low warning & shutdown: if voltage < 4.0 / < 3.7 (normal: 4.3)
- MOSFET gate
- [x] ESP32 Mock for testing: https://github.com/hiveeyes/terkin-datalogger/tree/master/test
- [x] ESP32 Mock for testing: https://github.com/hiveeyes/terkin-datalogger/tree/main/test
- [o] Scan Bluetooth neighbourhood for proximity applications
https://docs.pycom.io/firmwareapi/pycom/network/bluetooth/
- [o] Add Device ID as HTTP header
Expand Down
4 changes: 2 additions & 2 deletions doc/source/development/micropython/sandbox-operation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ you along, please have a look at `Terkin Datalogger troubleshooting`_.



.. _upgrade the Pycom firmware: https://github.com/hiveeyes/terkin-datalogger/blob/master/doc/pycom-firmware-upgrade.rst
.. _upgrade the Pycom firmware: https://github.com/hiveeyes/terkin-datalogger/blob/main/doc/pycom-firmware-upgrade.rst
.. _Filesystem corruption on FiPy's FatFS in brownout conditions: https://community.hiveeyes.org/t/fipy-verliert-programm-nach-power-off-durch-leeren-lipo-vermutlich-brownout-filesystem-corruption/2057
.. _Terkin Datalogger troubleshooting: https://github.com/hiveeyes/terkin-datalogger/blob/master/doc/troubleshooting.rst
.. _Terkin Datalogger troubleshooting: https://github.com/hiveeyes/terkin-datalogger/blob/main/doc/troubleshooting.rst
.. _create an issue: https://github.com/hiveeyes/terkin-datalogger/issues/new
2 changes: 1 addition & 1 deletion doc/source/development/micropython/sandbox-setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,4 @@ At this point, you should take a minute to have a look at
you through essential commands and function keys you will definitively need after
taking the red pill.

.. _getting started with Pycom MicroPython: https://github.com/hiveeyes/terkin-datalogger/blob/master/doc/getting-started.rst
.. _getting started with Pycom MicroPython: https://github.com/hiveeyes/terkin-datalogger/blob/main/doc/getting-started.rst
4 changes: 2 additions & 2 deletions doc/source/development/troubleshooting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Troubleshooting

We've jumped through some tires that you don't have to.

.. _upgrade your firmware: https://github.com/hiveeyes/terkin-datalogger/blob/master/doc/pycom-firmware-upgrade.rst
.. _upgrade your firmware: https://github.com/hiveeyes/terkin-datalogger/blob/main/doc/pycom-firmware-upgrade.rst

When experiencing problems, please also visit
https://docs.pycom.io/gettingstarted/troubleshooting-guide.html.
Expand Down Expand Up @@ -554,7 +554,7 @@ https://community.hiveeyes.org/t/fipy-verliert-programm-nach-power-off-durch-lee

Solution
--------
Use LittleFS, see https://github.com/hiveeyes/terkin-datalogger/blob/master/doc/getting-started.rst
Use LittleFS, see https://github.com/hiveeyes/terkin-datalogger/blob/main/doc/getting-started.rst


Network stack overload
Expand Down
2 changes: 1 addition & 1 deletion doc/source/project/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ The documentation is licensed under the terms of the Creative Commons `CC-BY-SA
.. _GNU Lesser General Public License: https://www.gnu.org/licenses/lgpl-3.0.en.html
.. _European Union Public Licence: https://opensource.org/licenses/EUPL-1.2
.. _CC-BY-SA 4.0 license: https://creativecommons.org/licenses/by-sa/4.0/
.. _notices about licenses of third-party components: https://github.com/hiveeyes/terkin/blob/master/THIRD-PARTY-NOTICES.rst
.. _notices about licenses of third-party components: https://github.com/hiveeyes/terkin-datalogger/blob/main/THIRD-PARTY-NOTICES.rst
2 changes: 1 addition & 1 deletion mpy_manifest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# FROZEN_MANIFEST file for building firmware images for Genuine MicroPython.
# https://github.com/hiveeyes/terkin-datalogger/blob/master/doc/release.rst#build-firmware-images
# https://github.com/hiveeyes/terkin-datalogger/blob/main/doc/release.rst#build-firmware-images
include('$(PORT_DIR)/boards/manifest.py')
freeze('dist-packages')
freeze('src/lib')
2 changes: 1 addition & 1 deletion test/test_lorawan.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Setup
=====
- https://github.com/hiveeyes/terkin-datalogger/blob/master/doc/tests.rst
- https://github.com/hiveeyes/terkin-datalogger/blob/main/doc/tests.rst
Synopsis
========
Expand Down

0 comments on commit eb3a2db

Please sign in to comment.