Merge branch 'master' of https://gitlab.cern.ch:8443/hev-sw/hev-sw
Showing
- arduino/common/lib/CommsControl/CommsCommon.h 7 additions, 7 deletionsarduino/common/lib/CommsControl/CommsCommon.h
- arduino/common/lib/CommsControl/CommsControl.cpp 71 additions, 60 deletionsarduino/common/lib/CommsControl/CommsControl.cpp
- arduino/common/lib/CommsControl/CommsControl.h 16 additions, 3 deletionsarduino/common/lib/CommsControl/CommsControl.h
- arduino/hev_prototype_v1/src/AlarmLoop.cpp 36 additions, 2 deletionsarduino/hev_prototype_v1/src/AlarmLoop.cpp
- arduino/hev_prototype_v1/src/AlarmLoop.h 4 additions, 1 deletionarduino/hev_prototype_v1/src/AlarmLoop.h
- arduino/hev_prototype_v1/src/UILoop.cpp 1 addition, 0 deletionsarduino/hev_prototype_v1/src/UILoop.cpp
- arduino/hev_prototype_v1/src/UILoop.h 0 additions, 1 deletionarduino/hev_prototype_v1/src/UILoop.h
- arduino/hev_prototype_v1/src/common.h 29 additions, 9 deletionsarduino/hev_prototype_v1/src/common.h
- arduino/hev_prototype_v1/src/main.cpp 29 additions, 2 deletionsarduino/hev_prototype_v1/src/main.cpp
- battery/BatteryLLI.py 24 additions, 11 deletionsbattery/BatteryLLI.py
- battery/hevgpio.py 53 additions, 23 deletionsbattery/hevgpio.py
- raspberry-backend/app.py 67 additions, 216 deletionsraspberry-backend/app.py
- raspberry-backend/static/css/style_v3.css 68 additions, 22 deletionsraspberry-backend/static/css/style_v3.css
- raspberry-backend/static/js/Chart-display.js 45 additions, 156 deletionsraspberry-backend/static/js/Chart-display.js
- raspberry-backend/static/js/Chart-displayLoop.js 39 additions, 100 deletionsraspberry-backend/static/js/Chart-displayLoop.js
- raspberry-backend/static/js/HevUpdater.js 129 additions, 37 deletionsraspberry-backend/static/js/HevUpdater.js
- raspberry-backend/templates/base.html 12 additions, 10 deletionsraspberry-backend/templates/base.html
- raspberry-backend/templates/index.html 120 additions, 122 deletionsraspberry-backend/templates/index.html
- raspberry-backend/templates/index_prototype.html 1 addition, 1 deletionraspberry-backend/templates/index_prototype.html
- raspberry-dataserver/ArduinoEmulator.py 2 additions, 2 deletionsraspberry-dataserver/ArduinoEmulator.py
Please register or sign in to comment