Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit ad255a5
Author: Robert van den Breemen <[email protected]>
Date:   Sat Apr 13 13:40:20 2024 +0200

    Cleaning up the fix a bit

commit 1c8485a
Merge: d0b5fbc 6d6c117
Author: Robert van den Breemen <[email protected]>
Date:   Sat Apr 13 13:37:07 2024 +0200

    Merge pull request #243 from DutchessNicole/main

    added provisions for password field

commit d0b5fbc
Author: Robert van den Breemen <[email protected]>
Date:   Sat Apr 13 13:18:01 2024 +0200

    fix: hiding the password in the UI

commit 6d6c117
Author: Nicole Koopmans <[email protected]>
Date:   Fri Apr 12 16:27:56 2024 +0200

    added provisions for password field

commit 8d9da27
Author: Robert van den Breemen <[email protected]>
Date:   Mon Apr 8 21:54:53 2024 +0200

    Cleaning up release flow

commit 58609c8
Author: Robert van den Breemen <[email protected]>
Date:   Mon Apr 8 21:50:55 2024 +0200

    Hmmm, fixing idents and space in yml

commit b4a0b2f
Author: Robert van den Breemen <[email protected]>
Date:   Mon Apr 8 21:47:10 2024 +0200

    Adding one more setp

commit baec3cb
Author: Robert van den Breemen <[email protected]>
Date:   Mon Apr 8 21:43:27 2024 +0200

    fixing the release workflow by adding setup

commit 054866b
Author: Robert van den Breemen <[email protected]>
Date:   Mon Apr 8 21:37:27 2024 +0200

    trying to call build from release flow

commit 20cf3ad
Author: Robert van den Breemen <[email protected]>
Date:   Wed Apr 3 23:13:09 2024 +0200

    Adding release build artifacts to release

commit c6572d4
Author: Robert van den Breemen <[email protected]>
Date:   Wed Apr 3 23:04:30 2024 +0200

    Update release workflow to nodejs20

commit 3f0320f
Author: Robert van den Breemen <[email protected]>
Date:   Tue Apr 2 18:32:39 2024 +0200

    rollback changes index.js

commit 6752fdf
Author: Robert van den Breemen <[email protected]>
Date:   Mon Apr 1 21:49:18 2024 +0200

    Fixed all status functions

commit aa4ea29
Author: Robert van den Breemen <[email protected]>
Date:   Mon Apr 1 09:26:25 2024 +0200

    Fix APIGW, make it dependend on localURL (index.js)
    Fix status value for REST API, use OR instead of AND operator

commit 1214611
Author: Robert van den Breemen <[email protected]>
Date:   Mon Mar 18 00:53:33 2024 +0100

    Okay, testing workflow action build

commit baae5e0
Author: Robert van den Breemen <[email protected]>
Date:   Mon Mar 18 00:35:21 2024 +0100

    Fix: Fixing filesystem rename

commit ea54657
Author: Robert van den Breemen <[email protected]>
Date:   Mon Mar 18 00:32:26 2024 +0100

    Fix: one more change

commit ac10b1d
Author: Robert van den Breemen <[email protected]>
Date:   Mon Mar 18 00:26:00 2024 +0100

    Fix: Trying to get a clean filesystem rename

commit bb0eabe
Author: Robert van den Breemen <[email protected]>
Date:   Mon Mar 18 00:09:33 2024 +0100

    Changes to make file, and build action. To simplify it

commit 308ce13
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 23:41:37 2024 +0100

    Fix: adding basename to mv command

commit 2617630
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 23:38:04 2024 +0100

    Fix: more difficult than you think

commit ddeca02
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 23:30:12 2024 +0100

    Fix: filename pattern

commit 7fe322e
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 23:25:11 2024 +0100

    Fix: the moving of the make results

commit 0976cca
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 23:11:24 2024 +0100

    Fix block mapping

commit 42a8c82
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 23:08:33 2024 +0100

    Fixing move of files after build

commit 7fe61d3
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 21:56:31 2024 +0100

    Fix: remove the double astrix

commit 167c549
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 21:55:53 2024 +0100

    fix: upload artifacts from build directory

commit ebc03c8
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 21:50:00 2024 +0100

    Add create build directory

commit de2beaf
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 21:45:50 2024 +0100

    run semver step before rest, and fix filesystem building by adding shell: bash

commit 2f34aeb
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 18:10:41 2024 +0100

    Trying to move & rename in the CI pipeline

commit d6c6ddc
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 18:07:19 2024 +0100

    renaming all files to correct semver version

commit cd08390
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 18:02:02 2024 +0100

    Update action.yml

commit 912f0e8
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 17:56:21 2024 +0100

    Updates to CI Build actions

commit c531dec
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 12:02:38 2024 +0100

    Update main.yml

commit 082f2f5
Author: Robert van den Breemen <[email protected]>
Date:   Sun Mar 17 11:57:19 2024 +0100

    Just to update the binaries and test the workflow in github

commit d99f272
Author: Robert van den Breemen <[email protected]>
Date:   Tue Sep 12 23:29:47 2023 +0200

    Another fix by Sergantd

commit 827df64
Author: Robert van den Breemen <[email protected]>
Date:   Tue Sep 12 21:08:30 2023 +0200

    Fixing a " by sergantd

commit ef30af6
Author: Robert van den Breemen <[email protected]>
Date:   Sun Jul 23 22:51:08 2023 +0200

    Update README.md

commit 1ecc240
Merge: 3874336 45dc372
Author: Robert van den Breemen <[email protected]>
Date:   Sun May 14 09:22:31 2023 +0200

    Merge branch 'dev' of https://github.com/rvdbreemen/OTGW-firmware into dev

commit 3874336
Author: Robert van den Breemen <[email protected]>
Date:   Wed May 10 20:37:34 2023 +0200

    Add more sensors for HA, so SAT will easily integrate

commit 45dc372
Merge: 4b94231 0c0c071
Author: Robert van den Breemen <[email protected]>
Date:   Wed May 10 20:35:40 2023 +0200

    Merge pull request #220 from brhahlen/dev

    Fix CI Pipeline

commit 0c0c071
Author: Ben Hählen <[email protected]>
Date:   Wed May 10 11:16:34 2023 +0200

    Fixing CI Pipeline

commit 8fab46b
Author: Ben Hählen <[email protected]>
Date:   Wed May 10 11:09:25 2023 +0200

    Update Makefile

commit efa49af
Author: Ben Hählen <[email protected]>
Date:   Wed May 10 11:07:39 2023 +0200

    Update Makefile

    Trying to fix build

commit 4b94231
Author: Robert van den Breemen <[email protected]>
Date:   Tue May 9 23:45:01 2023 +0200

    removing renovate.json from tree

commit 9000d6c
Author: Robert van den Breemen <[email protected]>
Date:   Tue May 9 23:30:36 2023 +0200

    cleanup transfer.dat in wrong place

commit 259eb21
Merge: 1214689 7b36109
Author: Robert van den Breemen <[email protected]>
Date:   Fri May 5 21:10:24 2023 +0200

    Merge pull request #218 from mcc05/dev

    removed unit_of_measure  from items that have none

commit 7b36109
Author: mcc05 <[email protected]>
Date:   Thu May 4 08:34:05 2023 +0100

    removed unit_of_measure  from items that have none

commit 1214689
Merge: bba1ca8 af09911
Author: Robert van den Breemen <[email protected]>
Date:   Sat Apr 15 10:29:30 2023 +0200

    Merge pull request #216 from hgokduman/dev

    Update index.js

commit af09911
Author: Halim <[email protected]>
Date:   Tue Apr 11 09:46:35 2023 +0200

    Update index.js

    Enable support for https when OTGW is behind a reverse proxy.

commit bba1ca8
Author: Robert van den Breemen <[email protected]>
Date:   Sat Mar 18 14:23:12 2023 +0100

    Revert "Turning off WTD during setup"

    This reverts commit 10b24b6.

commit 10b24b6
Author: Robert van den Breemen <[email protected]>
Date:   Thu Mar 16 22:49:59 2023 +0100

    Turning off WTD during setup

commit 9b6336a
Merge: 42216c5 301d6a1
Author: Robert van den Breemen <[email protected]>
Date:   Thu Mar 16 22:10:07 2023 +0100

    Merge branch 'main' into dev

commit 42216c5
Author: Robert van den Breemen <[email protected]>
Date:   Tue Mar 14 23:13:48 2023 +0100

    Update README.md

commit cc1c894
Author: Robert van den Breemen <[email protected]>
Date:   Tue Mar 14 23:13:11 2023 +0100

    Update readme for 0.10.2 maintaince release

commit c73b242
Merge: 67a443e 87e4f7e
Author: Robert van den Breemen <[email protected]>
Date:   Tue Mar 14 22:59:47 2023 +0100

    Merge branch 'main' into dev

commit 67a443e
Author: Robert van den Breemen <[email protected]>
Date:   Tue Mar 14 22:53:21 2023 +0100

    Update firmware hex files to 6.5 and 5.8

commit 2d64148
Author: Robert van den Breemen <[email protected]>
Date:   Tue Mar 14 22:26:17 2023 +0100

    fix the 0bytes on update Pic firmware, by downgrading the core to 2.7.4

commit fa737be
Author: Robert van den Breemen <[email protected]>
Date:   Sun Feb 26 21:07:11 2023 +0100

    Adding a little memory for use with larger settings... NTP longer FQDN fix

commit 141d6bf
Merge: d84c439 d4d33c7
Author: Robert van den Breemen <[email protected]>
Date:   Sat Feb 18 20:31:58 2023 +0100

    Merge branch 'dev' into dev-more-actions

commit d84c439
Author: Robert van den Breemen <[email protected]>
Date:   Sat Feb 18 20:26:02 2023 +0100

    Trying to build a relase system

commit d4d33c7
Author: Robert van den Breemen <[email protected]>
Date:   Mon Feb 13 21:43:43 2023 +0100

    Fix for hostname to wifi (credits to @hvxl)

commit 1d8f80b
Author: Robert van den Breemen <[email protected]>
Date:   Sun Feb 12 10:49:12 2023 +0100

    updating .gitignore

commit 997e937
Author: Robert van den Breemen <[email protected]>
Date:   Sat Feb 11 13:29:19 2023 +0100

    config .gitignore

commit 867432a
Author: Robert van den Breemen <[email protected]>
Date:   Sat Feb 11 13:21:10 2023 +0100

    Removing git submodules from src tree
  • Loading branch information
@rvdbreemen
rvdbreemen committed Apr 14, 2024
1 parent 301d6a1 commit b6bf90e
Show file tree
Hide file tree
Showing 15 changed files with 98 additions and 103 deletions.
28 changes: 18 additions & 10 deletions .github/actions/build/action.yml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
name: arduino-cli build
description: Build using arduino-cli and makefile


runs:
using: composite
steps:
- id: semver
run: cat version.h | sed -n '/^#define _SEMVER_FULL.*$/s/^#.*"\(.*\)"$/semver=\1/p' >> $GITHUB_OUTPUT
shell: bash
- id: create-build-dir
run: mkdir -p build
shell: bash
- id: build
run: make -j$(nproc)
run: |
make -j$(nproc)
find build -type f
for file in build/**/*.ino.bin; do mv "$file" "build/$(basename -s .ino.bin ${file})-${{steps.semver.outputs.semver}}.ino.bin"; done
for file in build/**/*.ino.elf; do mv "$file" "build/$(basename -s .ino.elf ${file})-${{steps.semver.outputs.semver}}.ino.elf"; done
shell: bash
- id: filesys
run: make filesystem
shell: bash
- id: semver
run: cat version.h | sed -n '/^#define _SEMVER_FULL.*$/s/^#.*"\(.*\)"$/semver=\1/p' >> $GITHUB_OUTPUT
run: |
make filesystem
for file in build/*.ino.littlefs.bin; do mv "$file" "build/$(basename -s .ino.littlefs.bin $file).${{steps.semver.outputs.semver}}.littlefs.bin"; done
shell: bash

- id: upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: OTGW-firmware-${{steps.semver.outputs.semver}}
path: |
build/**/*.bin
build/**/*.elf
build/*.bin
build/*.elf
build/*.bin
28 changes: 0 additions & 28 deletions .github/actions/build/transfer.dat
View file

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ runs:
using: composite
steps:
- id: python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'
- id: apt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
- uses: ./.github/actions/build
13 changes: 7 additions & 6 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup environment
uses: ./.github/actions/setup
- name: Build
run: echo ${{ github.sha }} > Release.txt
- name: Test
run: cat Release.txt
uses: ./.github/actions/build
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
Release.txt
build/*.elf
build/*.bin
LICENSE
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021-2022 Robert van den Breemen
Copyright (c) 2021-2024 Robert van den Breemen

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
48 changes: 25 additions & 23 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ CFLAGS = $(CFLAGS_DEFAULT)

CLI := arduino-cli
PLATFORM := esp8266:esp8266
CFGFILE := arduino-cli.yaml
# bug in http stream, fallback to 2.7.4
CFGFILE := $(PWD)/arduino/arduino-cli.yaml
# Add CLICFG command to add config file location to CLI command
CLICFG := $(CLI) --config-file $(CFGFILE)
# bug in http stream, fallback to 2.7.4
# ESP8266URL := https://github.com/esp8266/Arduino/releases/download/3.0.2/package_esp8266com_index.json
ESP8266URL := https://github.com/esp8266/Arduino/releases/download/2.7.4/package_esp8266com_index.json
LIBRARIES := libraries/WiFiManager libraries/ArduinoJson libraries/PubSubClient libraries/TelnetStream libraries/AceTime libraries/OneWire libraries/DallasTemperature
Expand All @@ -28,8 +30,8 @@ TOOLS = $(wildcard arduino/packages/esp8266/hardware/esp8266/*/tools)
ESPTOOL = python3 $(TOOLS)/esptool/esptool.py
BOARD = $(PLATFORM):d1_mini
FQBN = $(BOARD):eesz=4M2M,xtal=160
IMAGE = build/$(subst :,.,$(BOARD))/$(INO).bin
FILESYS = build/littlefs.bin
IMAGE = build/$(INO).bin
FILESYS = build/$(INO).littlefs.bin

export PYTHONPATH = $(TOOLS)/pyserial

Expand All @@ -48,56 +50,56 @@ distclean: clean

$(CFGFILE):
$(CLI) config init --dest-file $(CFGFILE)
$(CLI) config set board_manager.additional_urls $(ESP8266URL)
$(CLI) config set directories.data $(PWD)/arduino
$(CLI) config set directories.downloads $(PWD)/staging
$(CLI) config set directories.user $(PWD)
$(CLI) config set sketch.always_export_binaries true
$(CLI) config set library.enable_unsafe_install true
$(CLICFG) config set directories.data $(PWD)/arduino
$(CLICFG) config set board_manager.additional_urls $(ESP8266URL)
$(CLICFG) config set directories.downloads $(PWD)/staging
$(CLICFG) config set directories.user $(PWD)
$(CLICFG) config set sketch.always_export_binaries true
$(CLICFG) config set library.enable_unsafe_install true

##
# Make sure CFG is updated before libraries are called.
##
$(LIBRARIES): | $(CFGFILE)

$(BOARDS): | $(CFGFILE)
$(CLI) core update-index
$(CLI) core install $(PLATFORM)
$(CLICFG) core update-index
$(CLICFG) core install $(PLATFORM)

refresh: | $(CFGFILE)
$(CLI) lib update-index
$(CLICFG) lib update-index

flush: | $(CFGFILE)
$(CLI) cache clean
$(CLICFG) cache clean

libraries/WiFiManager: | $(BOARDS)
$(CLI) lib install [email protected]
$(CLICFG) lib install [email protected]

libraries/ArduinoJson:
$(CLI) lib install [email protected]
$(CLICFG) lib install [email protected]

libraries/PubSubClient:
$(CLI) lib install [email protected]
$(CLICFG) lib install [email protected]

libraries/TelnetStream:
$(CLI) lib install [email protected]
$(CLICFG) lib install [email protected]

libraries/AceTime:
$(CLI) lib install [email protected]
$(CLICFG) lib install [email protected]

# libraries/Time:
# $(CLI) lib install --git-url https://github.com/PaulStoffregen/Time
# # https://github.com/PaulStoffregen/Time/archive/refs/tags/v1.6.1.zip

libraries/OneWire:
$(CLI) lib install [email protected]
$(CLICFG) lib install [email protected]

libraries/DallasTemperature: | libraries/OneWire
$(CLI) lib install [email protected]
$(CLICFG) lib install [email protected]

$(IMAGE): $(BOARDS) $(LIBRARIES) $(SOURCES)
$(info Build code)
$(CLI) compile --config-file $(CFGFILE) --fqbn=$(FQBN) --warnings default --verbose --build-property compiler.cpp.extra_flags="$(CFLAGS)"
$(CLICFG) compile --fqbn=$(FQBN) --warnings default --verbose --build-property compiler.cpp.extra_flags="$(CFLAGS)"

filesystem: $(FILESYS)

Expand All @@ -117,7 +119,7 @@ $(PROJ).zip: $(PROJ)-fw.bin $(PROJ)-fs.bin
# Build the image with debugging output
debug: CFLAGS = $(CFLAGS_DEFAULT) -DDEBUG
debug: $(IMAGE)

# Load only the sketch into the device
upload: $(IMAGE)
$(ESPTOOL) --port $(PORT) -b $(BAUD) write_flash 0x0 $(IMAGE)
Expand Down
2 changes: 1 addition & 1 deletion OTGW-Core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ enum OpenThermMessageID {
{ 12, OT_READ , ot_u8u8, "FHBsize", "Size of Fault-History-Buffer supported by slave", "" },
{ 13, OT_READ , ot_u8u8, "FHBindexFHBvalue", "Index number / Value of referred-to fault-history buffer entry", "" },
{ 14, OT_WRITE , ot_f88, "MaxRelModLevelSetting", "Maximum relative modulation level setting", "%" },
{ 15, OT_READ , ot_u8u8, "MaxCapacityMinModLevell", "Maximum boiler capacity (kW) / Minimum boiler modulation level(%)", "kW/%" },
{ 15, OT_READ , ot_u8u8, "MaxCapacityMinModLevel", "Maximum boiler capacity (kW) / Minimum boiler modulation level(%)", "kW/%" },
{ 16, OT_WRITE , ot_f88, "TrSet", "Room Setpoint", "°C" },
{ 17, OT_READ , ot_f88, "RelModLevel", "Relative Modulation Level", "%" },
{ 18, OT_READ , ot_f88, "CHPressure", "CH water pressure", "bar" },
Expand Down
6 changes: 3 additions & 3 deletions OTGW-Core.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ void print_status(uint16_t& value)

if (is_value_valid(OTdata, OTlookupitem)){
// AddLogf("Status u16 [%04x] _value [%04x] hb [%02x] lb [%02x]", OTdata.u16(), _value, OTdata.valueHB, OTdata.valueLB);
value = (OTcurrentSystemState.MasterStatus<<8) & OTcurrentSystemState.SlaveStatus;
value = (OTcurrentSystemState.MasterStatus<<8) | OTcurrentSystemState.SlaveStatus;
}
}

Expand Down Expand Up @@ -706,7 +706,7 @@ void print_solar_storage_status(uint16_t& value)
}
if (is_value_valid(OTdata, OTlookupitem)){
//OTGWDebugTf(PSTR("Solar Storage Master / Slave Mode u16 [%04x] _value [%04x] hb [%02x] lb [%02x]"), OTdata.u16(), _value, OTdata.valueHB, OTdata.valueLB);
value = (OTcurrentSystemState.SolarMasterStatus<<8) & OTcurrentSystemState.SolarSlaveStatus;
value = (OTcurrentSystemState.SolarMasterStatus<<8) | OTcurrentSystemState.SolarSlaveStatus;
}
}

Expand Down Expand Up @@ -786,7 +786,7 @@ void print_statusVH(uint16_t& value)

if (is_value_valid(OTdata, OTlookupitem)){
//OTGWDebugTf(PSTR("Status u16 [%04x] _value [%04x] hb [%02x] lb [%02x]"), OTdata.u16(), _value, OTdata.valueHB, OTdata.valueLB);
value = (OTcurrentSystemState.MasterStatusVH<<8) & OTcurrentSystemState.SlaveStatusVH;
value = (OTcurrentSystemState.MasterStatusVH<<8) | OTcurrentSystemState.SlaveStatusVH;
}
}

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ OpenTherm Nodoshop OTGW hardware - an ESP8266 firmware

This project is an firmware for the Nodoshop OTGW hardware, based on ESP8266 devkits.

Starting with version 2.3 of the Nodoshop hardware the devkit has changed from NodeMCU to a Wemos D1mini. This is fully supported by the hardware and this firmware.
Starting with version 2.3 of the Nodoshop hardware the devkit has changed from NodeMCU to a Wemos D1mini. This is fully supported by the hardware and this firmware.

Supporting hardware version are:
| Version | Hardware supported |
Expand Down Expand Up @@ -56,7 +56,7 @@ To do:
- Instant update of webUI using websockets
- Showing log of OT messages using websockets

Looking for the documentation, go here (work in progress): <br> https://github.com/rvdbreemen/OTGW-firmware/wiki/Documentation-of-OTGW-firmware
Looking for the documentation, go here (work in progress): <br> [Wiki with Documentation](https://github.com/rvdbreemen/OTGW-firmware/wiki)

| Version | Release notes |
|-|-|
Expand Down
10 changes: 8 additions & 2 deletions data/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
*/
const localURL='http://'+window.location.host;
const APIGW='http://'+window.location.host+'/api/';
const localURL=window.location.protocol+'//'+window.location.host;
const APIGW=window.location.protocol+'//'+window.location.host+'/api/';

"use strict";

Expand Down Expand Up @@ -513,6 +513,12 @@
sInput.setAttribute("type", "text");
sInput.setAttribute("maxlength", data[i].maxlen);
sInput.setAttribute("size", (data[i].maxlen > 20 ? 20 : data[i].maxlen));
}
else if (data[i].type == "p")
{
sInput.setAttribute("type", "password");
sInput.setAttribute("maxlength", data[i].maxlen);
sInput.setAttribute("size", (data[i].maxlen > 20 ? 20 : data[i].maxlen));
}
else if (data[i].type == "f")
{
Expand Down
Loading

0 comments on commit b6bf90e

Please sign in to comment.