Commit d4ada0b7 authored by schneider's avatar schneider
Browse files

Merge branch 'master' into 'master'

Minor edit to the docstrings of personal_state. Colors for the camp and...

See merge request !228
parents a58d52f8 3743f9ed
Pipeline #3233 passed with stages
in 3 minutes and 2 seconds
......@@ -816,9 +816,9 @@ enum personal_state {
STATE_NO_CONTACT = 1,
/** ``2``, "chaos" - Adventure time - blue led, short blink, long blink. */
STATE_CHAOS = 2,
/** ``3``, "communication" - want to learn something or have a nice conversation - green led, long blinks. */
/** ``3``, "communication" - want to learn something or have a nice conversation - yellow led, long blinks. */
STATE_COMMUNICATION = 3,
/** ``4``, "camp" - I am focussed on self-, camp-, or community maintenance - yellow led, fade on and off. */
/** ``4``, "camp" - I am focussed on self-, camp-, or community maintenance - green led, fade on and off. */
STATE_CAMP = 4,
/** STATE_MAX gives latest value and count of possible STATEs**/
STATE_MAX = 5,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment