From 6cff7aa602ba6f8feaf8c7f8e95dc37ea71fe49e Mon Sep 17 00:00:00 2001 From: Luke McKenzie Date: Sat, 22 Feb 2020 22:31:14 -0600 Subject: [PATCH 1/2] Don't need separate version file --- arduino-nixie/arduino-nixie.ino | 17 ++++------------- arduino-nixie/version.h | 3 --- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 arduino-nixie/version.h diff --git a/arduino-nixie/arduino-nixie.ino b/arduino-nixie/arduino-nixie.ino index 1608c18..bf67757 100644 --- a/arduino-nixie/arduino-nixie.ino +++ b/arduino-nixie/arduino-nixie.ino @@ -9,21 +9,12 @@ #include "configs/v8c-6tube.h" -#include "song.h" - -// Song woody(0); //declare a Song object called woody -// -// void setup(){ -// woody.play(); -// } -// -// void loop(){ -// woody.check(false); -// } - +////////// Software version ////////// +const byte vMajor = 1; +const byte vMinor = 6; +const byte vPatch = 0; ////////// Other includes, global consts, and vars ////////// -#include "version.h" #include //Arduino - GNU LPGL #include //Arduino - GNU LPGL #include //NorthernWidget - The Unlicense diff --git a/arduino-nixie/version.h b/arduino-nixie/version.h deleted file mode 100644 index 6bb2545..0000000 --- a/arduino-nixie/version.h +++ /dev/null @@ -1,3 +0,0 @@ -const byte vMajor = 1; -const byte vMinor = 6; -const byte vPatch = 0; \ No newline at end of file From 52a55c49ce5ea3067785854ffe6dd30e145e72db Mon Sep 17 00:00:00 2001 From: Luke McKenzie Date: Sat, 22 Feb 2020 22:33:39 -0600 Subject: [PATCH 2/2] rogue serial print --- README.md | 2 +- arduino-nixie/arduino-nixie.ino | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 1a7a2b0..2bdf175 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ If your clock is equipped with an **Alt** button, it will do one of two things ( * In most cases, the **Alt** button works as a function preset, similar to a preset button in a car radio. While viewing the function you want quick access to, hold **Alt** until it beeps twice; then you can use **Alt** to jump straight to that function. It works best for Alarm or Timer. - * TIP: If used with Alarm, the **Alt** button will also toggle the “skip” state – so to skip or unskip the next alarm, you only need to press the **Alt** button twice: once to show it, and once to change it. + * TIP: If used with Alarm, the **Alt** button will also toggle the skip mode – so to skip or unskip the next alarm, you only need to press the **Alt** button twice: once to display it, and once to change it. * If your clock has a switched relay with soft power switch enabled, the **Alt** button switches the relay on and off – great for using the clock as an appliance timer. diff --git a/arduino-nixie/arduino-nixie.ino b/arduino-nixie/arduino-nixie.ino index bf67757..65f9aa1 100644 --- a/arduino-nixie/arduino-nixie.ino +++ b/arduino-nixie/arduino-nixie.ino @@ -1214,7 +1214,6 @@ void displaySun(char which, int d, int tod){ //Old code to calculate sun at display time, with test serial output, is in commit 163ca33 //which is 0=prev, 1=next int evtTime = 0; bool evtIsRise = 0; - serialPrintTime(tod); if(d==sunDate){ //displaying same day as calc //before sunrise: prev is calcday-1 sunset, next is calcday sunrise //daytime: prev is calcday sunrise, next is calcday sunset