From 85816c18c162ccb6860c169a90102963b1731046 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 10 Nov 2016 13:17:44 -0600 Subject: Comment mlinux-xrs9113 images --- recipes-core/images/mlinux-xrs9113-base-image.bb | 1 + recipes-core/images/mlinux-xrs9113-factory-image.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/recipes-core/images/mlinux-xrs9113-base-image.bb b/recipes-core/images/mlinux-xrs9113-base-image.bb index b90903a..6b19725 100644 --- a/recipes-core/images/mlinux-xrs9113-base-image.bb +++ b/recipes-core/images/mlinux-xrs9113-base-image.bb @@ -1,3 +1,4 @@ +# Conduit 0.0 or 0.1 without RS9113 DESCRIPTION = "mLinux base image" LICENSE = "MIT" diff --git a/recipes-core/images/mlinux-xrs9113-factory-image.bb b/recipes-core/images/mlinux-xrs9113-factory-image.bb index fe2e698..72d2698 100644 --- a/recipes-core/images/mlinux-xrs9113-factory-image.bb +++ b/recipes-core/images/mlinux-xrs9113-factory-image.bb @@ -1,3 +1,4 @@ +# Conduit 0.0 or 0.1 without RS9113 require mlinux-xrs9113-base-image.bb LIGHTTPD = "lighttpd \ -- cgit v1.2.3 From 477a609adf3bcff66b6067389f52308bd4cb1055 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 10 Nov 2016 16:56:40 -0600 Subject: Add pps-tools and gpsd to the factory image. --- recipes-core/images/mlinux-factory-image.bb | 3 ++- recipes-core/images/mlinux-xrs9113-factory-image.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb index 6cc7197..8cf6ad2 100644 --- a/recipes-core/images/mlinux-factory-image.bb +++ b/recipes-core/images/mlinux-factory-image.bb @@ -78,6 +78,7 @@ IMAGE_INSTALL += "nodejs nodejs-npm" IMAGE_INSTALL += "sms-utils" # Multi-Tech GPS Utility IMAGE_INSTALL += "venus-gps" +IMAGE_INSTALL += "pps-tools" +IMAGE_INSTALL += "gpsd" IMAGE_INSTALL += "uvccapture" - diff --git a/recipes-core/images/mlinux-xrs9113-factory-image.bb b/recipes-core/images/mlinux-xrs9113-factory-image.bb index 72d2698..c536553 100644 --- a/recipes-core/images/mlinux-xrs9113-factory-image.bb +++ b/recipes-core/images/mlinux-xrs9113-factory-image.bb @@ -79,6 +79,7 @@ IMAGE_INSTALL += "nodejs nodejs-npm" IMAGE_INSTALL += "sms-utils" # Multi-Tech GPS Utility IMAGE_INSTALL += "venus-gps" +IMAGE_INSTALL += "pps-tools" +IMAGE_INSTALL += "gpsd" IMAGE_INSTALL += "uvccapture" - -- cgit v1.2.3 From 2ad72fa9c537724121bdf8b9260ae0a389b117b5 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 11 Nov 2016 08:37:41 -0600 Subject: update the version to dev2 --- conf/distro/mlinux.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf index 9be1ca1..2010c19 100644 --- a/conf/distro/mlinux.conf +++ b/conf/distro/mlinux.conf @@ -1,8 +1,8 @@ DISTRO = "mlinux" DISTRO_NAME = "mLinux" DISTRO_BASE_VERSION = "3.2" -DISTRO_VERSION = "${DISTRO_BASE_VERSION}.1dev1" -DISTRO_CODENAME = "dev1" +DISTRO_VERSION = "${DISTRO_BASE_VERSION}.1dev2" +DISTRO_CODENAME = "dev2" SDK_VENDOR = "-mlinux" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" -- cgit v1.2.3 From 8d0f0fb4b86062bbd1dbaf8d4ea3640b97ae5a58 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 14 Nov 2016 10:55:07 -0600 Subject: Remove Redpine from the base mLinux image --- recipes-core/images/mlinux-base-image.bb | 4 +- recipes-core/images/mlinux-factory-image.bb | 1 + recipes-core/images/mlinux-rs9113-base-image.bb | 66 +++++++++++++++++ recipes-core/images/mlinux-rs9113-factory-image.bb | 84 +++++++++++++++++++++ recipes-core/images/mlinux-xrs9113-base-image.bb | 66 ----------------- .../images/mlinux-xrs9113-factory-image.bb | 85 ---------------------- 6 files changed, 153 insertions(+), 153 deletions(-) create mode 100644 recipes-core/images/mlinux-rs9113-base-image.bb create mode 100644 recipes-core/images/mlinux-rs9113-factory-image.bb delete mode 100644 recipes-core/images/mlinux-xrs9113-base-image.bb delete mode 100644 recipes-core/images/mlinux-xrs9113-factory-image.bb diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb index 6423237..6b19725 100644 --- a/recipes-core/images/mlinux-base-image.bb +++ b/recipes-core/images/mlinux-base-image.bb @@ -1,3 +1,4 @@ +# Conduit 0.0 or 0.1 without RS9113 DESCRIPTION = "mLinux base image" LICENSE = "MIT" @@ -51,10 +52,9 @@ MULTITECH_FEATURES += " \ reset-handler \ radio-cmd radio-query \ jsparser \ - annex-client \ " -MISC_FEATURES = "minicom lrzsz nano rs9113" +MISC_FEATURES = "minicom lrzsz nano" # Extra stuff to install IMAGE_INSTALL += " \ diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb index 8cf6ad2..0f8344e 100644 --- a/recipes-core/images/mlinux-factory-image.bb +++ b/recipes-core/images/mlinux-factory-image.bb @@ -1,3 +1,4 @@ +# Conduit 0.0 or 0.1 without RS9113 require mlinux-base-image.bb LIGHTTPD = "lighttpd \ diff --git a/recipes-core/images/mlinux-rs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb new file mode 100644 index 0000000..6423237 --- /dev/null +++ b/recipes-core/images/mlinux-rs9113-base-image.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "mLinux base image" +LICENSE = "MIT" + +require mlinux-minimal-image.bb + +FILESYSTEM_FEATURES = "dosfstools \ + cifs-utils \ + lsof \ + " + +NETWORKING_FEATURES += "bridge-utils \ + inetutils-ftp \ + openssl \ + rsync \ + iperf \ + mii-diag \ + tcpdump \ + netcat \ + wget \ + strongswan \ + " + +WIFI_FEATURES = " \ + libnl \ + wpa-supplicant \ + wireless-tools \ + iw \ + hostap-daemon hostap-utils \ + " + +BLUETOOTH_FEATURES = "bluez4" + +# Add all timezones available +# ntpdate will sync time every 30 min by default via cron +TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \ + tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \ + tzdata-misc \ + cronie \ + ntpdate \ + " + +# u-boot-linux-utils: U-Boot environment access from Linux +# mlinux-scripts: sample scripts for setting up Conduit for various tasks +# reset-handler: default reset button handler +# radio-cmd: supports cellular radio activation and other configuration commands +# radio-query: queries cellular radio for common info (IMEI, RSSI, etc) +# jsparser: command line tool to parse JSON files +MULTITECH_FEATURES += " \ + u-boot-linux-utils \ + mlinux-scripts \ + reset-handler \ + radio-cmd radio-query \ + jsparser \ + annex-client \ + " + +MISC_FEATURES = "minicom lrzsz nano rs9113" + +# Extra stuff to install +IMAGE_INSTALL += " \ + ${WIFI_FEATURES} \ + ${BLUETOOTH_FEATURES} \ + ${FILESYSTEM_FEATURES} \ + ${TIME_FEATURES} \ + ${MISC_FEATURES} \ + " diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb new file mode 100644 index 0000000..bf2beaa --- /dev/null +++ b/recipes-core/images/mlinux-rs9113-factory-image.bb @@ -0,0 +1,84 @@ +require mlinux-rs9113-base-image.bb + +LIGHTTPD = "lighttpd \ + lighttpd-module-cgi lighttpd-module-indexfile \ + lighttpd-module-redirect lighttpd-module-auth \ + lighttpd-module-access lighttpd-module-accesslog \ + lighttpd-module-rewrite lighttpd-module-proxy lighttpd-module-fastcgi \ + lighttpd-module-scgi lighttpd-module-alias \ + lighttpd-module-dirlisting lighttpd-module-staticfile \ + " + +# Lighttpd web server +IMAGE_INSTALL += "${LIGHTTPD}" + +IMAGE_INSTALL += "sqlite3" + +IMAGE_INSTALL += "autossh" + +# Monit system/process monitor +IMAGE_INSTALL += "monit" + +# LoRa support (MTAC-LORA accessory card) +IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query" + +# MQTT server +IMAGE_INSTALL += "mosquitto mosquitto-clients" + +# Perl support +IMAGE_INSTALL += "perl" +IMAGE_INSTALL += "perl-module-io perl-module-fcntl" +# not in meta-oe or oe-core... +#IMAGE_INSTALL += "libdevice-serialport-perl" +#IMAGE_INSTALL += "libexpect-perl" + +# Python support +IMAGE_INSTALL += "python" +# Python modules +IMAGE_INSTALL += "python-async \ +python-argparse \ +python-compression \ +python-dateutil \ +python-html \ +python-psutil \ +python-pycurl \ +python-pyopenssl \ +python-pyserial \ +python-pyudev \ +python-pyusb \ +python-simplejson \ +python-sqlite3 \ +python-syslog \ +python-textutils \ +python-unixadmin \ +python-xml \ +" + +# Ruby support +IMAGE_INSTALL += "ruby" +IMAGE_INSTALL += "ruby-sqlite3" +IMAGE_INSTALL += "ruby-serialport" + +# OpenJDK Java runtime +IMAGE_INSTALL += "openjdk-7-jre" +# OpenJDK with JamVM VM (Multi-Tech default) +IMAGE_INSTALL += "openjdk-7-vm-jamvm" +# OpenJDK with CACAO VM (run with 'java -cacao') +IMAGE_INSTALL += "openjdk-7-vm-cacao" +# OpenJDK Zero VM (run with 'java -zero') +IMAGE_INSTALL += "openjdk-7-vm-zero" + +# PHP support +IMAGE_INSTALL += "php php-cli php-cgi" + +# Node.js support +IMAGE_INSTALL += "nodejs nodejs-npm" + +# Multi-Tech SMS Utility (see http://git.multitech.net) +IMAGE_INSTALL += "sms-utils" +# Multi-Tech GPS Utility +IMAGE_INSTALL += "venus-gps" +IMAGE_INSTALL += "pps-tools" +IMAGE_INSTALL += "gpsd" + +IMAGE_INSTALL += "uvccapture" diff --git a/recipes-core/images/mlinux-xrs9113-base-image.bb b/recipes-core/images/mlinux-xrs9113-base-image.bb deleted file mode 100644 index 6b19725..0000000 --- a/recipes-core/images/mlinux-xrs9113-base-image.bb +++ /dev/null @@ -1,66 +0,0 @@ -# Conduit 0.0 or 0.1 without RS9113 -DESCRIPTION = "mLinux base image" -LICENSE = "MIT" - -require mlinux-minimal-image.bb - -FILESYSTEM_FEATURES = "dosfstools \ - cifs-utils \ - lsof \ - " - -NETWORKING_FEATURES += "bridge-utils \ - inetutils-ftp \ - openssl \ - rsync \ - iperf \ - mii-diag \ - tcpdump \ - netcat \ - wget \ - strongswan \ - " - -WIFI_FEATURES = " \ - libnl \ - wpa-supplicant \ - wireless-tools \ - iw \ - hostap-daemon hostap-utils \ - " - -BLUETOOTH_FEATURES = "bluez4" - -# Add all timezones available -# ntpdate will sync time every 30 min by default via cron -TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \ - tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \ - tzdata-misc \ - cronie \ - ntpdate \ - " - -# u-boot-linux-utils: U-Boot environment access from Linux -# mlinux-scripts: sample scripts for setting up Conduit for various tasks -# reset-handler: default reset button handler -# radio-cmd: supports cellular radio activation and other configuration commands -# radio-query: queries cellular radio for common info (IMEI, RSSI, etc) -# jsparser: command line tool to parse JSON files -MULTITECH_FEATURES += " \ - u-boot-linux-utils \ - mlinux-scripts \ - reset-handler \ - radio-cmd radio-query \ - jsparser \ - " - -MISC_FEATURES = "minicom lrzsz nano" - -# Extra stuff to install -IMAGE_INSTALL += " \ - ${WIFI_FEATURES} \ - ${BLUETOOTH_FEATURES} \ - ${FILESYSTEM_FEATURES} \ - ${TIME_FEATURES} \ - ${MISC_FEATURES} \ - " diff --git a/recipes-core/images/mlinux-xrs9113-factory-image.bb b/recipes-core/images/mlinux-xrs9113-factory-image.bb deleted file mode 100644 index c536553..0000000 --- a/recipes-core/images/mlinux-xrs9113-factory-image.bb +++ /dev/null @@ -1,85 +0,0 @@ -# Conduit 0.0 or 0.1 without RS9113 -require mlinux-xrs9113-base-image.bb - -LIGHTTPD = "lighttpd \ - lighttpd-module-cgi lighttpd-module-indexfile \ - lighttpd-module-redirect lighttpd-module-auth \ - lighttpd-module-access lighttpd-module-accesslog \ - lighttpd-module-rewrite lighttpd-module-proxy lighttpd-module-fastcgi \ - lighttpd-module-scgi lighttpd-module-alias \ - lighttpd-module-dirlisting lighttpd-module-staticfile \ - " - -# Lighttpd web server -IMAGE_INSTALL += "${LIGHTTPD}" - -IMAGE_INSTALL += "sqlite3" - -IMAGE_INSTALL += "autossh" - -# Monit system/process monitor -IMAGE_INSTALL += "monit" - -# LoRa support (MTAC-LORA accessory card) -IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query" - -# MQTT server -IMAGE_INSTALL += "mosquitto mosquitto-clients" - -# Perl support -IMAGE_INSTALL += "perl" -IMAGE_INSTALL += "perl-module-io perl-module-fcntl" -# not in meta-oe or oe-core... -#IMAGE_INSTALL += "libdevice-serialport-perl" -#IMAGE_INSTALL += "libexpect-perl" - -# Python support -IMAGE_INSTALL += "python" -# Python modules -IMAGE_INSTALL += "python-async \ -python-argparse \ -python-compression \ -python-dateutil \ -python-html \ -python-psutil \ -python-pycurl \ -python-pyopenssl \ -python-pyserial \ -python-pyudev \ -python-pyusb \ -python-simplejson \ -python-sqlite3 \ -python-syslog \ -python-textutils \ -python-unixadmin \ -python-xml \ -" - -# Ruby support -IMAGE_INSTALL += "ruby" -IMAGE_INSTALL += "ruby-sqlite3" -IMAGE_INSTALL += "ruby-serialport" - -# OpenJDK Java runtime -IMAGE_INSTALL += "openjdk-7-jre" -# OpenJDK with JamVM VM (Multi-Tech default) -IMAGE_INSTALL += "openjdk-7-vm-jamvm" -# OpenJDK with CACAO VM (run with 'java -cacao') -IMAGE_INSTALL += "openjdk-7-vm-cacao" -# OpenJDK Zero VM (run with 'java -zero') -IMAGE_INSTALL += "openjdk-7-vm-zero" - -# PHP support -IMAGE_INSTALL += "php php-cli php-cgi" - -# Node.js support -IMAGE_INSTALL += "nodejs nodejs-npm" - -# Multi-Tech SMS Utility (see http://git.multitech.net) -IMAGE_INSTALL += "sms-utils" -# Multi-Tech GPS Utility -IMAGE_INSTALL += "venus-gps" -IMAGE_INSTALL += "pps-tools" -IMAGE_INSTALL += "gpsd" - -IMAGE_INSTALL += "uvccapture" -- cgit v1.2.3 From 14287ad7ab86c5141decfcb93405427be61caae0 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 14 Nov 2016 14:23:59 -0600 Subject: Eliminate copy of base image to rs9113 image. --- recipes-core/images/mlinux-rs9113-base-image.bb | 63 +------------------------ 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/recipes-core/images/mlinux-rs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb index 6423237..7147e8c 100644 --- a/recipes-core/images/mlinux-rs9113-base-image.bb +++ b/recipes-core/images/mlinux-rs9113-base-image.bb @@ -1,66 +1,5 @@ DESCRIPTION = "mLinux base image" LICENSE = "MIT" -require mlinux-minimal-image.bb - -FILESYSTEM_FEATURES = "dosfstools \ - cifs-utils \ - lsof \ - " - -NETWORKING_FEATURES += "bridge-utils \ - inetutils-ftp \ - openssl \ - rsync \ - iperf \ - mii-diag \ - tcpdump \ - netcat \ - wget \ - strongswan \ - " - -WIFI_FEATURES = " \ - libnl \ - wpa-supplicant \ - wireless-tools \ - iw \ - hostap-daemon hostap-utils \ - " - -BLUETOOTH_FEATURES = "bluez4" - -# Add all timezones available -# ntpdate will sync time every 30 min by default via cron -TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \ - tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \ - tzdata-misc \ - cronie \ - ntpdate \ - " - -# u-boot-linux-utils: U-Boot environment access from Linux -# mlinux-scripts: sample scripts for setting up Conduit for various tasks -# reset-handler: default reset button handler -# radio-cmd: supports cellular radio activation and other configuration commands -# radio-query: queries cellular radio for common info (IMEI, RSSI, etc) -# jsparser: command line tool to parse JSON files -MULTITECH_FEATURES += " \ - u-boot-linux-utils \ - mlinux-scripts \ - reset-handler \ - radio-cmd radio-query \ - jsparser \ - annex-client \ - " - -MISC_FEATURES = "minicom lrzsz nano rs9113" - # Extra stuff to install -IMAGE_INSTALL += " \ - ${WIFI_FEATURES} \ - ${BLUETOOTH_FEATURES} \ - ${FILESYSTEM_FEATURES} \ - ${TIME_FEATURES} \ - ${MISC_FEATURES} \ - " +IMAGE_INSTALL += " rs9113 " -- cgit v1.2.3 From 144a5a0af8b65e1e23266e849bbb0f2788f263a3 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Mon, 14 Nov 2016 14:35:47 -0600 Subject: mtcap:feat: add calibrated global_conf.json --- ...obal_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic | 225 +++++++++++++++++++++ .../lora/lora-packet-forwarder_3.0.0.bb | 4 +- 2 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic new file mode 100644 index 0000000..49c0edd --- /dev/null +++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic @@ -0,0 +1,225 @@ +{ + "SX1301_conf": { + "lorawan_public": true, + "clksrc": 0, /* radio_0 provides clock to concentrator */ + "lbt_cfg": { + "enable": false, + "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */ + "nb_channel": 1, + "start_freq": 869525000, + "scan_time_us": 5000, + "tx_delay_1ch_us": 4000000, + "tx_delay_2ch_us": 4000000 + }, + "antenna_gain": 0, /* antenna gain, in dBi */ + "radio_0": { + "enable": true, + "type": "SX1257", + "freq": 867500000, + "rssi_offset": -165.0, + "tx_enable": true, + "tx_freq_min": 863000000, + "tx_freq_max": 870000000 + }, + "radio_1": { + "enable": true, + "type": "SX1257", + "freq": 868500000, + "rssi_offset": -165.0, + "tx_enable": false + }, + "chan_multiSF_0": { + /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */ + "enable": true, + "radio": 1, + "if": -400000 + }, + "chan_multiSF_1": { + /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */ + "enable": true, + "radio": 1, + "if": -200000 + }, + "chan_multiSF_2": { + /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */ + "enable": true, + "radio": 1, + "if": 0 + }, + "chan_multiSF_3": { + /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */ + "enable": true, + "radio": 0, + "if": -400000 + }, + "chan_multiSF_4": { + /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */ + "enable": true, + "radio": 0, + "if": -200000 + }, + "chan_multiSF_5": { + /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */ + "enable": true, + "radio": 0, + "if": 0 + }, + "chan_multiSF_6": { + /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */ + "enable": true, + "radio": 0, + "if": 200000 + }, + "chan_multiSF_7": { + /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */ + "enable": true, + "radio": 0, + "if": 400000 + }, + "chan_Lora_std": { + /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */ + "enable": true, + "radio": 1, + "if": -200000, + "bandwidth": 250000, + "spread_factor": 7 + }, + "chan_FSK": { + /* FSK 50kbps channel, 868.8 MHz */ + "enable": true, + "radio": 1, + "if": 300000, + "bandwidth": 125000, + "datarate": 50000 + }, + "tx_lut_0": { + /* TX gain table, index 0 */ + "pa_gain": 0, + "mix_gain": 9, + "rf_power": -6, + "dig_gain": 1 + }, + "tx_lut_1": { + /* TX gain table, index 1 */ + "pa_gain": 0, + "mix_gain": 12, + "rf_power": -3, + "dig_gain": 1 + }, + "tx_lut_2": { + /* TX gain table, index 2 */ + "pa_gain": 1, + "mix_gain": 8, + "rf_power": 0, + "dig_gain": 2 + }, + "tx_lut_3": { + /* TX gain table, index 3 */ + "pa_gain": 1, + "mix_gain": 11, + "rf_power": 3, + "dig_gain": 3 + }, + "tx_lut_4": { + /* TX gain table, index 4 */ + "pa_gain": 1, + "mix_gain": 10, + "rf_power": 6, + "dig_gain": 0 + }, + "tx_lut_5": { + /* TX gain table, index 5 */ + "pa_gain": 2, + "mix_gain": 11, + "rf_power": 10, + "dig_gain": 3 + }, + "tx_lut_6": { + /* TX gain table, index 6 */ + "pa_gain": 2, + "mix_gain": 9, + "rf_power": 11, + "dig_gain": 1 + }, + "tx_lut_7": { + /* TX gain table, index 7 */ + "pa_gain": 2, + "mix_gain": 9, + "rf_power": 12, + "dig_gain": 0 + }, + "tx_lut_8": { + /* TX gain table, index 8 */ + "pa_gain": 2, + "mix_gain": 11, + "rf_power": 13, + "dig_gain": 2 + }, + "tx_lut_9": { + /* TX gain table, index 9 */ + "pa_gain": 2, + "mix_gain": 11, + "rf_power": 14, + "dig_gain": 1 + }, + "tx_lut_10": { + /* TX gain table, index 10 */ + "pa_gain": 2, + "mix_gain": 12, + "rf_power": 16, + "dig_gain": 0 + }, + "tx_lut_11": { + /* TX gain table, index 11 */ + "pa_gain": 3, + "mix_gain": 10, + "rf_power": 20, + "dig_gain": 3 + }, + "tx_lut_12": { + /* TX gain table, index 12 */ + "pa_gain": 3, + "mix_gain": 9, + "rf_power": 23, + "dig_gain": 0 + }, + "tx_lut_13": { + /* TX gain table, index 13 */ + "pa_gain": 3, + "mix_gain": 12, + "rf_power": 25, + "dig_gain": 2 + }, + "tx_lut_14": { + /* TX gain table, index 14 */ + "pa_gain": 3, + "mix_gain": 13, + "rf_power": 26, + "dig_gain": 0 + }, + "tx_lut_15": { + /* TX gain table, index 15 */ + "pa_gain": 3, + "mix_gain": 15, + "rf_power": 27, + "dig_gain": 0 + } + }, + + "gateway_conf": { + "gateway_ID": "AA555A0000000000", + /* change with default server address/ports, or overwrite in local_conf.json */ + "server_address": "localhost", + "serv_port_up": 1680, + "serv_port_down": 1680, + /* adjust the following parameters for your network */ + "keepalive_interval": 10, + "stat_interval": 30, + "push_timeout_ms": 100, + /* forward only valid packets */ + "forward_crc_valid": true, + "forward_crc_error": false, + "forward_crc_disabled": false + } +} + diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb index 07ba4a8..4e52cd0 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb @@ -6,7 +6,7 @@ SECTION = "console/utils" LICENSE = "SEMTECH" LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45" DEPENDS = "lora-gateway" -PR = "r5" +PR = "r6" SRCREV = "v${PV}" @@ -50,6 +50,8 @@ do_install() { } do_install_append_mtcap() { + install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic ${D}${LORA_DIR}/global_conf.json + install -d ${D}${sysconfdir}/default install -m 0644 ${WORKDIR}/lora-packet-forwarder.default ${D}${sysconfdir}/default/lora-packet-forwarder install -d ${D}${sysconfdir}/init.d -- cgit v1.2.3 From 46e34ac649528cfb8aaec7bbbb52c775799dcdb1 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Mon, 14 Nov 2016 14:39:09 -0600 Subject: mtcap:fix: add file to manifest --- recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb index 4e52cd0..b8026c4 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \ file://global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 \ file://global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 \ file://global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 \ + file://global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic \ file://local_conf.json \ file://lora-packet-forwarder-add-spi-dev-path.patch \ " -- cgit v1.2.3 From fa9d9ac8939b1f123826bec3de08ce615137ecf4 Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Mon, 14 Nov 2016 14:57:26 -0600 Subject: fix: only install mtcdt specific lora files on mtcdt --- recipes-connectivity/lora/lora-gateway_4.0.1.bb | 7 +++++-- recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/recipes-connectivity/lora/lora-gateway_4.0.1.bb b/recipes-connectivity/lora/lora-gateway_4.0.1.bb index 5e269e1..6204e33 100644 --- a/recipes-connectivity/lora/lora-gateway_4.0.1.bb +++ b/recipes-connectivity/lora/lora-gateway_4.0.1.bb @@ -6,7 +6,7 @@ SECTION = "console/utils" LICENSE = "SEMTECH" LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb" DEPENDS = "" -PR = "r8" +PR = "r9" SRCREV = "v${PV}" SRC_URI = "git://github.com/Lora-net/lora_gateway.git;protocol=git \ @@ -42,7 +42,6 @@ do_install() { install -m 0644 libloragw/readme.md ${D}${libdir}/lora/lora-gw-readme.md install -d ${D}/opt/lora/ - install -m 0755 ${WORKDIR}/ln-lora-spi-dev.sh ${D}/opt/lora/ install -d ${D}/opt/lora/gateway-utils install -m 0755 libloragw/test_* ${D}/opt/lora/gateway-utils/ @@ -54,6 +53,10 @@ do_install() { install -m 0755 util_lbt_test/util_lbt_test ${D}/opt/lora/gateway-utils/ } +do_install_append_mtcdt() { + install -m 0755 ${WORKDIR}/ln-lora-spi-dev.sh ${D}/opt/lora/ +} + PACKAGES += "${PN}-utils ${PN}-utils-dbg" FILES_${PN} = "${libdir}/lora/lora-gw-readme.md" diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb index b8026c4..834ff6c 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb @@ -6,7 +6,7 @@ SECTION = "console/utils" LICENSE = "SEMTECH" LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45" DEPENDS = "lora-gateway" -PR = "r6" +PR = "r7" SRCREV = "v${PV}" @@ -38,9 +38,6 @@ do_compile() { do_install() { install -d ${D}${LORA_DIR} install -m 755 lora_pkt_fwd/lora_pkt_fwd ${D}${LORA_DIR}/ - install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json - install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0 - install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5 install -m 755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/ install -d ${D}${LORA_DIR}/forwarder-utils @@ -50,6 +47,12 @@ do_install() { install -m 755 ${WORKDIR}/README.md ${D}${LORA_DIR}/ } +do_install_append_mtcdt() { + install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json + install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0 + install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5 +} + do_install_append_mtcap() { install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic ${D}${LORA_DIR}/global_conf.json -- cgit v1.2.3 From 09ac0882fb7cf45168197dd206d9d0482fe5f4da Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 15 Nov 2016 10:37:02 -0600 Subject: Add mts-io features to GPSD init.d script --- recipes-navigation/gpsd/gpsd/Conduit.patch | 14 ++++++++++++++ recipes-navigation/gpsd/gpsd_3.7.bbappend | 10 ++++++++++ 2 files changed, 24 insertions(+) create mode 100644 recipes-navigation/gpsd/gpsd/Conduit.patch create mode 100644 recipes-navigation/gpsd/gpsd_3.7.bbappend diff --git a/recipes-navigation/gpsd/gpsd/Conduit.patch b/recipes-navigation/gpsd/gpsd/Conduit.patch new file mode 100644 index 0000000..0fced15 --- /dev/null +++ b/recipes-navigation/gpsd/gpsd/Conduit.patch @@ -0,0 +1,14 @@ +diff -uprN old/gpsd new/gpsd +--- old/gpsd 2016-11-14 14:37:19.733762786 -0600 ++++ new/gpsd 2016-11-14 14:43:28.733762007 -0600 +@@ -93,6 +93,10 @@ do_reload() { + + case "$1" in + start) ++ if ! [[ -r /sys/devices/platform/mts-io/gnss-int ]] ; then ++ echo "No GPS available" ++ exit ++ fi + echo "Starting $DESC" "$NAME" + do_start + exit $? diff --git a/recipes-navigation/gpsd/gpsd_3.7.bbappend b/recipes-navigation/gpsd/gpsd_3.7.bbappend new file mode 100644 index 0000000..73b814f --- /dev/null +++ b/recipes-navigation/gpsd/gpsd_3.7.bbappend @@ -0,0 +1,10 @@ +PR .= ".mlinux1" + +SRC_URI += " file://Conduit.patch;patchdir=.." +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}" + +python do_patch_prepend () { + import os + cwd = os.getcwd() + bb.note("Hello %s",cwd) +} -- cgit v1.2.3 From 430df22994074add57ed80c2944bc5e3e32f65ec Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 15 Nov 2016 13:19:57 -0600 Subject: monit depends on PAM --- recipes-extended/monit/monit_5.12.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-extended/monit/monit_5.12.2.bb b/recipes-extended/monit/monit_5.12.2.bb index 017ac75..ddd2ea9 100644 --- a/recipes-extended/monit/monit_5.12.2.bb +++ b/recipes-extended/monit/monit_5.12.2.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Monit" HOMEPAGE = "http://mmonit.com/" LICENSE = "AGPL-3.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51" +DEPENDS = "libpam" PR = "r1" -- cgit v1.2.3 From 43729c8ab75b830c95e5a5866c64cc31e7d8fb46 Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 15 Nov 2016 15:27:25 -0600 Subject: Fix DISTRO_VERSION for final release --- conf/distro/mlinux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf index 2010c19..31b61aa 100644 --- a/conf/distro/mlinux.conf +++ b/conf/distro/mlinux.conf @@ -1,7 +1,7 @@ DISTRO = "mlinux" DISTRO_NAME = "mLinux" DISTRO_BASE_VERSION = "3.2" -DISTRO_VERSION = "${DISTRO_BASE_VERSION}.1dev2" +DISTRO_VERSION = "${DISTRO_BASE_VERSION}.1" DISTRO_CODENAME = "dev2" SDK_VENDOR = "-mlinux" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" -- cgit v1.2.3 From 140edeef4addf5dd01169b0507a226cb0c7aaf0d Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 16 Nov 2016 09:53:18 -0600 Subject: For some reason we cannot inherit the license --- recipes-core/images/mlinux-rs9113-factory-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb index bf2beaa..d8f65ce 100644 --- a/recipes-core/images/mlinux-rs9113-factory-image.bb +++ b/recipes-core/images/mlinux-rs9113-factory-image.bb @@ -1,4 +1,5 @@ require mlinux-rs9113-base-image.bb +LICENSE = "MIT" LIGHTTPD = "lighttpd \ lighttpd-module-cgi lighttpd-module-indexfile \ -- cgit v1.2.3 From 691f45a5599196d201464e2b8be6433d6e28026c Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 16 Nov 2016 10:45:20 -0600 Subject: Fix up the rs9113 image files. --- recipes-core/images/mlinux-rs9113-base-image.bb | 2 +- recipes-core/images/mlinux-rs9113-factory-image.bb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-core/images/mlinux-rs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb index 7147e8c..a4e9f23 100644 --- a/recipes-core/images/mlinux-rs9113-base-image.bb +++ b/recipes-core/images/mlinux-rs9113-base-image.bb @@ -1,5 +1,5 @@ +require mlinux-base-image.bb DESCRIPTION = "mLinux base image" -LICENSE = "MIT" # Extra stuff to install IMAGE_INSTALL += " rs9113 " diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb index d8f65ce..bf2beaa 100644 --- a/recipes-core/images/mlinux-rs9113-factory-image.bb +++ b/recipes-core/images/mlinux-rs9113-factory-image.bb @@ -1,5 +1,4 @@ require mlinux-rs9113-base-image.bb -LICENSE = "MIT" LIGHTTPD = "lighttpd \ lighttpd-module-cgi lighttpd-module-indexfile \ -- cgit v1.2.3 From 16aa38da51b9129733673ed27e0cf8ab5e6aa9cc Mon Sep 17 00:00:00 2001 From: Brandon Bayer Date: Mon, 31 Oct 2016 16:53:25 -0500 Subject: feat: add firmware version to /etc/issue for annex-client --- classes/mlinux-image.bbclass | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass index 13cacb5..4af7d9e 100644 --- a/classes/mlinux-image.bbclass +++ b/classes/mlinux-image.bbclass @@ -12,18 +12,24 @@ mlinux_set_root_password () { } ROOTFS_POSTPROCESS_COMMAND += "mlinux_set_root_password;" -# set custom product sw version to /etc/issue file if $FIRMWARE_PRODUCT_VER is set +# set custom product sw version to /etc/issue file mlinux_set_product_version () { - if [ -n "${FIRMWARE_PRODUCT_VER}" ]; then + PREV_DIR=$(pwd) + cd "$TOPDIR" + PRODUCT_VER=$(git describe) + cd "$PREV_DIR" + PRODUCT_DATE=$(date +%Y-%m-%dT%H:%M:%S) + + if [ -n "${PRODUCT_VER}" ]; then # set issue if cat ${IMAGE_ROOTFS}/etc/issue | grep "Version: " > /dev/null 2>&1 ; then # replace - sed -i "s/^Version: .*$/Version: $FIRMWARE_PRODUCT_VER/g" ${IMAGE_ROOTFS}/etc/issue - sed -i "s/^Date: .*$/Date: $FIRMWARE_PRODUCT_DATE/g" ${IMAGE_ROOTFS}/etc/issue + sed -i "s/^Version: .*$/Version: $PRODUCT_VER/g" ${IMAGE_ROOTFS}/etc/issue + sed -i "s/^Date: .*$/Date: $PRODUCT_DATE/g" ${IMAGE_ROOTFS}/etc/issue else # add echo "" >> ${IMAGE_ROOTFS}/etc/issue - echo "Version: ${FIRMWARE_PRODUCT_VER}" >> ${IMAGE_ROOTFS}/etc/issue + echo "Version: ${PRODUCT_VER}" >> ${IMAGE_ROOTFS}/etc/issue echo "Date: $(date +%Y-%m-%dT%H:%M:%S)" >> ${IMAGE_ROOTFS}/etc/issue fi fi -- cgit v1.2.3 From e1096eb058303e3c201f2055df742238831289a2 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 18 Nov 2016 18:32:55 -0600 Subject: add setserial to the list of feed packages to set gpsd tty if needed. --- scripts/build-feed-extras.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-feed-extras.sh b/scripts/build-feed-extras.sh index be3b86c..be12672 100755 --- a/scripts/build-feed-extras.sh +++ b/scripts/build-feed-extras.sh @@ -5,6 +5,6 @@ FS_PACKAGES="sshfs-fuse fuse-exfat exfat-utils" NET_PACKAGES="wget netcat ipsec-tools openvpn iftop dnsmasq strongswan stunnel tunctl" UTIL_PACKAGES="logrotate fatrace stressapptest gawk rsyslog zip gnupg rrdtool" DEV_PACKAGES="node-red mono gdb git vim python-pip python-pyopenssl" -SUP_PACKAGES="pps-tools" +SUP_PACKAGES="pps-tools setserial" bitbake linux-firmware $FS_PACKAGES $NET_PACKAGES $UTIL_PACKAGES $DEV_PACKAGES $SUP_PACKAGES -- cgit v1.2.3