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

Serial feature #309

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Serial feature #309

wants to merge 26 commits into from

Commits on Dec 25, 2021

  1. Add Streamserver

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    4b372f3 View commit details
    Browse the repository at this point in the history

  2. add Streamserver to main

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    21e092c View commit details
    Browse the repository at this point in the history

  3. Add EventConsole

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    f6fd0bd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/rjwats/esp8266-react into… 

    … ser2net
    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    b8145c6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'serial' of https://github.com/mjkl-gh/esp-dsmr into ser… 

    …2net
    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    5e3b6e2 View commit details
    Browse the repository at this point in the history

  6. Add SerialService

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    d99de58 View commit details
    Browse the repository at this point in the history

  7. Comment out LogEventController

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    ebbf9f4 View commit details
    Browse the repository at this point in the history

  8. Merge ser2net

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    5a69d33 View commit details
    Browse the repository at this point in the history

  9. Rename ser2net to serial

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    39a8d2d View commit details
    Browse the repository at this point in the history

  10. add baud to SerialStatus

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    c72cbc0 View commit details
    Browse the repository at this point in the history

  11. WIP Serial page

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    dc7b28c View commit details
    Browse the repository at this point in the history

  12. Merge fixes from main branch

    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    2b3996a View commit details
    Browse the repository at this point in the history

  13. Merge remote-tracking branch 'refs/remotes/Upstream/master' 

    Conflicts:
	README.md
	factory_settings.ini
	features.ini
	interface/.env.development
	interface/package-lock.json
	interface/package.json
	interface/src/AppRouting.tsx
	interface/src/ap/APSettingsForm.tsx
	interface/src/api/Endpoints.ts
	interface/src/api/Env.ts
	interface/src/authentication/AuthenticatedRoute.tsx
	interface/src/authentication/AuthenticationContext.tsx
	interface/src/authentication/AuthenticationWrapper.tsx
	interface/src/components/MenuAppBar.tsx
	interface/src/components/RestController.tsx
	interface/src/components/index.ts
	interface/src/features/FeaturesContext.tsx
	interface/src/framework/wifi/WiFiConnectionContext.tsx
	interface/src/ntp/TimeFormat.ts
	interface/src/system/OTASettingsForm.tsx
	interface/src/system/System.tsx
	interface/src/validators/optional.ts
	interface/src/validators/or.ts
	interface/src/wifi/WiFiConnection.tsx
	interface/src/wifi/WiFiConnectionContext.tsx
	interface/src/wifi/WiFiSettingsForm.tsx
	interface/tsconfig.json
	lib/framework/ESPUtils.h
	lib/framework/MqttSettingsService.h
    @mjkl-gh
    mjkl-gh committed Dec 25, 2021
    Configuration menu
    Copy the full SHA
    0c9d454 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2022

  1. WIP update serial feature to new format

    @mjkl-gh
    mjkl-gh committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    9249d1e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'Upstream/master' into SerialFeature-Fix

    @mjkl-gh
    mjkl-gh committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    5888bdc View commit details
    Browse the repository at this point in the history

  3. fix Tab moved to @mui/material from @material-ui/core

    @mjkl-gh
    mjkl-gh committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    cddf41e View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. styleguide fixes

    @mjkl-gh
    mjkl-gh committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    11fb837 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Fix typo in Serial status title

    @mjkl-gh
    mjkl-gh committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    6725888 View commit details
    Browse the repository at this point in the history

  2. Set sensible defaults for serial pins for both platforms

    @mjkl-gh
    mjkl-gh committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    70ec5fc View commit details
    Browse the repository at this point in the history

  3. WIP logevent console

    @mjkl-gh
    mjkl-gh committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    8710636 View commit details
    Browse the repository at this point in the history

  4. Fix endpoint.ts and env.ts names

    @mjkl-gh
    mjkl-gh committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    a7148b4 View commit details
    Browse the repository at this point in the history

  5. Fix double dependency

    @mjkl-gh
    mjkl-gh committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    0760a5e View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2022

  1. Simplify serial feature

    @mjkl-gh
    mjkl-gh committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    956aacc View commit details
    Browse the repository at this point in the history

  2. add numbervalue to serialsettingsform

    @mjkl-gh
    mjkl-gh committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    436a00e View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2022

  1. Fix settings forms

    @mjkl-gh
    mjkl-gh committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    44b5c7e View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary this

    @mjkl-gh
    mjkl-gh committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    35f37f3 View commit details
    Browse the repository at this point in the history