Merge branch 'master' of card10:card10/logix

_index.md

@@ -6,7 +6,7 @@ if you still have a voucher (white or blue), bring it to congress and you might
 
 No sale of card10s!
 
-## current firmware version: JerusalemArtichoke (as of 2019-09-05 - 21:42)
+## current firmware version: Karotte (as of 2019-09-24)
 It is very easy to [update your card10 firmware](/en/firmwareupdate) with just a USB-C cable. The update instructions
 also contain a list of the existing firmware releases.
 
@@ -41,10 +41,10 @@ Spare me the details just give me the links to the docs!
   - [`twitter.com/card10badge`](https://twitter.com/card10badge)
 
 ### [FAQ](/en/faq)
-<!--- Please add this also to en/events.md -->
 
 ### Events
   - Ongoing:
-     - **card10 reworking/soldering/firmware/etc.**: card10 village (R8):
-       - firmware work, please bring your laptop with a clone of the firmware git and the [toolchain](https://firmware.card10.badge.events.ccc.de/how-to-build.html)
+  - Upcoming:
+    - card10 [workout in Berlin](en/workouts/berlin-2019-10-03): xHain, Thurs-Sun, October 3rd to 6th, 2019
 
+  Events [archive](en/events).

en/ecg_kit_assembly.md

@@ -57,7 +57,9 @@ Have fun and hack ECG stuff
 
 
 #### ECG
-Place the electrodes on your chest as shown in the picture and connect the USB-C connector with the USB symbol downwards. After starting the ECG application on your Card10 press the right lower button (RIGHT) to switch over to ECG over USB. If you want to start logging your ECG data press the lower left button (LEFT) to start and stop logging.
+Place the electrodes on your chest as shown in the picture and connect the USB-C connector with the USB symbol downwards. After starting the ECG application on your Card10 press the right lower button (RIGHT) to switch over to ECG over USB.
+
+If you want to start logging your ECG data press the lower left button (LEFT) to start and stop logging. Log files are written to the filesystem (ecg-\<time\>.log) and can be transferred to a computer using the boot loader. You can visualize them with Audacity: Use File→Import→Raw Data, select the log file, then use Signed 16-bit PCM, Little Endian, 1 Channel, offset 0, amount 100% and sample rate 128 Hz. Normalize the amplitude by selecting the entire track (Ctrl-A), then use Effect→Amplify and keep the suggested Amplification value.
 
 #### Eye movement detection and muscle activity
 To detect eye movements like fast movements to the left or right or to detect REM phase while at sleep, place your electrodes on your temples.

en/events.md

@@ -3,13 +3,13 @@ title: Events
 ---
 <!-- Please keep ongoing and current events in sync with _index.md -->
 - Ongoing:
-   - **card10 reworking/soldering/firmware/etc.**: card10 village (R8); for firmware work, please bring your laptop with a clone of the firmware git and the [toolchain](firmware.card10.badge.events.ccc.de/how-to-build.html)
 - Upcoming:
-   ...
+  - card10 [workout in Berlin](/en/workouts/berlin-2019-10-03): xHain, Thurs-Sun, October 3rd to 6th, 2019
 
 
 <!-- past events, please remove any events you move here from _index.md to keep the home page clean -->
 - Previous
+ - **card10 reworking/soldering/firmware/etc.**: card10 village (R8); for firmware work, please bring your laptop with a clone of the firmware git and the [toolchain](firmware.card10.badge.events.ccc.de/how-to-build.html)
  - card10 Soldering Session in Berlin: xHain Wed-Thurs 14&15. August starting at 10 am
  - card10 Soldering Session in Berlin: xHain Sat-Sun 10.-11. August starting at 10 am
  - card10 meetup in Berlin: xHain 06.08. ~~19:00~~ => 20:00

en/firmwareupdate.md

 ---
 title: Current Release
 ---
-# Current: JerusalemArtichoke (2019-09-05 21:42)
-- Firmware Download: https://card10.badge.events.ccc.de/release/card10-v1.10-JerusalemArtichoke.zip
-- [Changelog](https://git.card10.badge.events.ccc.de/card10/firmware/blob/master/CHANGELOG.md#v110-2019-09-05-2142-jerusalemartichoke)
+# Current: Karotte (2019-09-24)
+- Firmware Download: https://card10.badge.events.ccc.de/release/card10-v1.11-Karotte.zip
+- [Changelog](https://git.card10.badge.events.ccc.de/card10/firmware/blob/master/CHANGELOG.md#v111-2019-09-24-karotte)
 
 # Update the firmware release on your card10
 * download the current firmware `.zip` file to your computer
@@ -14,6 +14,10 @@ title: Current Release
 * switch your card10 off and on again
 
 # Previous Releases
+# JerusalemArtichoke (2019-09-05 21:42)
+- Firmware Download: https://card10.badge.events.ccc.de/release/card10-v1.10-JerusalemArtichoke.zip
+- [Changelog](https://git.card10.badge.events.ccc.de/card10/firmware/blob/master/CHANGELOG.md#v110-2019-09-05-2142-jerusalemartichoke)
+
 # IcebergLettuce (2019-08-28 23:23)
 - Firmware Download: https://card10.badge.events.ccc.de/release/card10-v1.9-IcebergLettuce.zip
 - **Jailbreak relase is no longer necessary! You need to adjust card10.cfg now.**

en/workouts/berlin-2019-10-03.md

+---
+title: Workout Berlin 2019-10-03
+---
+
+The first card10 workout will happen at xHain in Berlin from October 3rd to 6th, 2019.
+
+## Location and Times
+
+- Location: [xHain](https://x-hain.de/en/page/about/): Grünberger Str. 16, 10243 Berlin
+- Times:  2019-10-03 to 2019-10-06, all day in general, details to follow
+- Capacity: Around 10-20 people
+
+## People
+ - rahix
+ - lilafisch
+ - peter
+ - schneider
+ - hds
+ - paulaner
+ - YOU?
+
+## Activities
+### Firmware
+We will most likely work on integating more Merge Requests into the firmware, creating a new release.
+
+### Hardware
+If you have issues with your hardware swing by and we can see if there is a quick fix. We will have spare parts!
+
+### Software
+We plan to experiment with some more phones to improve BLE support. If you want to work on the wiki feel free too.
+Lots of people wo know around ;)
+
+### Wearware
+We still have plenty of conductive thread and a lot of ideas. Do you have some too?
+
+## Events
+
+We can make us of xHain during the times as mentioned above. If you want to allocate some time
+for specific workshops or similar, mention it here:
+
+Title | Person | Start Time / Day | Duration
+------|--------|------------------|---------
+ECG logging documentation /experiments | schneider | Thursday 13:00 | 4 hours
+@Berlindroid-Meetup | | Thursday 19:00 | 5 hours
+card10 repair cafe | schneider | Friday 14:00 | 2 hours
+card10 team lunch? | all | Friday 15:30 | 1.5 hours
+generative 3D printed card10 cover design | Niklas Roy | Friday 17:30 | 1.5 hours
+MicroPython introduction | lilafisch | Friday 20:00 | 1.5 hours
+app discovery | lilafisch | Saturday 11:00 | 1.5 hours
+card10 repair cafe | schneider | Saturday 14:00 | 2 hours
+card10 documentation | lilafisch | Saturday 14:00 | 2 hours
+Sewing wearables | lilafisch | Saturday 16:00 | 2.5 hours
+card10 @ 36C3 #1 (dinner) | schneider | Saturday 18:30 | 1.5 hours
+BME680 hacking | schneider | Saturday 20:00 | 4 hours
+card10 repair cafe | schneider | Sunday 14:00 | 2 hours
+card10 @ 36C3 #2 (also: next workout)| schneider | Sunday 16:30 | 1.5 hour
+
+### generative 3D printed card10 cover design
+Learn more about the generative 3D printed card10 covers (https://github.com/royrobotiks/card10_cover),
+get inspired for you own generative designs, and learn skills for implementing them with openSCAD.
+
+### MicroPython introduction
+If you haven't dared trying to write your own apps for your card10, now is your chance
+to learn how to do it! Programming your card10 using MicroPython is easy to learn, and all
+you need is your laptop (preferably linux), a usb-C cable, and of course your card10.
+
+### App discovery
+There are hundreds of card10 apps in the hatchery. Let's start the day by exchanging our
+favourite discoveries, and trying some new ones.
+
+### Card10 @ 36C3
+Camp is over, but congress is already coming up! Everyone is welcome to join collecting ideas and planning
+card10 action for congress.
+
+### Repair cafe
+Open hardware means you can fix it! We're bringing some spare parts, and
+plenty of assistance is around, so together we can restore the broken bits of some card10s.
+
+Obviously, you should bring your card10 if you want to fix it ;), everything else will be around at the event.
+
+### Documentation
+Let's get together and make an effort to share what we know, or ask some new questions that
+need answering and documenting.
+
+Bring questions :) Also, a laptop will be very useful for writing documentation.
+
+### Sewing wearables
+Extend your card10 on the wristband, with some blinking LEDs. We'll have needles, thread, and LEDs.
+
+You should definitely bring your card10, you can also bring your own LEDs, or
+if you have any wearable sensors you'd like to attach we can try to figure out how to 
+connect them to your card10 together.
+
+## Accomodation
+
+xHain is not a place to sleep, so please make sure you have some accomodation. Get in touch with us on IRC/Matrix if you don't know.