Skip to content

Commit

Permalink
[v1.7.0] Add support for IC880A Board
Browse files Browse the repository at this point in the history
  • Loading branch information
blubbfish committed Jan 29, 2019
1 parent e54d8b6 commit 73efe37
Show file tree
Hide file tree
Showing 18 changed files with 118 additions and 93 deletions.
7 changes: 1 addition & 6 deletions Lora-Bot/Lora-Bot.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup />
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -82,9 +80,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.manifest">
<SubType>Designer</SubType>
</None>
<None Include="config-example\scral.conf.example">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
Expand Down
9 changes: 5 additions & 4 deletions Lora-Bot/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand All @@ -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
Expand All @@ -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
*/
76 changes: 0 additions & 76 deletions Lora-Bot/app.manifest

This file was deleted.

Binary file modified Lora-Bot/bin/Release/Bot-Utils.dll
Binary file not shown.
Binary file modified Lora-Bot/bin/Release/ConnectorDataMqtt.dll
Binary file not shown.
Binary file modified Lora-Bot/bin/Release/Iot-Interfaces.dll
Binary file not shown.
Binary file modified Lora-Bot/bin/Release/Lora-Bot.exe
Binary file not shown.
Binary file modified Lora-Bot/bin/Release/Lora.dll
Binary file not shown.
Binary file modified Lora-Bot/bin/Release/M2Mqtt.dll
Binary file not shown.
Binary file modified Lora-Bot/bin/Release/Utils-IoT.dll
Binary file not shown.
Binary file modified Lora-Bot/bin/Release/Utils.dll
Binary file not shown.
50 changes: 50 additions & 0 deletions Lora-Bot/bin/Release/config-example/settings.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified Lora-Bot/bin/Release/litjson.dll
Binary file not shown.
50 changes: 50 additions & 0 deletions Lora-Bot/config-example/settings.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Lora-Bot/dpkg/control
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Description: Lora-Bot
Lora-Bot is a Lora gateway
2 changes: 1 addition & 1 deletion Lora-Bot/dpkg/make-deb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

HOMEDIR="/home/blubb"
HOMEDIR=$HOME
ROOT="$HOMEDIR/deb"
OUTPUT="../bin/Release"

Expand Down
9 changes: 5 additions & 4 deletions Lora-Bot/dpkg/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 5 additions & 1 deletion Lora-Bot/dpkg/prerm
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 73efe37

Please sign in to comment.