simulink stateflow compiling

.gitignore

@@ -1,6 +1,9 @@
 .pio
 .vscode
+.vscode/*
+.vscode/**
 compress
+data_gz
 platformio.ini
 include/wifi_credentials.h
 include/*.gz.h

.vscode/extensions.json

@@ -1,7 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ]
-}

.vscode/settings.json

@@ -1,52 +0,0 @@
-{
-    "files.associations": {
-        "random": "cpp",
-        "array": "cpp",
-        "*.tcc": "cpp",
-        "deque": "cpp",
-        "list": "cpp",
-        "string": "cpp",
-        "unordered_map": "cpp",
-        "vector": "cpp",
-        "string_view": "cpp",
-        "memory": "cpp",
-        "ranges": "cpp",
-        "initializer_list": "cpp",
-        "utility": "cpp",
-        "atomic": "cpp",
-        "bit": "cpp",
-        "cctype": "cpp",
-        "clocale": "cpp",
-        "cmath": "cpp",
-        "compare": "cpp",
-        "concepts": "cpp",
-        "cstdarg": "cpp",
-        "cstddef": "cpp",
-        "cstdint": "cpp",
-        "cstdio": "cpp",
-        "cstdlib": "cpp",
-        "cstring": "cpp",
-        "cwchar": "cpp",
-        "cwctype": "cpp",
-        "map": "cpp",
-        "set": "cpp",
-        "exception": "cpp",
-        "algorithm": "cpp",
-        "functional": "cpp",
-        "iterator": "cpp",
-        "memory_resource": "cpp",
-        "numeric": "cpp",
-        "optional": "cpp",
-        "system_error": "cpp",
-        "tuple": "cpp",
-        "type_traits": "cpp",
-        "iosfwd": "cpp",
-        "limits": "cpp",
-        "new": "cpp",
-        "ostream": "cpp",
-        "stdexcept": "cpp",
-        "streambuf": "cpp",
-        "cinttypes": "cpp",
-        "typeinfo": "cpp"
-    }
-}

create_gz_c_arr.py

@@ -0,0 +1,38 @@
+#!/usr/bin/python3
+
+import os, gzip
+# https://www.mischianti.org/2020/10/26/web-server-with-esp8266-and-esp32-byte-array-gzipped-pages-and-spiffs-2/
+
+def convert_to_gzip(src, out, f):
+    input_file = f'{src}{f}'
+    output_file = f'{out}{f}.gz.h'
+    output_charp = f'{f.replace(".", "_")}_gz'
+
+    top = ''
+    with open(input_file, 'rb') as f_in:
+        gz = gzip.compress(f_in.read())
+        gzlen = len(gz)
+
+        top += f'// filename: {f}.gz.h\n'
+        top += f'#define {output_charp}_len {gzlen}\n'
+        top += f'const char {output_charp}[] = '
+        top += '{'
+
+        with open(output_file, 'wb') as f_out:
+            for i, b in enumerate(gz):
+                if not i%10:
+                    top += '\n '
+                top += f'0x{b:02X}, '
+            top = top[:-2]
+            top += '};'
+            f_out.write(top.encode(encoding='utf-8'))
+
+
+src='data/'
+out='compress/'
+
+if not 'compress' in os.listdir():
+    os.mkdir('compress')
+
+for f in os.listdir(src):
+    convert_to_gzip(src, out, f)

create_gz_files.py

@@ -1,38 +1,15 @@
 #!/usr/bin/python3
 
 import os, gzip
-# https://www.mischianti.org/2020/10/26/web-server-with-esp8266-and-esp32-byte-array-gzipped-pages-and-spiffs-2/
+# https://stackoverflow.com/questions/8156707/gzip-a-file-in-python
 
-def convert_to_gzip(src, out, f):
-    input_file = f'{src}{f}'
-    output_file = f'{out}{f}.gz.h'
-    output_charp = f'{f.replace(".", "_")}_gz'
+src_dir='data'
+out_dir='data_gz'
 
-    top = ''
-    with open(input_file, 'rb') as f_in:
-        gz = gzip.compress(f_in.read())
-        gzlen = len(gz)
+if not 'data_gz' in os.listdir():
+    os.mkdir('data_gz')
 
-        top += f'// filename: {f}.gz.h\n'
-        top += f'#define {output_charp}_len {gzlen}\n'
-        top += f'const char {output_charp}[] = '
-        top += '{'
-
-        with open(output_file, 'wb') as f_out:
-            for i, b in enumerate(gz):
-                if not i%10:
-                    top += '\n '
-                top += f'0x{b:02X}, '
-            top = top[:-2]
-            top += '};'
-            f_out.write(top.encode(encoding='utf-8'))
-
-
-src='data/'
-out='compress/'
-
-if not 'compress' in os.listdir():
-    os.mkdir('compress')
-
-for f in os.listdir(src):
-    convert_to_gzip(src, out, f)
+for f in os.listdir(src_dir):
+    with open(f'{src_dir}/{f}', 'rb') as f_in:
+        with gzip.open(f'{out_dir}/{f}.gz', 'wb') as f_out:
+            f_out.writelines(f_in)

data/index.html

@@ -60,6 +60,13 @@
         </div>
   </div>
 
+  <div class="terminal">
+    <input type="button" id="clear_term" value="clear" onclick="clearTerminal();">
+    <input type="checkbox" id="scroll" name="scroll" value="scroll" checked>
+    <label for="scroll"> autoscroll </label>
+    <textarea id="term">waiting for log messages ...&#10;</textarea>
+  </div>
+
 </body>
 
 <script src="/input.js"></script>

data/input.js

@@ -1,8 +1,40 @@
-var slider = document.getElementById("range1");
-var output = document.getElementById("l_pwm");
-output.innerHTML = slider.value; // Display the default slider value
+// var slider = document.getElementById("helligkeit");
+// var output = document.getElementById("l_pwm");
+// output.innerHTML = slider.value; // Display the default slider value
 
-// Update the current slider value (each time you drag the slider handle)
-slider.oninput = function() {
-  output.innerHTML = this.value;
+// // Update the current slider value (each time you drag the slider handle)
+// slider.oninput = function() {
+//   output.innerHTML = this.value;
+// }
+
+
+
+let xhr = new XMLHttpRequest();
+              
+xhr.onreadystatechange = function(){
+  if(xhr.readyState == 4) {
+    if (xhr.status == 200){
+      console.log(xhr.responseText);
+      terminal = document.getElementById("term");
+      autoscroll = document.getElementById("scroll");
+      terminal.innerHTML += xhr.responseText;
+      if(autoscroll.checked)
+        terminal.scrollTop = terminal.scrollHeight;
+    }
+    else {
+      console.log("status:", xhr.status);
+    }
+  }
+}
+
+function reloadTerminal() {
+  xhr.open("POST", "/app=terminal", true);
+  xhr.send();
+  setTimeout(reloadTerminal, 1000);
+};
+
+reloadTerminal();
+
+function clearTerminal() {
+  document.getElementById("term").innerHTML = '';
 }

data/style.css

@@ -3,7 +3,7 @@ html {
   font-family: sans-serif, Arial, Helvetica;
   background-color: #d4d4d4;
   height: 100%;
-  background-image: url('Background.png');
+  /* background-image: url('Background.png'); */
   background-repeat: repeat;
   background-size: 150% 150%;
 }
@@ -67,8 +67,6 @@ input[type=range]::-webkit-slider-thumb{
 }
 
 
-
-
 /*-------------------------------------------------------*/
 
 
@@ -103,4 +101,22 @@ input:checked + .slider:before {
   -ms-transform: translateX(26px);
   transform: translateX(26px);
 }
+*/
 
+.terminal {
+  margin:5%;
+  padding: 1%;
+  width: 80%;
+  border: 1px solid black;
+  border-radius: 5px;
+}
+
+#term {
+  font-size: large;
+  width: 100%;
+  height: 20em;
+}
+
+#clear_term {
+  margin: 2px;
+}

doku.md

@@ -68,7 +68,19 @@ TODO:
 - maybe compress files ?
 
 
-LED Flickering issue
+### LED Flickering issue
 https://github.com/NachtRaveVL/PCA9685-Arduino/issues/15
+PlatformIO Library veraltet !!
 
-PlatformIO Library veraltet
+
+### TIMER in OTA unterbrechen !!!!!
+
+
+
+### further improvments
+with streamFile gzip encoded Files can be sent
+this reduces space on fs !
+new easier script needed to just convert to .gz
+maybe measure timings on ESP
+
+__=> use serveStatic because way simpler !__

include/httpserver.h

@@ -1,48 +0,0 @@
-#ifndef __HTTPSERVER_H
-#define __HTTPSERVER_H
-
-#include "filesys.h"
-#include <ESP8266WebServer.h>
-
-
-class HTTPServer : public ESP8266WebServer {
-private:
-    const char* rootDir;
- 
-    bool addRootFileHandler();
-    bool formatFS() {
-        return format_fs();
-    }
-    void listRoot() {
-        ls(rootDir);
-    }
-
-public:
-    HTTPServer(const int _port, const char* _rootDir) :
-       ESP8266WebServer(_port), rootDir(_rootDir)
-    { }
-    ~HTTPServer() 
-    {
-        Serial.printf("[HTTPServer] shut down ...\n\r");
-    }
-
-    bool start() {
-        if(!mount_fs())
-            return false;
-        Serial.printf("[HTTPServer] LittleFS mounted !\n\r");
-
-        Serial.printf("[HTTPServer] root:\n\r");
-        this->listRoot();
-        Serial.printf("\n\r");
-
-        if( this->addRootFileHandler() ){
-            this->begin();
-            Serial.printf("[HTTPServer] Server active on Port 80 !\n\r");
-            return true;
-        }
-        Serial.printf("[HTTPServer] Not starting Server, something went wrong !\n\r");
-        return false;
-    }
-};
-
-#endif // __HTTPSERVER_H

include/ota.h

@@ -1,5 +1,4 @@
-#ifndef __OTA_H
-#define __OTA_H
+#pragma once
 
 #include <ESP8266WiFi.h>
 #include <WiFiUdp.h>
@@ -47,6 +46,3 @@ void ota_setup() {
   ArduinoOTA.begin();
 
 }
-
-
-#endif // __OTA_H

include/pwm.h

@@ -1,44 +0,0 @@
-#pragma once
-
-#include "PCA9685.h"
-
-#define SENSOR1 15
-#define SENSOR2 12
-
-#define INT_TIME 20         // interrupt intervall [ms]
-class Treppe {
-    private:
-    uint8_t stairs;
-    uint16_t time_per_stair = 200;          // dimmtime per stair [ms]
-    uint16_t idle_brightness = 0;
-    uint16_t active_brightness = 1048;
-
-    uint8_t direction = 0;
-    uint8_t switch_direction = 0;
-    uint8_t state = 0;
-    uint8_t switch_state = 0;
-    uint8_t finish = 1;
-
-    // initialize with i2c-Address 0, use Wire Library
-    PCA9685 pwmController;     
-    uint8_t softstart_led(uint8_t led, uint16_t startval, uint16_t stopval);
-    void ledsequence();
-
-    public:
-    Treppe(uint8_t _stairs) : stairs(_stairs){}
-    void task();        // call periodically
-
-    void setup();
-
-    // Parameter section
-    uint16_t setIdle(uint16_t _idle_brightness);
-    uint16_t setActive(uint16_t _active_brightness);
-    uint16_t setTime(uint16_t _time_per_stair);
-
-    // Runtime Parameter section
-    uint8_t setDirection(uint8_t _direction);
-    uint8_t setState(uint8_t _state);
-
-    uint8_t getState() { return state;};
-    uint8_t getDirection() {return direction;};
-};

lib/README

@@ -1,46 +0,0 @@
-
-This directory is intended for project specific (private) libraries.
-PlatformIO will compile them to static libraries and link into executable file.
-
-The source code of each library should be placed in a an own separate directory
-("lib/your_library_name/[here are source files]").
-
-For example, see a structure of the following two libraries `Foo` and `Bar`:
-
-|--lib
-|  |
-|  |--Bar
-|  |  |--docs
-|  |  |--examples
-|  |  |--src
-|  |     |- Bar.c
-|  |     |- Bar.h
-|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
-|  |
-|  |--Foo
-|  |  |- Foo.c
-|  |  |- Foo.h
-|  |
-|  |- README --> THIS FILE
-|
-|- platformio.ini
-|--src
-   |- main.c
-
-and a contents of `src/main.c`:
-```
-#include <Foo.h>
-#include <Bar.h>
-
-int main (void)
-{
-  ...
-}
-
-```
-
-PlatformIO Library Dependency Finder will find automatically dependent
-libraries scanning project source files.
-
-More information about PlatformIO Library Dependency Finder
-- https://docs.platformio.org/page/librarymanager/ldf.html

lib/httpserver/filesys.cpp

@@ -1,12 +1,5 @@
 #include "filesys.h"
 
-// listDir("/");
-// deleteFile("/hello.txt");
-// writeFile("/hello.txt", "Hello ");
-// appendFile("/hello.txt", "World!\n\r");
-// readFile("/hello.txt");
-// listDir("/");
-
 FSInfo fsinfo;
 
 bool mount_fs() {
@@ -58,7 +51,12 @@ void ls(const char * dirname) {
   Serial.println();
 }
 
-void readFile(const char * path) {
+File open(const char * path) {
+  return LittleFS.open(path, "r");
+}
+
+
+void printFile(const char * path) {
   Serial.printf("Reading file: %s\n\r", path);
 
   File file = LittleFS.open(path, "r");

lib/httpserver/filesys.h

@@ -1,16 +1,17 @@
-#ifndef __FILESYS_H
-#define __FILESYS_H
+#pragma once
 
 #include <LittleFS.h>
 
+// some usefull wrappers for Filesystem
+
 bool mount_fs();
 bool format_fs();
 
+File open(const char * path);
+
 void ls(const char * dirname);
-void readFile(const char * path);
+void printFile(const char * path);
 void writeFile(const char * path, const char * message);
 void appendFile(const char * path, const char * message);
 void renameFile(const char * path1, const char * path2);
 void deleteFile(const char * path);
-
-#endif // __FILESYS_H

lib/httpserver/httpserver.cpp

@@ -0,0 +1,68 @@
+#include "httpserver.h"
+
+
+bool HTTPServer::start() {
+    if(!mount_fs()) {
+        logf("cant mount filesystem, EXIT !\n\r");
+        return false;
+    }
+    logf("LittleFS mounted !\n\r");
+    logf("root:\n\r");
+    this->listRoot();
+    logf("\n\r");
+
+    // default handler
+    this->onNotFound([this]() {
+        String message = "File Not Found\n\n";
+        message += "URI: ";
+        message += uri();
+        message += "\nMethod: ";
+        message += (method() == HTTP_GET) ? "GET" : "POST";
+        message += "\nArguments: ";
+        message += args();
+        message += "\n";
+
+        for (uint8_t i = 0; i < args(); i++) {
+            message += " " + argName(i) + ": " + arg(i) + "\n";
+        }
+        send(404, "text/plain", message);
+    });
+
+    // add static root file handler for http
+    this->serveStatic("/", LittleFS, "/");
+    this->begin();
+    Serial.printf("Server active on Port 80 !\n\r");
+    return true;
+}
+
+void HTTPServer::logf(const char *format, ...) {
+    va_list args;
+    va_start(args, format);
+    char temp[64];
+    size_t len = vsnprintf(temp, sizeof(temp), format, args);
+    Serial.print(log_prefix);
+    Serial.write(temp, len);
+    va_end(args);
+}
+
+void HTTPServer::logt(const char *format, ...) {
+    va_list args;
+    va_start(args, format);
+    // append logging string to local buffer
+    if(tbuf_head < TBUF_LEN) {
+        size_t len = vsnprintf(tbuf+tbuf_head, TBUF_LEN-tbuf_head, format, args);
+        tbuf_head += len;
+    }
+    va_end(args);
+}
+
+void HTTPServer::start_apps() {
+    // application handler
+    this->on("/app=terminal", HTTP_POST, [this]() {
+        if(tbuf_head) {
+            send(200, "text/plain", tbuf);
+            tbuf_head = 0;
+        }
+    });
+
+}

lib/httpserver/httpserver.h

@@ -0,0 +1,42 @@
+// Wrapper for ESP8266WebServer with Filesystem as HTTP source
+
+#pragma once
+
+#include <ESP8266WebServer.h>
+#include <stdarg.h>
+#include "filesys.h"
+
+// debug log <ESP8266WebServer.h>
+// #define DEBUGV(f,...) do { Serial.printf(PSTR(f), ##__VA_ARGS__); } while (0)
+
+#define TBUF_LEN 256
+
+
+class HTTPServer : public ESP8266WebServer {
+
+private:
+    const char* rootDir = "/";
+    const char* log_prefix = "[HTTPServer] ";
+
+    size_t tbuf_head = 0;
+    char tbuf[TBUF_LEN];
+ 
+    void listRoot() {
+        ls(rootDir);
+    }
+
+public:
+    HTTPServer(const int _port, const char* _rootDir) :
+       ESP8266WebServer(_port), rootDir(_rootDir)
+    { }
+    ~HTTPServer()
+    {
+        Serial.printf("[HTTPServer] shut down ...\n\r");
+    }
+    
+    bool start();
+    void start_apps();
+    
+    void logf(const char *format, ...);
+    void logt(const char *format, ...);
+};

lib/treppe/FSMTreppe/FSMTreppe.cpp

@@ -0,0 +1,170 @@
+//
+// Academic License - for use in teaching, academic research, and meeting
+// course requirements at degree granting institutions only.  Not for
+// government, commercial, or other organizational use.
+//
+// File: FSMTreppe.cpp
+//
+// Code generated for Simulink model 'FSMTreppe'.
+//
+// Model version                  : 1.22
+// Simulink Coder version         : 9.5 (R2021a) 14-Nov-2020
+// C/C++ source code generated on : Fri Jul  2 17:45:36 2021
+//
+// Target selection: ert.tlc
+// Embedded hardware selection: ARM Compatible->ARM Cortex-M
+// Code generation objectives: Unspecified
+// Validation result: Not run
+//
+#include "FSMTreppe.h"
+
+// Named constants for Chart: '<Root>/FSMTreppe'
+const uint8_t FSMTreppe_IN_animation_down = 1U;
+const uint8_t FSMTreppe_IN_animation_up = 2U;
+const uint8_t FSMTreppe_IN_idle = 3U;
+
+// Model step function
+void FSMTreppeModelClass::step()
+{
+  // Chart: '<Root>/FSMTreppe' incorporates:
+  //   Inport: '<Root>/anim_finished'
+  //   Inport: '<Root>/sensor_oben'
+  //   Inport: '<Root>/sensor_unten'
+
+  if (FSMTreppe_DW.temporalCounter_i1 < 511U) {
+    FSMTreppe_DW.temporalCounter_i1 = static_cast<uint16_t>
+      (FSMTreppe_DW.temporalCounter_i1 + 1U);
+  }
+
+  if (FSMTreppe_DW.is_active_c3_FSMTreppe == 0U) {
+    FSMTreppe_DW.is_active_c3_FSMTreppe = 1U;
+    FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_idle;
+
+    // Outport: '<Root>/anim_active'
+    FSMTreppe_Y.anim_active = 0U;
+    FSMTreppe_DW.got_sensor = 0U;
+    FSMTreppe_DW.got_anim_finished = 0U;
+    FSMTreppe_DW.finished_up = 0U;
+    FSMTreppe_DW.finished_dn = 0U;
+  } else {
+    switch (FSMTreppe_DW.is_c3_FSMTreppe) {
+     case FSMTreppe_IN_animation_down:
+      // Outport: '<Root>/anim_active'
+      FSMTreppe_Y.anim_active = 2U;
+      if ((FSMTreppe_DW.finished_dn == 1) || (FSMTreppe_DW.temporalCounter_i1 >=
+           300U)) {
+        FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_idle;
+
+        // Outport: '<Root>/anim_active'
+        FSMTreppe_Y.anim_active = 0U;
+        FSMTreppe_DW.got_sensor = 0U;
+        FSMTreppe_DW.got_anim_finished = 0U;
+        FSMTreppe_DW.finished_up = 0U;
+        FSMTreppe_DW.finished_dn = 0U;
+      } else {
+        if (FSMTreppe_U.sensor_unten) {
+          FSMTreppe_DW.got_sensor = 1U;
+        }
+
+        if (FSMTreppe_U.anim_finished) {
+          FSMTreppe_DW.got_anim_finished = 1U;
+        }
+
+        if ((FSMTreppe_DW.got_anim_finished == 1) && (FSMTreppe_DW.got_sensor ==
+             1)) {
+          FSMTreppe_DW.finished_dn = 1U;
+        }
+      }
+      break;
+
+     case FSMTreppe_IN_animation_up:
+      // Outport: '<Root>/anim_active'
+      FSMTreppe_Y.anim_active = 1U;
+      if ((FSMTreppe_DW.finished_up == 1) || (FSMTreppe_DW.temporalCounter_i1 >=
+           300U)) {
+        FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_idle;
+
+        // Outport: '<Root>/anim_active'
+        FSMTreppe_Y.anim_active = 0U;
+        FSMTreppe_DW.got_sensor = 0U;
+        FSMTreppe_DW.got_anim_finished = 0U;
+        FSMTreppe_DW.finished_up = 0U;
+        FSMTreppe_DW.finished_dn = 0U;
+      } else {
+        if (FSMTreppe_U.sensor_oben) {
+          FSMTreppe_DW.got_sensor = 1U;
+        }
+
+        if (FSMTreppe_U.anim_finished) {
+          FSMTreppe_DW.got_anim_finished = 1U;
+        }
+
+        if ((FSMTreppe_DW.got_anim_finished == 1) && (FSMTreppe_DW.got_sensor ==
+             1)) {
+          FSMTreppe_DW.finished_up = 1U;
+        }
+      }
+      break;
+
+     default:
+      // Outport: '<Root>/anim_active'
+      // case IN_idle:
+      FSMTreppe_Y.anim_active = 0U;
+      if (FSMTreppe_U.sensor_oben) {
+        FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_animation_down;
+        FSMTreppe_DW.temporalCounter_i1 = 0U;
+
+        // Outport: '<Root>/anim_active'
+        FSMTreppe_Y.anim_active = 2U;
+        FSMTreppe_DW.got_sensor = 0U;
+        FSMTreppe_DW.got_anim_finished = 0U;
+        FSMTreppe_DW.finished_dn = 0U;
+      } else if (FSMTreppe_U.sensor_unten) {
+        FSMTreppe_DW.is_c3_FSMTreppe = FSMTreppe_IN_animation_up;
+        FSMTreppe_DW.temporalCounter_i1 = 0U;
+
+        // Outport: '<Root>/anim_active'
+        FSMTreppe_Y.anim_active = 1U;
+        FSMTreppe_DW.got_sensor = 0U;
+        FSMTreppe_DW.got_anim_finished = 0U;
+        FSMTreppe_DW.finished_up = 0U;
+      }
+      break;
+    }
+  }
+
+  // End of Chart: '<Root>/FSMTreppe'
+}
+
+// Model initialize function
+void FSMTreppeModelClass::initialize()
+{
+  // (no initialization code required)
+}
+
+// Model terminate function
+void FSMTreppeModelClass::terminate()
+{
+  // (no terminate code required)
+}
+
+// Constructor
+FSMTreppeModelClass::FSMTreppeModelClass() :
+  FSMTreppe_DW(),
+  FSMTreppe_U(),
+  FSMTreppe_Y()
+{
+  // Currently there is no constructor body generated.
+}
+
+// Destructor
+FSMTreppeModelClass::~FSMTreppeModelClass()
+{
+  // Currently there is no destructor body generated.
+}
+
+//
+// File trailer for generated code.
+//
+// [EOF]
+//

lib/treppe/FSMTreppe/FSMTreppe.h

@@ -0,0 +1,120 @@
+//
+// Academic License - for use in teaching, academic research, and meeting
+// course requirements at degree granting institutions only.  Not for
+// government, commercial, or other organizational use.
+//
+// File: FSMTreppe.h
+//
+// Code generated for Simulink model 'FSMTreppe'.
+//
+// Model version                  : 1.22
+// Simulink Coder version         : 9.5 (R2021a) 14-Nov-2020
+// C/C++ source code generated on : Fri Jul  2 17:45:36 2021
+//
+// Target selection: ert.tlc
+// Embedded hardware selection: ARM Compatible->ARM Cortex-M
+// Code generation objectives: Unspecified
+// Validation result: Not run
+//
+#ifndef RTW_HEADER_FSMTreppe_h_
+#define RTW_HEADER_FSMTreppe_h_
+
+#include <stdint.h>
+
+// Class declaration for model FSMTreppe
+class FSMTreppeModelClass {
+  // public data and function members
+ public:
+  // Block states (default storage) for system '<Root>'
+  struct DW_FSMTreppe_T {
+    uint16_t temporalCounter_i1;       // '<Root>/FSMTreppe'
+    uint8_t is_active_c3_FSMTreppe;    // '<Root>/FSMTreppe'
+    uint8_t is_c3_FSMTreppe;           // '<Root>/FSMTreppe'
+    uint8_t got_anim_finished;         // '<Root>/FSMTreppe'
+    uint8_t finished_up;               // '<Root>/FSMTreppe'
+    uint8_t finished_dn;               // '<Root>/FSMTreppe'
+    uint8_t got_sensor;                // '<Root>/FSMTreppe'
+  };
+
+  // External inputs (root inport signals with default storage)
+  struct ExtU_FSMTreppe_T {
+    bool sensor_unten;            // '<Root>/sensor_unten'
+    bool sensor_oben;             // '<Root>/sensor_oben'
+    bool anim_finished;           // '<Root>/anim_finished'
+  };
+
+  // External outputs (root outports fed by signals with default storage)
+  struct ExtY_FSMTreppe_T {
+    uint8_t anim_active;               // '<Root>/anim_active'
+  };
+
+  // model initialize function
+  void initialize();
+
+  // model step function
+  void step();
+
+  // model terminate function
+  void terminate();
+
+  // Constructor
+  FSMTreppeModelClass();
+
+  // Destructor
+  ~FSMTreppeModelClass();
+
+  // Root-level structure-based inputs set method
+
+  // Root inports set method
+  void setExternalInputs(const ExtU_FSMTreppe_T* pExtU_FSMTreppe_T)
+  {
+    FSMTreppe_U = *pExtU_FSMTreppe_T;
+  }
+
+  // Root-level structure-based outputs get method
+
+  // Root outports get method
+  const FSMTreppeModelClass::ExtY_FSMTreppe_T & getExternalOutputs() const
+  {
+    return FSMTreppe_Y;
+  }
+
+  // private data and function members
+ private:
+  // Block states
+  DW_FSMTreppe_T FSMTreppe_DW;
+
+  // External inputs
+  ExtU_FSMTreppe_T FSMTreppe_U;
+
+  // External outputs
+  ExtY_FSMTreppe_T FSMTreppe_Y;
+};
+
+//-
+//  The generated code includes comments that allow you to trace directly
+//  back to the appropriate location in the model.  The basic format
+//  is <system>/block_name, where system is the system number (uniquely
+//  assigned by Simulink) and block_name is the name of the block.
+//
+//  Note that this particular code originates from a subsystem build,
+//  and has its own system numbers different from the parent model.
+//  Refer to the system hierarchy for this subsystem below, and use the
+//  MATLAB hilite_system command to trace the generated code back
+//  to the parent model.  For example,
+//
+//  hilite_system('FSM_Treppenlicht/FSMTreppe')    - opens subsystem FSM_Treppenlicht/FSMTreppe
+//  hilite_system('FSM_Treppenlicht/FSMTreppe/Kp') - opens and selects block Kp
+//
+//  Here is the system hierarchy for this model
+//
+//  '<Root>' : 'FSM_Treppenlicht'
+//  '<S1>'   : 'FSM_Treppenlicht/FSMTreppe'
+
+#endif                                 // RTW_HEADER_FSMTreppe_h_
+
+//
+// File trailer for generated code.
+//
+// [EOF]
+//

lib/treppe/treppe.cpp

@@ -1,4 +1,4 @@
-#include "pwm.h"
+#include "treppe.h"
 
 uint8_t Treppe::softstart_led(uint8_t led, uint16_t startval, uint16_t stopval){
     /*
@@ -30,7 +30,7 @@ uint8_t Treppe::softstart_led(uint8_t led, uint16_t startval, uint16_t stopval){
     else {
       current_pwm += stepsize;
     }
-    Serial.println((uint16_t)current_pwm);
+    // Serial.println((uint16_t)current_pwm);
     pwmController.setChannelPWM(led, (uint16_t)current_pwm);
     if(current_pwm > stopval - stepsize && current_pwm < stopval + stepsize){
       if(stopval == 0) pwmController.setChannelPWM(led, 0);
@@ -60,55 +60,102 @@ void Treppe::ledsequence(){
       lastbrightness = active_brightness;
     }          
     status = status_build;                    // set parameter memory
-    Serial.print("----Status Changed! onoff: ");
-    Serial.print(state);
-    Serial.print(" dir: ");
-    Serial.println(direction);
 
+    Serial.printf("----Status Changed! onoff: %d, dir: %d\n", state, direction);
   }
   if(!finish){                                // finish == 0 -> action pending
-      if(!softstart_led(led,lastbrightness, brightness)){
-        Serial.print("one LED finished: ");
-        Serial.print(led);
-        Serial.print(" last: ");
-        Serial.print(lastbrightness);
-        Serial.print(" curr: ");
-        Serial.println(brightness);
-        if(direction){
-          led++;
-          if(led >= stairs) {
-            finish = 1;
-            //lastbrightness = brightness;
-            }
-        } 
-        else{
-           led--;
-           if(led < 0){
-             //lastbrightness = brightness;
-             finish = 1;
-            }
-        }
+    if(!softstart_led(led,lastbrightness, brightness)){
+      Serial.printf("one LED finished:  led: %d, last: %d, curr %d\n", 
+            led, lastbrightness, brightness);
+
+      if(direction){
+        led++;
+        if(led >= stairs)
+          finish = 1;
       } 
+      else{
+          led--;
+          if(led < 0)
+            finish = 1;
+      }
+    }
+  }
+}
+
+void Treppe::rampe()
+{
+  if(state) {
+    finish = 0;
+    state = 0;// set parameter memory
+  }
+
+  if(!finish) {
+    if(direction) { // aufwärts
+      if(tick >= ticks_treppe-1) { // ziel erreicht
+        Serial.println("[Treppe] oberster tick !");
+        finish = 1;
+        return;
+      }
+      tick++;  // eins hoch
+    }
+    else {  // abwärts
+      if(tick <= 0) { // ziel erreicht
+        Serial.println("[Treppe] unterster tick !");
+        finish = 1;
+        return;
+      }
+      tick--;  // eins runter
+    }
+
+    stufe = tick / ticks_pro_stufe;
+
+    float new_pwm = 0.0;
+    if(an_aus) {
+      new_pwm = differenz_pwm_pro_tick * (tick - ticks_pro_stufe*stufe);
+      new_pwm += idle_brightness;
+      if(direction) new_pwm += differenz_pwm_pro_tick;
+    }
+    else {
+      new_pwm = active_brightness - differenz_pwm_pro_tick * (tick - ticks_pro_stufe*stufe);
+      new_pwm += idle_brightness;
+      if(direction) new_pwm -= differenz_pwm_pro_tick;
+    }
+
+    pwmController.setChannelPWM(stufe, (uint16_t) new_pwm);
+    Serial.printf("tick %04u, led %02d:%02u, pwm %4.1f\n", 
+      tick,
+      stufe,
+      (tick - ticks_pro_stufe*stufe), 
+      new_pwm
+    );
   }
 }
 
 void Treppe::setup(){
+    Serial.printf("differenz_pwm_pro_tick %f\n", differenz_pwm_pro_tick);
+   
     pwmController.resetDevices();
     
     // Deactive PCA9685 Phase Balancer due to LED Flickering
     // https://github.com/NachtRaveVL/PCA9685-Arduino/issues/15
     // see also lib/PCA9685-Arduin/PCA9685.h:204
     pwmController.init(PCA9685_PhaseBalancer_None);
-    pwmController.setPWMFrequency(200);
+    //pwmController.init(PCA9685_PhaseBalancer_Linear);
+    pwmController.setPWMFrequency(100);
     pwmController.setAllChannelsPWM(idle_brightness);
     
+    pinMode(A0, INPUT);
     pinMode(SENSOR1, INPUT);
     pinMode(SENSOR2, INPUT);
+    pinMode(OE, OUTPUT);
+    digitalWrite(OE, 0);
     Serial.println("Hello from Treppe");
     Serial.print("Treppe: initial parameters: stairs=");
     Serial.println(stairs);
 }
+
 void Treppe::task(){
+  FSMTreppe_Obj.step();
 
   if(finish){
     direction = switch_direction;
@@ -120,32 +167,42 @@ void Treppe::task(){
   current_sensor_state[1] = digitalRead(SENSOR2);
   
   if(current_sensor_state[0] && !last_sensor_state[0] && state == 0){
+    setTick(0);
+    setAnAus(1);
     setDirection(1);
     setState(1);
   }
 
   if(current_sensor_state[1] && !last_sensor_state[1] && state == 0){
+    setTick(0);
+    setAnAus(0);
     setDirection(0);
     setState(1);
   }
 
   // first switch - off approach, use timer later
   if(!current_sensor_state[0] && last_sensor_state[0] && state == 1){
+    setTick(ticks_treppe);
+    setAnAus(1);
     setDirection(1);
     setState(0);
   }
 
   if(!current_sensor_state[1] && last_sensor_state[1] && state == 1){
+    setTick(ticks_treppe);
+    setAnAus(1);
     setDirection(0);
     setState(0);
   }
 
   last_sensor_state[0] = current_sensor_state[0];
   last_sensor_state[1] = current_sensor_state[1];
-  ledsequence();
   
+  ledsequence();
+  //Serial.printf("LDR: %f\n", ((float)analogRead(A0))/1023.*3.68);
 }
 
+
 uint16_t Treppe::setIdle(uint16_t _idle_brightness){
     idle_brightness = _idle_brightness;
     Serial.println("Treppe: idle brightness changed!");
@@ -162,22 +219,20 @@ uint16_t Treppe::setTime(uint16_t _time_per_stair){
     return time_per_stair;
 }
 
-uint8_t Treppe::setDirection(uint8_t _direction){
+void Treppe::setDirection(uint8_t _direction){
     switch_direction = _direction;
-    Serial.println("Treppe: Direction changed!");
+    Serial.printf("Treppe: switch_direction=%d!\n", switch_direction);
     if(finish) Serial.println("apply direction request immediately");
     else  Serial.println("currently active, dir change afterwards");
     // to do: implement state command variable to determine dimm-state
-    return switch_direction;
 }
 
-uint8_t Treppe::setState(uint8_t _state){
-    if(state == _state) return 1;
-    else{
-        switch_state = _state;
-        Serial.println("Treppe: State Request changed!");
-        if(finish) Serial.println("apply state request immediately");
-        else Serial.println("currently active, state changes after activity");
-    }  
-    return 0;
+void Treppe::setState(uint8_t _state){
+  if(state == _state) return;
+  else {
+    switch_state = _state;
+    Serial.printf("Treppe: switch_state=%d!\n", switch_state);
+    if(finish) Serial.println("apply state request immediately");
+    else Serial.println("currently active, state changes after activity");
+  }
 }

lib/treppe/treppe.h

@@ -0,0 +1,83 @@
+#pragma once
+
+#include "FSMTreppe/FSMTreppe.h"
+#include "PCA9685.h"
+
+#define SENSOR1 2
+#define SENSOR2 12
+#define OE 14
+
+#define INT_TIME 20  // interrupt intervall [ms]
+
+class Treppe {
+private:
+    // initialize with i2c-Address 0, use Wire Library
+    PCA9685 pwmController;     
+    FSMTreppeModelClass FSMTreppe_Obj;// Instance of model class
+
+    uint8_t stairs;
+    uint16_t time_per_stair = 300;          // dimmtime per stair [ms]
+    uint16_t idle_brightness = 100;
+    uint16_t active_brightness = 2048;
+
+    uint8_t direction = 0;
+    uint8_t switch_direction = 0;
+    uint8_t state = 0;
+    uint8_t switch_state = 0;
+    uint8_t finish = 1;
+
+    // alternative
+    uint32_t tick = 0;
+    uint32_t stufe = 0;
+    uint8_t an_aus = 0;
+
+    uint32_t ticks_treppe = 0;
+    uint32_t ticks_pro_stufe = 0;
+    float differenz_pwm_pro_tick = 0.0;
+    // alternative
+
+    uint8_t softstart_led(uint8_t led, uint16_t startval, uint16_t stopval);
+    void ledsequence();
+    void rampe();
+
+public:
+    Treppe(uint8_t _stairs) : stairs(_stairs){
+        FSMTreppe_Obj.initialize();
+
+        ticks_pro_stufe = time_per_stair / 20; // [ms]
+        ticks_treppe = ticks_pro_stufe * stairs;
+
+        differenz_pwm_pro_tick = (float) (active_brightness - idle_brightness) 
+                                            / (float) ticks_pro_stufe;
+    }
+    ~Treppe() {
+        FSMTreppe_Obj.terminate();
+    }
+
+    void setup();
+    void task();        // call periodically
+
+    // Parameter section
+    uint16_t setIdle(uint16_t _idle_brightness);
+    uint16_t setActive(uint16_t _active_brightness);
+    uint16_t setTime(uint16_t _time_per_stair);
+
+    void setTick(uint32_t _tick) {
+        tick = _tick;
+        Serial.printf("Treppe: Tick: %u!\n", tick);
+    }    
+    uint32_t getTicks() {
+        return ticks_treppe;
+    }
+
+    // Runtime Parameter section
+    void setDirection(uint8_t _direction);
+    void setState(uint8_t _state);
+    void setAnAus(uint8_t _an_aus) {
+        an_aus = _an_aus;
+    }
+
+    uint8_t getState() { return state;};
+    uint8_t getFinished() { return finish;};
+    uint8_t getDirection() {return direction;};
+};

src/httpserver.cpp

@@ -1,17 +0,0 @@
-#include "httpserver.h"
-
-
-bool HTTPServer::addRootFileHandler() {
-
-  // //experimental, see doku.md
-  // server.serveStatic("/compressed", LittleFS, "/compressed.html.gzip");
-
-  this->serveStatic("", LittleFS, "/index.html");
-  this->serveStatic("/", LittleFS, "/index.html");
-  this->serveStatic("/#", LittleFS, "/index.html");
-  this->serveStatic("/style.css", LittleFS, "/style.css");
-  this->serveStatic("/input.js", LittleFS, "/input.js");
-  this->serveStatic("/favicon.png", LittleFS, "/favicon.png");
-
-  return true;
-}

src/main.cpp

@@ -9,8 +9,8 @@ extern "C" {
   #include "user_interface.h" 
 }
 // OTA & WEB
-#include "ota.h"
 #include "wifi_credentials.h"
+#include "ota.h"
 #include "httpserver.h"
 
 // BOARD
@@ -18,15 +18,22 @@ extern "C" {
 #define NODEMCU_LED 16
 
 // PWM
-#include "pwm.h"
+#include "treppe.h"
 os_timer_t timer1;
 uint8_t timer_flag = 0;
-Treppe stairs(13);
+Treppe stairs(16);
 
 // WIFI
 const char* ssid = STASSID;
 const char* password = STAPSK;
 
+// port 80, root directory of server '/'
+HTTPServer httpServer(80, "/");
+
+uint32_t _t=0;
+#define SP_US(_str,_a) Serial.print(_str); Serial.print(" took: "); Serial.print(_a); Serial.println("us")
+#define TIMEIF_US(_f, _l, _str) _t=micros(); _f; _t=micros()-_t; if(_t > _l) { SP_US(_str, _t); }
+
 
 void timerCallback(void *pArg)
 {
@@ -34,31 +41,10 @@ void timerCallback(void *pArg)
   stairs.task();
 }
 
-// HTTP
-void handleNotFound();
-HTTPServer httpServer(80, "/");
-
-uint32_t _t=0;
-#define SP_US(_str,_a) Serial.print(_str); Serial.print(" took: "); Serial.print(_a); Serial.println("us")
-#define TIMEIF_US(_f, _l, _str) _t=micros(); _f; _t=micros()-_t; if(_t > _l) { SP_US(_str, _t); }
 // ===============================================
-
-
-void handleNotFound() {
-  String message = "File Not Found\n\n";
-  message += "URI: ";
-  message += httpServer.uri();
-  message += "\nMethod: ";
-  message += (httpServer.method() == HTTP_GET) ? "GET" : "POST";
-  message += "\nArguments: ";
-  message += httpServer.args();
-  message += "\n";
-
-  for (uint8_t i = 0; i < httpServer.args(); i++) {
-    message += " " + httpServer.argName(i) + ": " + httpServer.arg(i) + "\n";
-  }
-
-  httpServer.send(404, "text/plain", message);
+uint8_t inter = 0;
+ICACHE_RAM_ATTR void int_test(){
+  inter = 1;
 }
 
 void setup() {
@@ -66,12 +52,12 @@ void setup() {
   Serial.begin(460800);
   gdbstub_init();
 #else
-  Serial.begin(115200);
+  Serial.begin(76800);
 #endif
 
   Serial.println(F("Booting ...."));
 
-  pinMode(NODEMCU_LED, OUTPUT);
+  //pinMode(NODEMCU_LED, OUTPUT);
   pinMode(ESP12_LED, OUTPUT);
 
   Wire.begin();                       // Wire must be started first
@@ -95,17 +81,43 @@ void setup() {
   ota_setup();
 
   httpServer.start();
-  httpServer.onNotFound(handleNotFound);
+  httpServer.start_apps();
+
   Serial.println("HTTP server started !");
 
   stairs.setup();
   Serial.println("PCA9685 connected !");
+  //attachInterrupt(digitalPinToInterrupt(2), int_test, RISING);
+  //attachInterrupt(digitalPinToInterrupt(12), int_test, RISING);
 
   os_timer_setfn(&timer1, timerCallback, &timer_flag);
   os_timer_arm(&timer1, 20, true);
 }
 
+#include <random>
+
+uint32_t c = 0;
+
 void loop() {
-  TIMEIF_US(ArduinoOTA.handle(), 1000, "OTA");
-  TIMEIF_US(httpServer.handleClient(), 1000, "HTTP");
+  // if(stairs.getState() == 0) {
+  //   delay(1000);
+    
+  //   // uint32_t t = rand() % stairs.getTicks();
+  //   // uint32_t d = rand() % 2;
+    
+  //   // stairs.setTick(t);
+  //   // stairs.setDirection(d);
+
+  //   stairs.setDirection(!stairs.getDirection());
+  //   stairs.setState(1);
+  // }
+  if(inter){
+    Serial.printf("interrupt\n");
+    inter = 0;
+  }
+  if(c++%1000000 == 0)
+    httpServer.logt("[%d] starting :)\n", c);
+  
+  TIMEIF_US(ArduinoOTA.handle(), 10000, "OTA");
+  TIMEIF_US(httpServer.handleClient(), 10000, "HTTP");
 }

templ_platformio_ini

@@ -8,23 +8,29 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
-[env]
+[platformio]
+description = ESP8266 Treppenlicht Steuerung
+default_envs = ota
+; test_dir = test
+data_dir = data_gz
+
+[env:hardware]
 platform = espressif8266
 board = nodemcuv2
 framework = arduino
 
-; for http files
 board_build.filesystem = littlefs
 board_build.ldscript = eagle.flash.4m1m.ld
 extra_scripts = pre:create_gz_files.py
-
 monitor_speed = 115200
 
 [env:serial]
+extends = env:hardware
 upload_protocol = esptool
 upload_speed = 921600
 
 [env:ota]
+extends = env:hardware
 ; OTA => https://docs.platformio.org/en/latest/platforms/espressif8266.html#over-the-air-ota-update
 upload_protocol = espota
 upload_port = <!! IP ADDRESS !!>
@@ -33,13 +39,46 @@ upload_flags =
   --host_port=<!! PORT !!>
   --auth=admin
 
+
 [env:debug]
+extends = env:hardware
 ; look at doku.md
 build_flags = -DWITH_DEBUGGING_ON -Os -g3 -ggdb3
 upload_protocol = esptool
 upload_speed = 921600
 
 
+# This file is used compile and run tests located in the `unit` directory.
+# For more info, see:
+# https://docs.platformio.org/en/latest/plus/unit-testing.html
+# https://github.com/ThrowTheSwitch/Unity
+# https://github.com/ThrowTheSwitch/Unity/blob/master/docs/UnityAssertionsReference.md
 
 
 
+# To prepare coverage data for lcov, add ${coverage.build_flags} to env:test build flags
+# To actually generate coverage report:
+# $ `pio test` / run the test `program` manually
+# $ lcov --include (readlink -f ../espurna)'/*' --capture --directory .pio/build/test/ --output-file test.info
+# $ genhtml --ignore-errors source test.info --output-directory out
+
+[coverage]
+build_flags = -lgcov -fprofile-arcs -ftest-coverage
+
+[env:test]
+extends = env:hardware
+
+
+[env:native]
+platform = native
+test_build_project_src = true
+build_flags =
+    -DMANUFACTURER="PLATFORMIO"
+    -DDEVICE="TEST"
+    -std=gnu++11
+    -g
+    -Os
+    -I lib/treppe
+    -I lib/PCA9685-Arduino
+
+

test/test_main.cpp

@@ -1,40 +1,40 @@
-#include <Arduino.h>
-#include <unity.h>
+// #include <Arduino.h>
+// #include <unity.h>
 
-String STR_TO_TEST;
+// String STR_TO_TEST;
 
-void setUp(void) {
-    // set stuff up here
-    STR_TO_TEST = "Hello, world!";
-}
+// // void setUp(void) {
+// //     // set stuff up here
+// //     STR_TO_TEST = "Hello, world!";
+// // }
 
-void tearDown(void) {
-    // clean stuff up here
-    STR_TO_TEST = "";
-}
+// // void tearDown(void) {
+// //     // clean stuff up here
+// //     STR_TO_TEST = "";
+// // }
 
-void test_led_builtin_pin_number(void) {
-    TEST_ASSERT_EQUAL(2, LED_BUILTIN);
-}
+// void test_led_builtin_pin_number(void) {
+//     TEST_ASSERT_EQUAL(2, LED_BUILTIN);
+// }
 
-void test_string_concat(void) {
-    String hello = "Hello, ";
-    String world = "world!";
-    TEST_ASSERT_EQUAL_STRING(STR_TO_TEST.c_str(), (hello + world).c_str());
-}
+// void test_string_concat(void) {
+//     String hello = "Hello, ";
+//     String world = "world!";
+//     TEST_ASSERT_EQUAL_STRING(STR_TO_TEST.c_str(), (hello + world).c_str());
+// }
 
 
-void setup()
-{
-    delay(2000); // service delay
-    UNITY_BEGIN();
+// void setup()
+// {
+//     delay(2000); // service delay
+//     UNITY_BEGIN();
 
-    RUN_TEST(test_led_builtin_pin_number);
-    RUN_TEST(test_string_concat);
+//     RUN_TEST(test_led_builtin_pin_number);
+//     RUN_TEST(test_string_concat);
 
-    UNITY_END(); // stop unit testing
-}
+//     UNITY_END(); // stop unit testing
+// }
 
-void loop()
-{
-}
+// void loop()
+// {
+// }

test/test_pwm.cpp

@@ -0,0 +1,47 @@
+// #include <Arduino.h>
+#include "treppe.h"
+#include <unity.h>
+
+Treppe stairs(10);
+
+void setUp(void) {
+  // run before each test
+  // set stuff up here
+  stairs.setup();
+  Serial.println("Treppe initialized !");
+  Serial.println("PCA9685 connected !");
+}
+
+void tearDown(void) {
+    // clean stuff up here
+}
+
+void test_set_state(void) {
+  stairs.setState(1);
+  TEST_ASSERT_EQUAL(1, stairs.getState());
+  stairs.setState(0);
+  TEST_ASSERT_EQUAL(0, stairs.getState());
+}
+
+
+void test_set_direction(void) {
+  stairs.setDirection(1);
+  TEST_ASSERT_EQUAL(1, stairs.getDirection());
+  stairs.setDirection(0);
+  TEST_ASSERT_EQUAL(0, stairs.getDirection());
+}
+
+void setup()
+{   
+    delay(2000); // service delay
+    UNITY_BEGIN();
+
+    RUN_TEST(test_set_state);
+    RUN_TEST(test_set_direction);
+
+    UNITY_END(); // stop unit testing
+}
+
+void loop()
+{
+}