Skip to content

Commit

Permalink
second try to fix arm64 rain delay display issue
Browse files Browse the repository at this point in the history
  • Loading branch information
rayshobby committed Jul 27, 2023
1 parent cc0b088 commit 9d8f8b0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ if [ "$1" == "demo" ]; then
echo "Installing required libraries..."
apt-get install -y libmosquitto-dev
echo "Compiling firmware..."
g++ -o OpenSprinkler -DDEMO -std=c++14 -m32 main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp -lpthread -lmosquitto
g++ -o OpenSprinkler -DDEMO -std=c++14 main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp -lpthread -lmosquitto
elif [ "$1" == "osbo" ]; then
echo "Installing required libraries..."
apt-get install -y libmosquitto-dev
echo "Compiling firmware..."
g++ -o OpenSprinkler -DOSBO main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp -lpthread -lmosquitto
g++ -o OpenSprinkler -DOSBO -std=c++14 main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp -lpthread -lmosquitto
else
echo "Installing required libraries..."
apt-get update
Expand All @@ -31,7 +31,7 @@ else
exit 0
fi
echo "Compiling firmware..."
g++ -o OpenSprinkler -DOSPI main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp -lpthread -lmosquitto
g++ -o OpenSprinkler -DOSPI -std=c++14 main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp -lpthread -lmosquitto
fi

if [ ! "$SILENT" = true ] && [ -f OpenSprinkler.launch ] && [ ! -f /etc/init.d/OpenSprinkler.sh ]; then
Expand Down
6 changes: 2 additions & 4 deletions opensprinkler_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,11 @@ class BufferFiller {
c = pgm_read_byte(fmt++);
switch (c) {
case 'D':
//wtoa(va_arg(ap, uint16_t), (char*) ptr);
itoa(va_arg(ap, int), (char*) ptr, 10); // ray
break;
case 'L':
//ltoa(va_arg(ap, long), (char*) ptr, 10);
//ultoa(va_arg(ap, long), (char*) ptr, 10); // ray
sprintf((char*) ptr, "%lu", va_arg(ap, long));
ultoa(va_arg(ap, uint32_t), (char*) ptr, 10);
//sprintf((char*) ptr, "%lu", va_arg(ap, uint32_t));
break;
case 'S':
strcpy((char*) ptr, va_arg(ap, const char*));
Expand Down

0 comments on commit 9d8f8b0

Please sign in to comment.