diff --git a/Lora-Bot/Lora-Bot.csproj b/Lora-Bot/Lora-Bot.csproj index 7221bfe..06612fa 100644 --- a/Lora-Bot/Lora-Bot.csproj +++ b/Lora-Bot/Lora-Bot.csproj @@ -31,9 +31,7 @@ prompt 4 - - app.manifest - + @@ -82,9 +80,6 @@ - - Designer - PreserveNewest diff --git a/Lora-Bot/Properties/AssemblyInfo.cs b/Lora-Bot/Properties/AssemblyInfo.cs index 2ad837d..952004d 100644 --- a/Lora-Bot/Properties/AssemblyInfo.cs +++ b/Lora-Bot/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("LoraDisplay")] -[assembly: AssemblyCopyright("Copyright © 2018 - 10.10.2018")] +[assembly: AssemblyCopyright("Copyright © 2018 - 29.01.2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,8 +32,8 @@ // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.6.2")] -[assembly: AssemblyFileVersion("1.6.2")] +[assembly: AssemblyVersion("1.7.0")] +[assembly: AssemblyFileVersion("1.7.0")] /* * 1.1.0 Update Scral addresses * 1.2.0 Run Module Events in threads so that one Module can not block others, TXTOut now appends to the logfile @@ -44,5 +44,6 @@ * 1.5.1 Dependencies in debian Packet cleaned * 1.6.0 Implement Height in LoraBot * 1.6.1 Fixing parsing bug with linebreaks in Lora - * 1.6.2 Adding a Test for Lora Binary + * 1.6.2 Adding a test for LoraBinary + * 1.7.0 Adding IC800A Lora-Reciever */ diff --git a/Lora-Bot/app.manifest b/Lora-Bot/app.manifest deleted file mode 100644 index f21a980..0000000 --- a/Lora-Bot/app.manifest +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Lora-Bot/bin/Release/Bot-Utils.dll b/Lora-Bot/bin/Release/Bot-Utils.dll index 4f82ebc..89311a1 100644 Binary files a/Lora-Bot/bin/Release/Bot-Utils.dll and b/Lora-Bot/bin/Release/Bot-Utils.dll differ diff --git a/Lora-Bot/bin/Release/ConnectorDataMqtt.dll b/Lora-Bot/bin/Release/ConnectorDataMqtt.dll index 934a7ac..a6e2197 100644 Binary files a/Lora-Bot/bin/Release/ConnectorDataMqtt.dll and b/Lora-Bot/bin/Release/ConnectorDataMqtt.dll differ diff --git a/Lora-Bot/bin/Release/Iot-Interfaces.dll b/Lora-Bot/bin/Release/Iot-Interfaces.dll index b35ecaf..83e6515 100644 Binary files a/Lora-Bot/bin/Release/Iot-Interfaces.dll and b/Lora-Bot/bin/Release/Iot-Interfaces.dll differ diff --git a/Lora-Bot/bin/Release/Lora-Bot.exe b/Lora-Bot/bin/Release/Lora-Bot.exe index 5af9a56..40eb480 100644 Binary files a/Lora-Bot/bin/Release/Lora-Bot.exe and b/Lora-Bot/bin/Release/Lora-Bot.exe differ diff --git a/Lora-Bot/bin/Release/Lora.dll b/Lora-Bot/bin/Release/Lora.dll index 42cbdb1..9a90fde 100644 Binary files a/Lora-Bot/bin/Release/Lora.dll and b/Lora-Bot/bin/Release/Lora.dll differ diff --git a/Lora-Bot/bin/Release/M2Mqtt.dll b/Lora-Bot/bin/Release/M2Mqtt.dll index ead6b4b..ce4acd7 100644 Binary files a/Lora-Bot/bin/Release/M2Mqtt.dll and b/Lora-Bot/bin/Release/M2Mqtt.dll differ diff --git a/Lora-Bot/bin/Release/Utils-IoT.dll b/Lora-Bot/bin/Release/Utils-IoT.dll index c7d62de..5ac1f76 100644 Binary files a/Lora-Bot/bin/Release/Utils-IoT.dll and b/Lora-Bot/bin/Release/Utils-IoT.dll differ diff --git a/Lora-Bot/bin/Release/Utils.dll b/Lora-Bot/bin/Release/Utils.dll index 1bc8581..feeddc7 100644 Binary files a/Lora-Bot/bin/Release/Utils.dll and b/Lora-Bot/bin/Release/Utils.dll differ diff --git a/Lora-Bot/bin/Release/config-example/settings.conf.example b/Lora-Bot/bin/Release/config-example/settings.conf.example index e90da3f..97156e0 100644 --- a/Lora-Bot/bin/Release/config-example/settings.conf.example +++ b/Lora-Bot/bin/Release/config-example/settings.conf.example @@ -2,7 +2,57 @@ path=/var/log/lorabot.log [lora] +type=Draginolora +pin_sspin=Pin06 +pin_dio0=Pin07 +pin_rst=Pin00 frequency=868100000 spreadingfactor=8 signalbandwith=125000 codingrate=6 + +;[lora] +;type=Ic880alora +;pin_sspin=Pin10 +;pin_rst=Pin21 +;spichan=Channel0 +; Set Basic Frequencies +;frequency0=867500000 +;frequency1=868500000 +; Set Per Virtual Interface IF0-7 (Freq means the offset to the basic frequency) +;interface0enable=true +;interface0chain=1 +;interface0frequency=-400000 +;interface1enable=true +;interface1chain=1 +;interface1frequency=-200000 +;interface2enable=true +;interface2chain=1 +;interface2frequency=0 +;interface3enable=true +;interface3chain=0 +;interface3frequency=-400000 +;interface4enable=true +;interface4chain=0 +;interface4frequency=-200000 +;interface5enable=true +;interface5chain=0 +;interface5frequency=0 +;interface6enable=true +;interface6chain=0 +;interface6frequency=200000 +;interface7enable=true +;interface7chain=0 +;interface7frequency=400000 +; Virtual Interface IF8 Lora Interface +;interface8enable=false +;interface8chain=1 +;interface8frequency=-200000 +;lorabandwith=250000 +;loraspreadingfactor=7 +; Virtual Interface IF9 FSK Interface +;interface9enable=false +;interface9chain=1 +;interface9frequency=300000 +;fskbandwith=125000 +;fskdatarate=50000 \ No newline at end of file diff --git a/Lora-Bot/bin/Release/litjson.dll b/Lora-Bot/bin/Release/litjson.dll index 343524c..6431e01 100644 Binary files a/Lora-Bot/bin/Release/litjson.dll and b/Lora-Bot/bin/Release/litjson.dll differ diff --git a/Lora-Bot/config-example/settings.conf.example b/Lora-Bot/config-example/settings.conf.example index e90da3f..97156e0 100644 --- a/Lora-Bot/config-example/settings.conf.example +++ b/Lora-Bot/config-example/settings.conf.example @@ -2,7 +2,57 @@ path=/var/log/lorabot.log [lora] +type=Draginolora +pin_sspin=Pin06 +pin_dio0=Pin07 +pin_rst=Pin00 frequency=868100000 spreadingfactor=8 signalbandwith=125000 codingrate=6 + +;[lora] +;type=Ic880alora +;pin_sspin=Pin10 +;pin_rst=Pin21 +;spichan=Channel0 +; Set Basic Frequencies +;frequency0=867500000 +;frequency1=868500000 +; Set Per Virtual Interface IF0-7 (Freq means the offset to the basic frequency) +;interface0enable=true +;interface0chain=1 +;interface0frequency=-400000 +;interface1enable=true +;interface1chain=1 +;interface1frequency=-200000 +;interface2enable=true +;interface2chain=1 +;interface2frequency=0 +;interface3enable=true +;interface3chain=0 +;interface3frequency=-400000 +;interface4enable=true +;interface4chain=0 +;interface4frequency=-200000 +;interface5enable=true +;interface5chain=0 +;interface5frequency=0 +;interface6enable=true +;interface6chain=0 +;interface6frequency=200000 +;interface7enable=true +;interface7chain=0 +;interface7frequency=400000 +; Virtual Interface IF8 Lora Interface +;interface8enable=false +;interface8chain=1 +;interface8frequency=-200000 +;lorabandwith=250000 +;loraspreadingfactor=7 +; Virtual Interface IF9 FSK Interface +;interface9enable=false +;interface9chain=1 +;interface9frequency=300000 +;fskbandwith=125000 +;fskdatarate=50000 \ No newline at end of file diff --git a/Lora-Bot/dpkg/control b/Lora-Bot/dpkg/control index 51c9246..707a74a 100644 --- a/Lora-Bot/dpkg/control +++ b/Lora-Bot/dpkg/control @@ -3,7 +3,7 @@ Version: x.x-x Section: base Priority: optional Architecture: any -Depends: mono-runtime (>= 5.16.0) +Depends: mono-runtime (>= 5.18), wiringpi (>= 2.46), libmono-posix4.0-cil (>= 5.18) Maintainer: BlubbFish Description: Lora-Bot Lora-Bot is a Lora gateway diff --git a/Lora-Bot/dpkg/make-deb.sh b/Lora-Bot/dpkg/make-deb.sh index 15ae06b..05cd44f 100644 --- a/Lora-Bot/dpkg/make-deb.sh +++ b/Lora-Bot/dpkg/make-deb.sh @@ -1,6 +1,6 @@ #!/bin/bash -HOMEDIR="/home/blubb" +HOMEDIR=$HOME ROOT="$HOMEDIR/deb" OUTPUT="../bin/Release" diff --git a/Lora-Bot/dpkg/postinst b/Lora-Bot/dpkg/postinst index 6c792d0..c141c5f 100644 --- a/Lora-Bot/dpkg/postinst +++ b/Lora-Bot/dpkg/postinst @@ -2,7 +2,8 @@ systemctl enable lorabot systemctl daemon-reload -if [[ $(systemctl is-active lorabot || true) == "active" ]] -then - service lorabot restart -fi + +if [ -f /tmp/lorabot_service_runner ]; then + service lorabot start + rm /tmp/lorabot_service_runner +fi \ No newline at end of file diff --git a/Lora-Bot/dpkg/prerm b/Lora-Bot/dpkg/prerm index 886ae8b..90902f3 100644 --- a/Lora-Bot/dpkg/prerm +++ b/Lora-Bot/dpkg/prerm @@ -1,3 +1,7 @@ #!/bin/bash -service lorabot stop +if [[ $(systemctl is-active lorabot || true) == "active" ]] +then + touch /tmp/lorabot_service_runner + service lorabot stop +fi \ No newline at end of file