diff --git a/README.md b/README.md index e59f2423..145f426e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,16 @@ # Domo -Domotic Firmware +## Domotic Firmware Domo est un firmware pour Raspberry qui permet de controler un arrosage, de volets roulants ou des prises connecté DIO en 433 Mhz. + +## Utilisation de la console bluetooth + +- hcitool scan +``` +# hcitool scan +Scanning ... + 00:12:6F:33:C9:FE Cabasse Stream Source + 98:D3:35:00:A6:1C HC-05 +``` diff --git a/bsp/board/domo/ovl/etc/init.d/uhttpd b/bsp/board/domo/ovl/etc/init.d/uhttpd index ba16b3b0..02a8bfb2 100755 --- a/bsp/board/domo/ovl/etc/init.d/uhttpd +++ b/bsp/board/domo/ovl/etc/init.d/uhttpd @@ -18,7 +18,7 @@ USE_PROCD=1 start_service () { procd_open_instance - procd_set_param command "$PROG" -p $PORT -f -h /usr/local/share/restd/ + procd_set_param command "$PROG" -p $PORT -f -h /usr/local/share/uhttpd/ -U /usr/local/configs/uhttpd/ procd_set_param pidfile "$PIDFILE" procd_set_param respawn procd_set_param stdout 1 # forward stdout of the command to logd diff --git a/bsp/board/domo/ovl/usr/local/configs/restd/v1-outlets.json b/bsp/board/domo/ovl/usr/local/configs/uhttpd/v1-outlets.json similarity index 100% rename from bsp/board/domo/ovl/usr/local/configs/restd/v1-outlets.json rename to bsp/board/domo/ovl/usr/local/configs/uhttpd/v1-outlets.json diff --git a/bsp/board/domo/ovl/usr/local/configs/restd/v1-sequences.json b/bsp/board/domo/ovl/usr/local/configs/uhttpd/v1-sequences.json similarity index 100% rename from bsp/board/domo/ovl/usr/local/configs/restd/v1-sequences.json rename to bsp/board/domo/ovl/usr/local/configs/uhttpd/v1-sequences.json diff --git a/bsp/board/domo/ovl/usr/local/configs/restd/v1-shutters.json b/bsp/board/domo/ovl/usr/local/configs/uhttpd/v1-shutters.json similarity index 100% rename from bsp/board/domo/ovl/usr/local/configs/restd/v1-shutters.json rename to bsp/board/domo/ovl/usr/local/configs/uhttpd/v1-shutters.json diff --git a/bsp/board/domo/ovl/usr/local/configs/restd/v1-sprinklers.json b/bsp/board/domo/ovl/usr/local/configs/uhttpd/v1-sprinklers.json similarity index 100% rename from bsp/board/domo/ovl/usr/local/configs/restd/v1-sprinklers.json rename to bsp/board/domo/ovl/usr/local/configs/uhttpd/v1-sprinklers.json diff --git a/bsp/board/domo/ovl/usr/local/configs/restd/v1.json b/bsp/board/domo/ovl/usr/local/configs/uhttpd/v1.json similarity index 100% rename from bsp/board/domo/ovl/usr/local/configs/restd/v1.json rename to bsp/board/domo/ovl/usr/local/configs/uhttpd/v1.json diff --git a/bsp/board/domo/ovl/usr/local/share/restd/index.html b/bsp/board/domo/ovl/usr/local/share/uhttpd/index.html similarity index 100% rename from bsp/board/domo/ovl/usr/local/share/restd/index.html rename to bsp/board/domo/ovl/usr/local/share/uhttpd/index.html diff --git a/bsp/include/buildroot.mk b/bsp/include/buildroot.mk index 4f350cfd..37f563e8 100644 --- a/bsp/include/buildroot.mk +++ b/bsp/include/buildroot.mk @@ -48,4 +48,4 @@ else endif install.sd: - sudo dd if=$(BR_STAGING)/buildroot/images/sdcard.img of=/dev/mmcblk0 && sync && sync + sudo dd if=$(BR_STAGING)/buildroot/images/sdcard.img of=/dev/sdb && sync && sync diff --git a/projects/rpi_domo/configs/buildroot_defconfig b/projects/rpi_domo/configs/buildroot_defconfig index 02fcdeb8..8d5b0976 100644 --- a/projects/rpi_domo/configs/buildroot_defconfig +++ b/projects/rpi_domo/configs/buildroot_defconfig @@ -37,6 +37,9 @@ BR2_PACKAGE_UBOOT_TOOLS=y BR2_PACKAGE_NCURSES=y BR2_PACKAGE_AVAHI=y BR2_PACKAGE_AVAHI_DAEMON=y +BR2_PACKAGE_DROPBEAR=y +# BR2_PACKAGE_DROPBEAR_CLIENT is not set +BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y BR2_TARGET_ROOTFS_CPIO=y BR2_TARGET_ROOTFS_CPIO_LZO=y BR2_TARGET_ROOTFS_CPIO_UIMAGE=y diff --git a/src/3P/uhttpd/main.c b/src/3P/uhttpd/main.c index 9a4a0b01..ecf8944b 100644 --- a/src/3P/uhttpd/main.c +++ b/src/3P/uhttpd/main.c @@ -150,6 +150,7 @@ static int usage(const char *name) #endif #ifdef HAVE_REST_API_PLUGING " -U directory Specify the config root path\n" + " -u directory plugin directory root path\n" #endif #ifdef HAVE_UBUS " -u string URL prefix for UBUS via JSON-RPC handler\n" @@ -454,6 +455,9 @@ int main(int argc, char **argv) case 'U': conf.ubus_prefix = optarg; break; + case 'u': + conf.ubus_prefix = optarg; + break; #endif default: return usage(argv[0]); diff --git a/src/prog/dashboard3/package-lock.json b/src/prog/dashboard3/package-lock.json index 84ce26ef..e73d1b75 100644 --- a/src/prog/dashboard3/package-lock.json +++ b/src/prog/dashboard3/package-lock.json @@ -11787,6 +11787,11 @@ "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ==", "dev": true }, + "vue-axios": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-2.1.1.tgz", + "integrity": "sha512-Ek1STxe7G8H+ylkru1v1z6sIuUr4UkpYXjNLvDsqQNQIQ1CyrDk17KG2GaCjvhopu1wn7d8iAM9DJ5prn+FnrQ==" + }, "vue-eslint-parser": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz", diff --git a/src/prog/dashboard3/package.json b/src/prog/dashboard3/package.json index e33731f3..c97335fd 100644 --- a/src/prog/dashboard3/package.json +++ b/src/prog/dashboard3/package.json @@ -11,7 +11,8 @@ "test": "echo \"No test specified\" && exit 0" }, "dependencies": { - "axios": "^0.18.0" + "axios": "^0.18.0", + "vue-axios": "^2.1.1" }, "devDependencies": { "babel-eslint": "^8.2.1", diff --git a/src/prog/dashboard3/quasar.conf.js b/src/prog/dashboard3/quasar.conf.js index ae37918c..cf4a456c 100644 --- a/src/prog/dashboard3/quasar.conf.js +++ b/src/prog/dashboard3/quasar.conf.js @@ -18,6 +18,8 @@ module.exports = function (ctx) { ], supportIE: false, build: { + sourceMap: false, + minify: true, scopeHoisting: true, vueRouterMode: 'history', // vueCompiler: true, diff --git a/src/prog/dashboard3/src/store/index.js b/src/prog/dashboard3/src/store/index.js index 94d78055..8d5181b0 100644 --- a/src/prog/dashboard3/src/store/index.js +++ b/src/prog/dashboard3/src/store/index.js @@ -1,9 +1,12 @@ import Vue from 'vue' import Vuex from 'vuex' +import axios from 'axios' +import VueAxios from 'vue-axios' import domoStore from './domo-store' Vue.use(Vuex) +Vue.use(VueAxios, axios) const store = new Vuex.Store({ modules: {