X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ChangeLog;h=e05b9586d9001755911853ae0a22140601e9822b;hb=b340cbf1403a5f5b181a215935f713a50da8e5e4;hp=e25234b26d884b8137c855465a9a7ab474904dc4;hpb=3a2a5a05bb6372d9003905cee7afdfcd6d38ae7e;p=fw%2Faltos diff --git a/ChangeLog b/ChangeLog index e25234b2..e05b9586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,1575 @@ +commit 4e9e0bf99d6b71086110038fa1e3231d00bb2496 +Author: Keith Packard +Date: Mon Dec 31 15:20:57 2018 -0800 + + Update to version 1.9 + + Signed-off-by: Keith Packard + +commit f62ac01979a403f6a05f119201a62a8ffc217c73 +Author: Keith Packard +Date: Mon Dec 31 15:20:23 2018 -0800 + + Change Releasing to reflect asciidoctor switch + + Don't need to hack .xml files anymore (yay!) + + Signed-off-by: Keith Packard + +commit bed019b64d9e37f276ad5aa2dabb7681aae122ec +Author: Keith Packard +Date: Mon Dec 31 15:17:01 2018 -0800 + + doc: Add 1.9 release notes + + Signed-off-by: Keith Packard + +commit f9fdbfade5e2d203d2ca5378e4f2a65beae4a19f +Author: Keith Packard +Date: Mon Dec 31 15:17:42 2018 -0800 + + doc: Set doc version to 1.9 + + Signed-off-by: Keith Packard + +commit ec8df548e3f6fd5d809238e2e60a0844775f551a +Author: Keith Packard +Date: Mon Dec 31 15:17:20 2018 -0800 + + doc: Add EasyMega v2.0 specs + + Signed-off-by: Keith Packard + +commit 58fb7e53989f67fe8d793d7b3ddad8e41682cfbe +Author: Keith Packard +Date: Mon Dec 31 15:18:08 2018 -0800 + + doc: Update doc/RELNOTES to adapt to asciidoctor change + + Moving to asciidoctor means changing our doc release process + + Signed-off-by: Keith Packard + +commit bb3f961022032390bfac6104ea4136354df67689 +Author: Keith Packard +Date: Sun Dec 30 14:28:07 2018 -0800 + + Add shipping products to fat_altos target, note that in Releasing + + These bits are used to build alpha/beta releases, so they should + support all existing products. + + Signed-off-by: Keith Packard + +commit 60b46436f9f642d43be4e00df08eccadb57214e8 +Author: Bdale Garbee +Date: Mon Dec 31 12:37:45 2018 -0700 + + ao-bringup: get turnon_easymega working for v2.0 + +commit 9791ebb256c2892663c072f7989e4b9bd34818a1 +Author: Keith Packard +Date: Sun Dec 30 14:15:51 2018 -0800 + + altoslib: Remove spurious debug printf in AltosCalData + + Signed-off-by: Keith Packard + +commit 0d472ab07224a21abfa83da8336439d7844f9aa8 +Author: Keith Packard +Date: Sun Dec 30 14:11:03 2018 -0800 + + altos: Don't validate ADXL375 self test for maximum value + + The data sheet says this is unreliable, and that we should be using an + FFT anyways. + + Signed-off-by: Keith Packard + +commit 4fb00afc9018c6179c4aff897fcbb330588d02a2 +Author: Keith Packard +Date: Sun Dec 30 13:42:50 2018 -0800 + + altos: Make HAS_ACCEL_DEBUG build again + + Need to not use ao_error_h_sq_avg without HAS_ACCEL + + Signed-off-by: Keith Packard + +commit 84c04a114898d97a13f61e1006949dc3926eeba1 +Author: Bdale Garbee +Date: Sun Dec 30 15:16:29 2018 -0700 + + update easymega turn-on script for v2.0 + +commit e9a3268285e97b7316c3321892e77814703ff71d +Author: Keith Packard +Date: Thu Nov 1 19:40:31 2018 -0700 + + doc: Use icons for admonitions + + This replaces the text 'WARNING' or 'NOTE' with a suitable icon instead. + + Signed-off-by: Keith Packard + +commit d859a7f65baf6c5c170f14fb2d9401b5c607a254 +Author: Keith Packard +Date: Thu Oct 25 17:01:38 2018 -0700 + + doc: Remove asciidoc related files + + These all helped asciidoc generate documentation + + Signed-off-by: Keith Packard + +commit 41fed74c4cf139de6bf8f1879d370977785ad1f8 +Author: Keith Packard +Date: Thu Oct 25 16:56:24 2018 -0700 + + Remove cc1111 products from 'fat_altos' list, which is used for keithp-fat + + Signed-off-by: Keith Packard + +commit 6d80b89c0bd82133dd5c93df8604f562ac49c19a +Author: Keith Packard +Date: Thu Oct 25 16:50:17 2018 -0700 + + doc: Switch to asciidoctor to format docs + + asciidoc and a2x are no longer actively maintained and Debian policy + encourages people to move away from them to asciidoctor. + + Signed-off-by: Keith Packard + +commit cf3e524e50a6fae2862efb404c9918b74438e9c9 +Author: Keith Packard +Date: Tue Oct 23 16:07:09 2018 -0700 + + Generate LED icons on the fly. Include SVG versions. + + This builds the required LED images from source code. + + Signed-off-by: Keith Packard + +commit e9915aad4fe97cd253b88805646085c64181baef +Author: Keith Packard +Date: Mon Oct 22 16:48:56 2018 -0700 + + Don't force CFLAGS from top level + + Let the system defaults control this value. + + Signed-off-by: Keith Packard + +commit cf7b2e065d844d290ee43449ae37162839220158 +Author: Keith Packard +Date: Mon Oct 22 16:48:04 2018 -0700 + + ao-tools: Spelling fixes in a couple of man pages + + ao-dbg.1 and ao-eeprom.1 + + Signed-off-by: Keith Packard + +commit 1812adbd61400af19293bf775e544baf661ec224 +Author: Keith Packard +Date: Mon Oct 22 16:47:20 2018 -0700 + + Add keywords to .desktop files + + Makes applications easier to find with search + + Signed-off-by: Keith Packard + +commit 48e221cca00c9f925ff57588dd782842705f7a23 +Author: Keith Packard +Date: Sat Oct 20 17:29:36 2018 -0700 + + altoslib: When flashing hardware, pull USB data from device if needed + + If we fail to extract USB vid/pid and product values from the device + ROM, use the data discovered over USB when the device was originally + discovered. + + Also, use the USB product to select appropriate .ihx files instead of + only using the USB vid/pid. This will help people avoid using the + wrong file when reflashing devices. + + Signed-off-by: Keith Packard + +commit 345e3c37a1cf619392b54589bb91b4caf7844810 +Author: Keith Packard +Date: Sat Oct 20 17:26:53 2018 -0700 + + altos/easymega-v2.0: Handle different mpu9250 orientation + + The mpu9250 on EasyMega v2.0 is rotated 90° compared with EasyMega v1 + and TeleMega IMU devices. + + Signed-off-by: Keith Packard + +commit 8c92656576aff3ceab5bead3c835d96c36098fe7 +Author: Keith Packard +Date: Sat Oct 20 17:24:41 2018 -0700 + + altoslib: Add support for EasyMega-v2 + + adxl375 instead of mma6555. + mpu9250 rotated 90° compared with other megas. + + Signed-off-by: Keith Packard + +commit f13e294d4644096b0529383c1d60d5e4b7916d76 +Author: Keith Packard +Date: Sat Oct 20 17:22:59 2018 -0700 + + altoslib: Add support for TeleGPS v2 + + The battery voltage ADC values are different from TeleGPS v1 (max 4095 + instead of 32767). + + Signed-off-by: Keith Packard + +commit c01514fa1e0a2cea3955c71a833b4a21b3d33f24 +Author: Keith Packard +Date: Sat Oct 20 07:34:57 2018 -0700 + + altos/adxl375: Clean up initialization, shortening self test period + + Set the self test period to that suggested in the documentation. + Eliminate some debug variables. + + Signed-off-by: Keith Packard + +commit 0686a7b8aec524d81bda4c572549a3a068ce0eed +Merge: 6aa451ce cc528f1f +Author: Bdale Garbee +Date: Sat Oct 20 01:18:12 2018 -0600 + + Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos + +commit 6aa451ce81bfdfe679e3f9902043a5f0d235c745 +Author: Bdale Garbee +Date: Sat Oct 20 01:17:39 2018 -0600 + + altoslib: fix computation of TeleGPS battery voltage + +commit cc528f1ff0271ec6488a1a7b91c731183502101e +Author: Keith Packard +Date: Fri Oct 19 13:20:31 2018 -0700 + + altosui: Add EasyMega v2.0 firmware to release + + Signed-off-by: Keith Packard + +commit 1e4b8674d874a190eca1a98a397aaf0a9d15bda1 +Author: Keith Packard +Date: Fri Oct 19 13:19:03 2018 -0700 + + altoslib: Add ADXL375 support and EasyMega v2.0 support + + EasyMega v2.0 replaces the MMA655X with an ADXL375 part. + + Signed-off-by: Keith Packard + +commit 3fd320ea38f2945f5611a09a0e48d16db467d105 +Author: Keith Packard +Date: Fri Oct 19 08:41:51 2018 -0700 + + altos: Add EasyMega v2.0 to default build + + Signed-off-by: Keith Packard + +commit f49763bf4a6cd8b2a47abfbec7ef3d8c8c029b8f +Author: Keith Packard +Date: Sat Oct 13 09:43:25 2018 -0700 + + altos/easymega-v2.0: Add adxl375, replace mpu6000 with 9250 [v2] + + Should reflect current hardware design now. + + v2: + Use SPI mode 3 for ADXL375 + Invert ADXL375 values + + Signed-off-by: Keith Packard + +commit 6fdc392ef1b624c06e26e7a053c3579435c455d5 +Author: Keith Packard +Date: Sat Oct 13 09:46:01 2018 -0700 + + altos/easymega-v2.0: Change binary to easymega-v2.0 instead of easymega-v1.0 + + Signed-off-by: Keith Packard + +commit 30e4e286eec31e69ad1e69a44cf00d4549a09f88 +Author: Keith Packard +Date: Sat Oct 13 09:41:31 2018 -0700 + + altos: Add ADXL375 driver [v2] + + Includes self-test code and multi-byte mode operation for reading + sample registers. + + Signed-off-by: Keith Packard + +commit 33bb97b9637bdabe4360269889e20fcc50ef9886 +Author: Keith Packard +Date: Mon Oct 15 11:15:31 2018 -0700 + + altos/stm: Support SPI modes other than 0 + + ADXL375 requires SPI mode 3. + + Signed-off-by: Keith Packard + +commit dbc52686c6d9808275c35e0c9c987cbbd9f7859d +Author: Keith Packard +Date: Sat Oct 13 13:42:34 2018 -0700 + + altos/stm: Make beeper driver support all possible tim234 configs + + And update all users to be explicit about the desired config. + + Signed-off-by: Keith Packard + +commit 80affca535c5c43a5d9963dfafc74f9675c9b155 +Author: Keith Packard +Date: Fri Oct 19 08:12:22 2018 -0700 + + altos: Create ao_data_fill shared function + + This fills a data ring entry with all of the current sensor values + other than the ADC. It is used in all of the adc completion functions. + + Signed-off-by: Keith Packard + +commit facf790f469df374257440ba9482321cbab7cecb +Author: Bdale Garbee +Date: Sat Oct 13 10:17:47 2018 -0600 + + altos: remove usbtrng support (chaoskey prototypes) + +commit 59f66e3264a48d8586dcbd12f6f0fa91e2e1ecdc +Author: Bdale Garbee +Date: Sat Oct 13 10:12:39 2018 -0600 + + altos: remove telescience support + +commit 758c8c27ba1819b5d90fda9e9ba6d15f5e8598e0 +Author: Bdale Garbee +Date: Sat Oct 13 10:02:13 2018 -0600 + + altos: remove teledongle-v1.8 support (what was that, anyway?!?) + +commit 3620f09329ccae817fe3ec2f9c2c588ebbfa149b +Author: Bdale Garbee +Date: Sat Oct 13 09:59:22 2018 -0600 + + altos: remove megadongle-v0.1 support, never went beyond prototype + +commit 2da09b9f5649786f202aa0f295ead728939eddae +Author: Bdale Garbee +Date: Sat Oct 13 09:57:44 2018 -0600 + + altos: remove telepyro-v0.1 support, which was never completed anyway + +commit 41ebb27230de6385a01c111c299bb22b1cb0badf +Author: Bdale Garbee +Date: Sat Oct 13 09:55:03 2018 -0600 + + altos: remove teleterra-v0.1, also an ancient cc1111 project + +commit 983c36782527078ce667feb9eccd1ed0b97fbc29 +Author: Keith Packard +Date: Sat Oct 13 08:33:49 2018 -0700 + + altos/drivers: Use stdbool in ao_ms5607.c + + We don't have TRUE and FALSE anymore (they were pdclib specific). + + Signed-off-by: Keith Packard + +commit 346fdfb469f7f3c1f87a39dee5bfb4568631c28b +Author: Keith Packard +Date: Sat Oct 13 08:27:41 2018 -0700 + + altos: Remove pdclib bits from Makefile + + Signed-off-by: Keith Packard + +commit cf21c87f9f3e1a75dba39ab41dfffb629586935d +Author: Keith Packard +Date: Sat Oct 13 08:27:17 2018 -0700 + + Remove .gitmodules + + We no longer use submodules (yay!) + + Signed-off-by: Keith Packard + +commit 815d537e0fa6503b2a83d92d94c734eaee15987b +Author: Keith Packard +Date: Sat Oct 13 08:26:02 2018 -0700 + + Bump version to 1.8.7.1 + + Tag development versions + + Signed-off-by: Keith Packard + +commit 408badbef80d7a3412b5ad92b269be19d0faaa09 +Author: Keith Packard +Date: Tue Oct 2 12:48:25 2018 -0700 + + altos/stm32f4-disco: Start hooking up stm32f413 USB for the disco board + + Non-working as yet. + + Signed-off-by: Keith Packard + +commit 805d218ff50e6c38345c0d4e46f568009132633e +Author: Keith Packard +Date: Tue Oct 2 12:46:19 2018 -0700 + + altos/stm32f4: Add start of stm32f413 USB support + + This code doesn't work yet. + + Signed-off-by: Keith Packard + +commit 4a246b4cb5ee8e8894ea3492187a08e1e4f719bb +Author: Keith Packard +Date: Tue Oct 2 12:46:01 2018 -0700 + + altos/stm32f4: Add stm32f413 USART support + + Signed-off-by: Keith Packard + +commit 600689b39d9bc604b0a8b586c8a93a465a42fc3b +Author: Keith Packard +Date: Tue Oct 2 12:45:39 2018 -0700 + + altos/stm32f4: Add external interrupt bits + + Signed-off-by: Keith Packard + +commit 015d3055a52532070e96469907683c3aa3eda44e +Author: Keith Packard +Date: Tue Oct 2 12:44:58 2018 -0700 + + altos/stm32f4: Add more stm32f413 definitions and support code + + Signed-off-by: Keith Packard + +commit 44ae8b9317fa4aaccabbe9d07b5972f7dfd3baa2 +Author: Keith Packard +Date: Tue Sep 11 18:53:15 2018 -0700 + + altos: Clean up AO_ROMCONFIG bits + + Remove address parameter (doesn't work with gcc), create shared + ao_romconfig in kernel. + + Signed-off-by: Keith Packard + +commit 32463323d888d2b36d4b993d82e2522e1b236299 +Author: Keith Packard +Date: Tue Sep 11 18:51:59 2018 -0700 + + altos/stm32f4-disco: Hook up serial console. Add scheme + + Signed-off-by: Keith Packard + +commit bb9d3d3bb1ae6223a7b910bc49ea8af5544a64d7 +Author: Keith Packard +Date: Tue Sep 11 18:50:45 2018 -0700 + + altos/stm32f4: Place ARM.exidx sections after .text + + This makes the linker happy about not attempting to merge unordered + and ordered stuff (whatever that means...) + + Signed-off-by: Keith Packard + +commit cd151a622537e1436362bd71229c6ce22a3957d0 +Author: Keith Packard +Date: Tue Sep 11 18:50:15 2018 -0700 + + altos/stm32f4: Use full printf/scanf (including floats) + + Signed-off-by: Keith Packard + +commit 0b5ac831d2e63a091833c702b07b0331fba32e72 +Author: Keith Packard +Date: Tue Sep 11 18:49:22 2018 -0700 + + altos/stm32f4: Add usart driver for usart6 + + This is what the disco board hooks up. + + Signed-off-by: Keith Packard + +commit 23075d174d2bff8ff3f3deef3c3d90b83da6bd2e +Author: Keith Packard +Date: Tue Sep 11 18:46:52 2018 -0700 + + altos/stm32f4: Align stack to 8 bytes + + This makes sure that doubles are aligned properly when passed on the stack. + + Signed-off-by: Keith Packard + +commit 71248c899676e0c2f3a478c63dec0d005b2458e6 +Author: Keith Packard +Date: Tue Sep 11 12:03:27 2018 -0700 + + altos/stm32f4-disco: Add .gitignore + + Signed-off-by: Keith Packard + +commit 2cdb1f30c49ba460b0850d23ba9c85e0336af290 +Author: Keith Packard +Date: Tue Sep 11 11:57:50 2018 -0700 + + altos: Add generic LED driver. + + This driver uses the generic GPIO functions and allows per-LED port + and pin configuration. It supports up to 32 LEDs. + + Rename SoC-specific LED drivers. + + Remove enabled parameter to ao_led_init + + Signed-off-by: Keith Packard + +commit cdaa0d7b272505c49017f409b7c0b8e3240608f0 +Author: Keith Packard +Date: Tue Sep 11 10:40:24 2018 -0700 + + altos: Eliminate 'pin' field from GPIO functions + + This was used with the 8051 bit-addressing mode to provide + single-instruction access to GPIO pins. + + Signed-off-by: Keith Packard + +commit f7ca88282466c271bad5e25e804729580fe83c47 +Author: Keith Packard +Date: Tue Sep 11 01:28:03 2018 -0700 + + altos/stm32f4: Fix clock configuration + + Was running the PLL input too slow (it wants 2MHz). + Was configuring the PLL_P factor wrong (needs magic values, not P + value) + + Set up clock debugging for PA8 and PC9 output. Enable on disco board + for debugging. + + Signed-off-by: Keith Packard + +commit 621d1529d6bc07a3f4bd27fb2d02d5b3161a3a6a +Author: Keith Packard +Date: Tue Sep 11 00:08:17 2018 -0700 + + altos/stm32f4: Add STM32F413 disco board support + + Discovery development board + + Signed-off-by: Keith Packard + +commit b7a21bf6a086748b4907c0577eaa114445995783 +Author: Keith Packard +Date: Tue Sep 11 00:07:38 2018 -0700 + + altos/stm32f4: Start adding support for STM32F413 + + Enough to get clocks lit up at least. + + Signed-off-by: Keith Packard + +commit f037d0091a4b31c631d64e71441953eb9b3b21ce +Author: Keith Packard +Date: Tue Oct 2 12:47:00 2018 -0700 + + altos: Remove 8051-ism from ao_usb.h + + __at doesn't exist for non-8051 + + Signed-off-by: Keith Packard + +commit b8e607960f2f399fd6ba92a8c97ab72e19812d3f +Author: Keith Packard +Date: Tue Sep 11 00:05:38 2018 -0700 + + altos: Delete random 8051 ISR declarations + + Signed-off-by: Keith Packard + +commit a76829a4a840261e33869c40b3366fff3b691069 +Author: Keith Packard +Date: Wed Aug 15 22:44:17 2018 -0700 + + altos: Allow application-specific prompts for ao_cmd_readline + + Lets other readline users specify alternate prompts. + + Signed-off-by: Keith Packard + +commit 684741765117611b7d666efbdfafd87c6199752c +Author: Keith Packard +Date: Wed Aug 15 19:17:19 2018 -0700 + + altos: Use stdbool true/false instead of TRUE/FALSE + + Signed-off-by: Keith Packard + +commit c417ab1de2a083b5fcff2e081e4feb2a65887903 +Author: Keith Packard +Date: Wed Aug 15 19:13:45 2018 -0700 + + altos: Make cmd number parsing functions return value + + Don't use a global variable to hold the result. + + Signed-off-by: Keith Packard + +commit c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830 +Author: Keith Packard +Date: Wed Aug 15 17:47:37 2018 -0700 + + altos: Remove 8051 address space specifiers + + Signed-off-by: Keith Packard + +commit 6023ff81f1bbd240169b9548209133d3b02d475f +Author: Keith Packard +Date: Wed Aug 15 17:34:20 2018 -0700 + + altos: Remove *_TO_DATA macros + + Now that we don't support 8051, we don't need these + + Signed-off-by: Keith Packard + +commit e2e2182a6ae6c8a7290fb5f7bbb7f8e0a863ba99 +Author: Keith Packard +Date: Wed Aug 15 15:39:34 2018 -0700 + + Remove pdclib + +commit 7c04888cf9809e0c73f0813c74e8dd972facde3a +Author: Keith Packard +Date: Sun Aug 5 12:23:22 2018 +0800 + + altos: Switch to newlib-nano for libc on arm + + Stop using pdclib + + Signed-off-by: Keith Packard + +commit 56629222711ba3ef7853405c9b07ad614fb29b95 +Author: Keith Packard +Date: Sun Aug 5 12:17:19 2018 +0800 + + altos: Remove cc1111 products + + We're not testing these anyways; building new firmware for them is not helpful. + + Signed-off-by: Keith Packard + +commit 382b3ef62a09e580834b07faf9ed2d00e5ce1621 +Author: Keith Packard +Date: Tue Sep 11 00:06:44 2018 -0700 + + altos: use %lu for APRS altitude in sprintf + + It's a long. + + Signed-off-by: Keith Packard + +commit 803c68d7933d03aaebda19786b63055d4a6d3d22 +Author: Keith Packard +Date: Sat Oct 13 07:50:59 2018 -0700 + + altos/stm: Make flash loader work with either 8MHz or 16MHz xtal + + Provide PLL definitions for both values. + + Signed-off-by: Keith Packard + +commit e830d803d3e289f0f1a6d92ce208682af28d3f52 +Author: Keith Packard +Date: Sat Oct 13 07:44:10 2018 -0700 + + altosdroid: Bump version to 18 for 1.8.7 + + Signed-off-by: Keith Packard + +commit 393a5e929b530d9ee4f78cd01faa4dd90c95fe3a +Author: Bdale Garbee +Date: Fri Oct 12 23:32:57 2018 -0600 + + altos: first cut at easymega v2.0 support .. nothing working yet + +commit fe3ff829d4c2fde8d4e80f721204b18e7831bb97 +Author: Bdale Garbee +Date: Wed Oct 10 20:41:40 2018 -0600 + + doc: add bootloader force instructions for TeleBT v4.0 + +commit 34b5144dbfd565ee2b9fb1e0dff388a49253f93b +Author: Bdale Garbee +Date: Tue Oct 9 11:46:09 2018 -0600 + + update turnon_telebt to use new approach for saving cal value on TeleBT + +commit ba37db43741fde8a08080fa65f5bcf76b1f745ee +Author: Bdale Garbee +Date: Mon Oct 8 21:41:30 2018 -0600 + + capture changes to Releasing discovered during 1.8.7 release + +commit e7136c6b413c8464d32cdc4afc28c93ba1f17a3b +Author: Keith Packard +Date: Mon Oct 8 19:42:09 2018 -0700 + + altos/lpc: Make sure USB pull-up is held low at boot for 'a while' + + Add a delay loop to make sure the host sees the pull-up low for long + enough. + + Signed-off-by: Keith Packard + +commit 6e785eea7b7a14ec8c1e69cad2c88836a9b1943e +Author: Keith Packard +Date: Mon Oct 8 19:40:32 2018 -0700 + + ao-bringup: Use new ao-cal-freq options when flashing teledongle v3.0 + + Use --nosave and --output to get the value needed to reflash the device. + + Signed-off-by: Keith Packard + +<<<<<<< HEAD +commit 5a86ff43a2b4a90dbddc1bba48019626e1b83e10 +Author: Bdale Garbee +Date: Mon Oct 8 17:51:33 2018 -0600 + + releasing 1.8.7 + +commit 34658a1236e34891b41a0a51a480717db98779e7 +Merge: 3a2a5a05 88ae4c5e +Author: Bdale Garbee +Date: Mon Oct 8 17:49:47 2018 -0600 + + Merge branch 'master' into branch-1.8 + +======= +>>>>>>> branch-1.9 +commit 88ae4c5ebd64215f05f5efc18f9660560b409ace +Author: Bdale Garbee +Date: Mon Oct 8 16:27:33 2018 -0600 + + doc: correct specs for TeleMega v3.0, which still uses the MMA6555 + +commit 24db798925e26a4c411afe88f7e4844d6554fe0c +Merge: 6f25d235 03680c55 +Author: Bdale Garbee +Date: Mon Oct 8 16:07:32 2018 -0600 + + Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos + +commit 6f25d2359151fb114e22bf8e3b15c007cfb464b5 +Author: Bdale Garbee +Date: Mon Oct 8 16:06:29 2018 -0600 + + add new script that uses openocd to reset an LPC target + +commit 03680c55ae8394056ed27839e64356d8df375537 +Author: Keith Packard +Date: Sun Oct 7 23:31:53 2018 -0700 + + Set version to 1.8.7 + + Signed-off-by: Keith Packard + +commit 625981b96e99a5dbec8180016d5e2c291378a21f +Author: Keith Packard +Date: Sun Oct 7 23:31:04 2018 -0700 + + doc: Note fixes for Mac OS X + + Signed-off-by: Keith Packard + +commit cd75ca767b616900d7df4596907f4f5b00517ad4 +Author: Keith Packard +Date: Sun Oct 7 23:25:25 2018 -0700 + + Switch to universal JavaApplicationStub for Mac OS X + + The binary JavaApplicationStub only supports Mac JRE 6, even if you + install a later JRE from Oracle it will still run our apps with the + Mac version. + + This replacement JavaApplicationStub is a shell script which comes + from here: + + https://github.com/tofi86/universalJavaApplicationStub + + I've tested it with Oracle JRE 10 installed and AltosUI came up fine, + and has access to our devices and networking. + + Signed-off-by: Keith Packard + +commit 746ad2c385046c77831b43291ef4335a11e5bfab +Author: Keith Packard +Date: Sun Oct 7 16:28:32 2018 -0600 + + altos-mapd: Add --max-zoom to limit tile loading. Set default to 15. + + This ensures that we won't end up serving huge numbers of high + resolution images. + + Signed-off-by: Keith Packard + +commit 7f5cdd0aeb68104f474ad1736360df39dd174006 +Author: Keith Packard +Date: Sun Oct 7 14:26:27 2018 -0700 + + doc: Note that 1.8.7 fixes map images + + Signed-off-by: Keith Packard + +commit 2bcbd39a37cf1fa0002345d5c401869a387dc84f +Author: Keith Packard +Date: Sun Oct 7 14:11:03 2018 -0700 + + altosuilib: Leave some map debug code around for the future + + Displays lat/lon on each map tile. Commented out for production use. + + Signed-off-by: Keith Packard + +commit 444fdd96515cc7163c49942ac2435ace8e7bb5bf +Author: Keith Packard +Date: Sun Oct 7 14:06:51 2018 -0700 + + altoslib: Be less chatty about map loading + + Only mention when a new tile is being fetched from the server. + + Signed-off-by: Keith Packard + +commit 173e72429fb494ea3832e3e38ee90f165fbff4cf +Author: Keith Packard +Date: Sun Oct 7 14:49:48 2018 -0600 + + altoslib: NumberFormat can't be shared between parsers + + AltosJson uses NumberFormat to ensure locale-independent parsing of + values. However, NumberFormat appears to have some internal state + which means that each thread needs to have an independent NumberFormat + object. Create one for each parser as needed. + + Signed-off-by: Keith Packard + +commit 1b53a54b032c21b6e8ffb085aa56b9ffdff53d7e +Author: Keith Packard +Date: Sun Oct 7 13:12:56 2018 -0700 + + altosui/altosdroid: Change message in forbidden map tiles + + These are outside of *known* launch areas. + + Signed-off-by: Keith Packard + +commit e7e1e805f1358052b33103a2ffdd4e9c435c8650 +Author: Keith Packard +Date: Sun Oct 7 14:08:30 2018 -0600 + + altos-mapd: Check nearest portion of tile to launch site + + We limit tile queries to those within 17km of a known launch + site. Change the check to look at the portion of the tile nearest each + launch site, instead of only checking the center location of the tile. + + Signed-off-by: Keith Packard + +commit 581f700e08ec8a1c3bfc5a09e7186676c54a5460 +Author: Keith Packard +Date: Sun Oct 7 10:32:48 2018 -0700 + + altos-map: Switch from json FD ops to json FILE ops + + Older versions (in Debian stable) do not have the fd-based operations. + + Signed-off-by: Keith Packard + +commit 6f911b92652de890ebff67b3b28f21a36f300ebf +Author: Keith Packard +Date: Sun Oct 7 10:03:31 2018 -0700 + + altos-mapd: Handle clients failing to send valid JSON + + Just bail if the data we receive doesn't generate a json value. + + Signed-off-by: Keith Packard + +commit b631f88b0bf19c6740eb21b65bd4be7c25049773 +Author: Keith Packard +Date: Sun Oct 7 10:02:26 2018 -0700 + + altosuilib: InputEvent.getModifiers is deprecated, use getModifiersEx + + Some java change; seems like it's a no-op for us. + + Signed-off-by: Keith Packard + +commit 5c957107ee5917d865eb866319f86cf8c109f212 +Author: Keith Packard +Date: Sun Oct 7 10:01:30 2018 -0700 + + altosui/altosdroid: Disable offline map type selections + + Our server only supports hybrid maps for now. If that changes, we can + re-add this support easily enough. + + Signed-off-by: Keith Packard + +commit e4f4183ce206d4cb7bbc89e1065eb34b05cf11c4 +Author: Keith Packard +Date: Sun Oct 7 09:39:27 2018 -0700 + + altosuilib: Remove GrabNDrag.java + + This isn't used anymore. + + Signed-off-by: Keith Packard + +commit af678be97e419a1167a0630f28bcaba82d67929b +Author: Keith Packard +Date: Sun Oct 7 09:22:44 2018 -0700 + + map-server: Implement altos-map in C + + This app is all about startup time, and java starts + slowly. Re-implement in C to improve server performance. + + Signed-off-by: Keith Packard + +commit 7b248524d4bd2c3ab64899b133230d131258396c +Author: Keith Packard +Date: Sat Oct 6 23:32:24 2018 -0700 + + altosdroid: Restore google maps key setting + + Only for altosdroid, and use a key restricted to our app + + Signed-off-by: Keith Packard + +commit 7eb475a9694327809b7ab5a9f419d00e0819a47d +Author: Keith Packard +Date: Sat Oct 6 23:25:50 2018 -0700 + + altosdroid: Set offline map scale to 1 + + Offline maps only supports scale 1 now. + + Signed-off-by: Keith Packard + +commit 417ec9c2a42bbe74f3aba4d00b42eb14dd6eb079 +Author: Keith Packard +Date: Sat Oct 6 23:22:26 2018 -0600 + + altos-mapd: Install systemd service file and defaults file + + This lets the map service 'just work' if enabled. + + Signed-off-by: Keith Packard + +commit 64d6689f97dfbed13533350dcb75a0a6a3d11c78 +Author: Keith Packard +Date: Sat Oct 6 21:32:12 2018 -0700 + + altos-map: Support version query from application + + Signed-off-by: Keith Packard + +commit 7c39a4509b0d4a428fcb83602a8dae1c158faf37 +Author: Keith Packard +Date: Sat Oct 6 21:30:03 2018 -0700 + + altosuilib: Fix offline map messages to match new meanings + + forbidden means outside of launch area. + + Signed-off-by: Keith Packard + +commit a8f4af38d7abbb1da922b5e4d84af218475f1752 +Author: Keith Packard +Date: Sat Oct 6 21:30:58 2018 -0700 + + altoslib: Retry map connections 10 times on network failure + + This covers a host of problems between the application and google maps. + + Signed-off-by: Keith Packard + +commit fab890328d4e1151932621a317226bc291b853da +Author: Keith Packard +Date: Sat Oct 6 21:30:03 2018 -0700 + + altosdroid: Fix offline map messages to match new meanings + + forbidden means outside of launch area. + + Signed-off-by: Keith Packard + +commit ff5faf1cc710b7e9299dcaec719bc2421f4ca5b4 +Author: Keith Packard +Date: Sat Oct 6 20:21:07 2018 -0700 + + altoslib: Change map loading to lat=&lon= from center= + + This is easier to parse. + + Signed-off-by: Keith Packard + +commit 21c630af7181a03b44cfcfa1cc787212501785ec +Author: Keith Packard +Date: Sat Oct 6 20:20:33 2018 -0700 + + altoslib: Use https for launch-sites.txt + + http causes a redirect, which Java doesn't handle + + Signed-off-by: Keith Packard + +commit a203aa6e3ed67337b752f939da956856e208c28b +Author: Keith Packard +Date: Sat Oct 6 22:28:36 2018 -0600 + + altos-mapd: Install altosmapd.jar file + + Signed-off-by: Keith Packard + +commit 1b841e14d11b3a9e7a754730b1d87b30d22f3dd4 +Author: Keith Packard +Date: Sat Oct 6 22:27:58 2018 -0600 + + altos-mapd: Make cache service listen queue longer + + Just in case the service gets busy, make the listen queue longer. + + Signed-off-by: Keith Packard + +commit 02adfb13297f7dffcd8edcdd3b8747cf52b2a70b +Author: Keith Packard +Date: Sat Oct 6 22:27:20 2018 -0600 + + altos-mapd: Clean up log messages + + Generate a single log message per request with remote address, + parameters and result code. + + Signed-off-by: Keith Packard + +commit 839e3a413a60c6a61851a94cc299de701ab5c277 +Author: Keith Packard +Date: Sat Oct 6 22:26:46 2018 -0600 + + altos-mapd: remove debug printf + + Signed-off-by: Keith Packard + +commit 026c735393f6029d09011dba1d5c780322921921 +Author: Keith Packard +Date: Sat Oct 6 22:25:48 2018 -0600 + + altos-map: Retry connection to cache service + + Just in case the cache service gets busy, retry the connection instead + of immediately failing. + + Signed-off-by: Keith Packard + +commit e7c0bcd945f8365e86e99b9d450f3a3389fa0e66 +Author: Keith Packard +Date: Sat Oct 6 19:33:51 2018 -0700 + + altos-mapd: Add geo-fencing for map requests. Add port and key arguments + + Map requests are now limited to a region within 17km of any registered + launch site. + + The --port argument allows the listen port to be changed. + + The --key argument provides the name of a file containing the Google + maps API key. + + Signed-off-by: Keith Packard + +commit c7b1f3c6722ae59d09a888084075664446ff2768 +Author: Keith Packard +Date: Sat Oct 6 19:29:01 2018 -0700 + + altoslib: Switch to maps.altusmetrum.org when no google map key is available + + The map key is only usable from maps.altusmetrum.org at this point, + and that service will be proxying for everyone in the near future. + + Signed-off-by: Keith Packard + +commit fe761eb413430c061b12f6ca8003665e56e20262 +Author: Keith Packard +Date: Sat Oct 6 19:27:43 2018 -0700 + + altoslib: Allow launch site URL to be overridden at runtime + + Expose a public variable, AltosLaunchSites.launch_sites_url, that will + be used in place of the environment variable or pre-defined value. + + Signed-off-by: Keith Packard + +commit 073ebc77bbd813eb97c515ecf3c2d104d6157843 +Merge: fb167d9f 9e29ac8e +Author: Bdale Garbee +Date: Sat Oct 6 18:55:05 2018 -0600 + + Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos + +commit fb167d9f589d3e42e0f99b9f454a51a31e09050a +Author: Bdale Garbee +Date: Sat Oct 6 18:54:35 2018 -0600 + + altoslib: update launch-sites.txt location to new home at maps.altusmetrum.org + +commit 9e29ac8ed9a48fc4ac8e769eeb131dd7c58fedc4 +Author: Keith Packard +Date: Sat Oct 6 17:17:20 2018 -0700 + + doc: Make use of 'faketime' configurable with configure.ac. Default to 'no' + + This ensures that older a2x versions don't simply wedge while building + the docs. + + Signed-off-by: Keith Packard + +commit cabfcb078950238cdaee4e6ec4702195feaabc7b +Author: Keith Packard +Date: Sat Oct 6 18:11:48 2018 -0600 + + altos-mapd: Use command line to pass map directory in + + Don't bother with a default value, just require a command line param. + + Signed-off-by: Keith Packard + +commit e405ec771b812f0ff78abbe813c3a793ae129487 +Author: Keith Packard +Date: Sat Oct 6 18:11:13 2018 -0600 + + altos-map: Install .jar file for altos-map + + Signed-off-by: Keith Packard + +commit a372152654613fd8479ed4687b987ae2a513adf6 +Author: Keith Packard +Date: Sat Oct 6 18:10:57 2018 -0600 + + altos-map: Fix altos-map HTTP syntax + + Add blank line between header and content. + Make error pages have actual HTML content. + + Signed-off-by: Keith Packard + +commit 3b817a2b854065af23c9ec8e849150e6930f51e9 +Author: Keith Packard +Date: Sat Oct 6 16:04:39 2018 -0700 + + map-server: Add maps proxy server + + This creates a map proxy server to handle the new Google Maps API requirements + + Signed-off-by: Keith Packard + +commit 5a95ed9c9419c15352b8dc1d895c9adce30f99f5 +Author: Keith Packard +Date: Sat Oct 6 12:00:45 2018 -0700 + + Add map-loading documentation + + Signed-off-by: Keith Packard + +commit cc70746e8efa6cadb23cbfcb11ddb51574c512a9 +Author: Keith Packard +Date: Fri Oct 5 21:40:13 2018 -0700 + + doc: Use RELEASE_DATE to set PDF timestamps using faketime + + This ensures that the generated PDF files do not depend on the time of + the build and only on the date of the release. + + Signed-off-by: Keith Packard + +commit 8e87b2626cdd81c128ac0cb5db03350aff67feac +Author: Keith Packard +Date: Fri Oct 5 19:36:20 2018 -0700 + + macosx: Ship install-macosx script with all apps. + + This script copies all files to ~/Applications/AltOS, then it deletes + all xattrs on all files so that OS X will run the java programs. + + Signed-off-by: Keith Packard + +commit a477dcbafe942af8f53e57802e228d94b526e13e +Author: Keith Packard +Date: Fri Oct 5 18:22:59 2018 -0700 + + doc: Add check for new hardware in specs.inc + + Signed-off-by: Keith Packard + +commit bb740c830b58273ee72255320bcedb3b849c0e2c +Author: Keith Packard +Date: Fri Oct 5 18:22:11 2018 -0700 + + doc: Update for 1.8.7 + + Release notes + Add HW specs for EasyMini v2.0 and TeleMega v3.0 + + Signed-off-by: Keith Packard + +commit aeb07f2b94b0121d4e5a6ce175ce4e013d6557cf +Author: Keith Packard +Date: Thu Oct 4 23:10:59 2018 -0700 + + altos: Force telemetry rate to 38400 when ao_force_freq is set + + ao_force_freq is used by TeleMini to set the radio to known + values. As TeleMini v3.0 also has configurable telemetry rates, this + value also needs to be set back to a known value. + + Signed-off-by: Keith Packard + +commit 77c3878df78ae356c442999a99f1e1752e2cd06b +Author: Keith Packard +Date: Thu Oct 4 23:03:12 2018 -0700 + + doc: Describe Packet Link mode in the initial usage section + + It's not described in any detail elsewhere... + + Signed-off-by: Keith Packard + +commit 0f05859d9fdef5867df888d9a8b41602e3bff7f7 +Author: Keith Packard +Date: Thu Oct 4 22:58:38 2018 -0700 + + doc: Describe Packet Link usage and selecting RF param defaults for TeleMini + + Packet Link mode is the only communication method available for + TeleMini and deserves some special mention in the docs. + + TeleMini allows forcing of RF parameters back to known defaults by + hooking SWCLK to ground at power on (hole 7 to hole 3 on the debug + connector). Describe this process so that users will be able to get + TeleMini back to known values and recover. + + Signed-off-by: Keith Packard + +commit 1b43a0d4a76910c4b512b2299e17ee0d3b661990 +Author: Keith Packard +Date: Thu Oct 4 12:12:56 2018 -0700 + + altoslib: Add missing AltosUnitInfo files + + Signed-off-by: Keith Packard + +commit 06b1fc72c8a694b3295262f1e0b50e8c88c53585 +Author: Keith Packard +Date: Tue Sep 11 00:06:05 2018 -0700 + + altoslib: Fix gyro headings in CSV files + + Use yaw/pitch/roll instead of x/y/z + + Signed-off-by: Keith Packard + +commit 3094d1f0ebd734f62d35e5e989d9a2368b713d29 +Author: Keith Packard +Date: Tue Oct 2 17:27:31 2018 -0700 + + ao-bringup: Add 'fix-telebt' to reflash TeleBT v4.0 with correct rf cal + + Fetches RF calibration value from the net and applies that when reflashing. + + Signed-off-by: Keith Packard + +commit c2c7873695ee2dc1b6fd153b67accad9693937aa +Author: Keith Packard +Date: Tue Oct 2 17:03:28 2018 -0700 + + altosui: Fetch RF calibration value for TBT v4.0 units from web + + We shipped a pile of TBT v4.0 units without programming the RF + calibration value into flash. This change checks to see if the target + is in the right serial number range and has the default RF calibration + value, in which case it fetches the RF calibration value from our web + site. + + Signed-off-by: Keith Packard + +commit d5b9fd5b3dd8c8b3bfb478d366ba07501085c1b3 +Author: Keith Packard +Date: Tue Oct 2 13:57:58 2018 -0700 + + altos: sdcc doesn't have 'false' and 'true'. + + Use FALSE and TRUE in ms5607.c driver instead. + + Signed-off-by: Keith Packard + +commit d2ea6454ebdf8ac7c3a24a738672c57d3f3f885c +Author: Keith Packard +Date: Tue Oct 2 12:57:06 2018 -0700 + + ao-tools/ao-cal-freq: Add --nosave and --output options. Check save results. + + --nosave means don't attempt to update the on-device configuration + data in eeprom. + + --output means write the calibration value to a file. + + Signed-off-by: Keith Packard + +commit 523e51d2cd2dfc5c0c4ca5a893b005916c46d46a +Author: Keith Packard +Date: Tue Oct 2 12:49:12 2018 -0700 + + micropeak: Add MicroUSB 'equals' method + + This lets the code which polls for devices work with MicroUSB devices + too. + + Signed-off-by: Keith Packard + +commit 8dd942b59edbe6909128b88bfbb8d1e15c3857c6 +Author: Keith Packard +Date: Wed Aug 22 00:59:59 2018 -0700 + + doc: Don't accidentally create zero-length PDF files + + The PDF files are generated at the same time the HTML files are, so + the PDF versions depend on the HTML ones. However, touching the PDF + files is a bad idea. + + Signed-off-by: Keith Packard + +commit 56dcfd4acf830fcb69c8b994e4b989c9aa7ddef3 +Author: Keith Packard +Date: Wed Aug 22 00:59:12 2018 -0700 + + altos/drivers: Shrink ao_ms5607.c code to fit on micropeak still + + Use some code constructs that make the little AVR processor happier + and save about 16 bytes of memory. + + Signed-off-by: Keith Packard + +commit 3c48b0fd504ae97dfaca91d2064b5822ca6e1344 +Author: Keith Packard +Date: Wed Aug 22 00:52:21 2018 -0700 + + altoslib: Reduce debug printf spamming during flashing operation + + Signed-off-by: Keith Packard + +commit ac8a9bc2ef301f1f18772af7d871c257a56ae70c +Author: Bdale Garbee +Date: Thu Aug 30 21:36:18 2018 -0600 + + altos: don't build fox1ihu by default + +commit 87ae17f888b745de71790d071846b96ab96e1529 +Author: Keith Packard +Date: Wed Aug 22 17:44:02 2018 -0700 + + altosuilib: Provide dialog while waiting for flash target to re-appear + + On windows, switching to the boot loader can take a long time. Instead + of timing out after a second, show a dialog and let the user cancel + the operation if they get bored of waiting. + + Signed-off-by: Keith Packard + +commit ba285ecf51e317917858740504a7d691b9839588 +Author: Keith Packard +Date: Wed Aug 22 17:43:17 2018 -0700 + + altosuilib: Include device path in equals test of AltosUSBDevice + + Ensure that multiple AltosFlash devices don't appear the same; they + all use serial number 1. + + Signed-off-by: Keith Packard + +commit 378ebab2e70917b4182cbd840a3fa66e4e42fd92 +Author: Keith Packard +Date: Wed Aug 22 17:42:13 2018 -0700 + + altoslib: Use common constants for flash action messages + + Place messages in AltosFlashListener instead of using the same strings + in three different places. + + Signed-off-by: Keith Packard + +commit 22005da598921ef6fe1a7f1bb5e56e41f44fe12f +Author: Keith Packard +Date: Wed Aug 22 00:58:14 2018 -0700 + + altosuilib: Don't show radio parameter when reflashing radioless devices + + Signed-off-by: Keith Packard + +commit 75420fecbc76ab718661718ada249673e139a29d +Author: Keith Packard +Date: Wed Aug 22 00:56:25 2018 -0700 + + altosuilib: Show a more useful message when the flash target device is unknown + + The flashing code uses the new symbol table to find information in the + existing device; if they don't match at all, there won't be anything + about the target device known. Tell the user this, rather than + displaying mystic information (or crashing). + + Signed-off-by: Keith Packard + +commit d8017f921649d2176d90239e02275dc5ef793815 +Author: Keith Packard +Date: Wed Aug 22 00:54:55 2018 -0700 + + altosuilib: Poll for devices while Select Device dialog is displayed + + Lets the user plug/unplug devices and have the dialog box show the + current set of available devices. Particularly useful on Windows where + it takes a long time after connecting a device for the OS to actually + make it usable. + + Signed-off-by: Keith Packard + +commit 91bb344a74a413f7dcee379c4d760c34599749bc +Author: Keith Packard +Date: Wed Aug 22 00:53:46 2018 -0700 + + altosuilib: Add 'equals' method to AltosDevice + + Signed-off-by: Keith Packard + +commit 2f61ef9a5046c39f4eeaaf741031bb6a9607b8a6 +Author: Keith Packard +Date: Wed Aug 15 15:31:57 2018 -0700 + + altos: Switch global 'log' to 'ao_log_data' + + Avoid conflicts with 'log' math function. + + Signed-off-by: Keith Packard + +commit cbe9cfd5eb5d19b7b9bf4bb75424e7592d708929 +Author: Keith Packard +Date: Sun Aug 5 12:20:56 2018 +0800 + + altos/stmf0: Stop using 'stdin' name as local variable + + stdio kinda wants to own this name + + Signed-off-by: Keith Packard + +commit 1bbef0879ad86dfc21610a255e6cbca1b94b5d1a +Author: Keith Packard +Date: Sun Aug 5 12:19:59 2018 +0800 + + altos/lpc: Fix stdio wakeup on serial IRQ + + Should just use USE_SERIAL_0_STDIN directly + + Signed-off-by: Keith Packard + +commit f16d1e3a2f074b96aae6b9053e8e9e03bd282741 +Author: Keith Packard +Date: Mon Aug 13 17:43:13 2018 -0700 + + altos: Allow timer interrupt without needing tick count + + This saves a bit of space in the fox1ihu loader which uses the timer + interrupt to poke the watchdog. + + Signed-off-by: Keith Packard + +commit bb9d071d328969fc3c544897f1fc96e55a842198 +Author: Keith Packard +Date: Mon Aug 13 17:43:57 2018 -0700 + + altos: Remove spurious 'const' from ao_state_names + + Current gcc complains about this. + + Signed-off-by: Keith Packard + +commit 171d12cb7bb0ea185e9b8b6d90e1c0fb94b19008 +Author: Keith Packard +Date: Sun Aug 5 12:19:19 2018 +0800 + + altos: Remove spurious ao_mma655x_spi_index variable + + This isn't used; was probably included for debugging at some point. + + Signed-off-by: Keith Packard + +commit 297eb795b24ec31f6599f48bc8c3769557a7ec6f +Author: Keith Packard +Date: Sun Aug 5 12:32:42 2018 +0800 + + Bump java lib versions to 13 + + Signed-off-by: Keith Packard + +commit 54838e3d523953e3ce4cea2319b2820c21d2c576 +Author: Keith Packard +Date: Mon Aug 6 13:15:21 2018 +0800 + + Include TeleMega v3.0 firmware with releases + + Signed-off-by: Keith Packard + +commit 55302673a3bff29ac8cd4c7656a410ba3c182845 +Author: Keith Packard +Date: Sun Aug 5 12:28:25 2018 +0800 + + Bump version to 1.8.6.1 + + Signed-off-by: Keith Packard + +commit 029259feafd63f17fc34b95cc7b1fe55e3f611c3 +Author: Bdale Garbee +Date: Sun Aug 5 14:11:01 2018 +0800 + + capture updates to Releasing from 1.8.6 release process + +<<<<<<< HEAD +commit 3a2a5a05bb6372d9003905cee7afdfcd6d38ae7e +Author: Bdale Garbee +Date: Sun Aug 5 11:23:31 2018 +0800 + + releasing 1.8.6 + commit d8627bb7b46fc991786835afa38cd720e9e75812 Merge: 59e23c27 8830fbc9 Author: Bdale Garbee @@ -5,6 +1577,8 @@ Date: Sun Aug 5 11:21:37 2018 +0800 Merge branch 'master' into branch-1.8 +======= +>>>>>>> branch-1.9 commit 8830fbc99565f753c0ae1f3d9f4b079860c2634a Author: Keith Packard Date: Sun Aug 5 11:13:23 2018 +0800 @@ -1219,6 +2793,7 @@ Date: Tue Mar 20 18:25:43 2018 -0600 add a paragraph to the intro pointing to the altusmetrum email list +<<<<<<< HEAD commit 59e23c27c2a85d7d748223e444b24d19937afe47 Author: Bdale Garbee Date: Sun Mar 18 15:49:07 2018 -0600 @@ -1232,6 +2807,8 @@ Date: Sun Mar 18 15:47:31 2018 -0600 Merge branch 'master' into branch-1.8 +======= +>>>>>>> branch-1.9 commit 39023ed6e29103a85bfad505506fa0dbf4dc1112 Author: Bdale Garbee Date: Sun Mar 18 15:42:48 2018 -0600 @@ -1677,6 +3254,7 @@ Date: Thu Dec 21 20:40:28 2017 -0700 update Releasing with wisdom from 1.8.4 release process +<<<<<<< HEAD commit 16a9d8617b2d2092d166a85ada4349601afb0dce Author: Bdale Garbee Date: Thu Dec 21 19:06:22 2017 -0700 @@ -1690,6 +3268,8 @@ Date: Thu Dec 21 19:05:46 2017 -0700 Merge branch 'master' into branch-1.8 +======= +>>>>>>> branch-1.9 commit 87aab99521dc44d1d29fbb0b7f227f868f074836 Author: Keith Packard Date: Thu Dec 21 17:37:10 2017 -0800 @@ -2109,6 +3689,7 @@ Date: Mon Dec 11 22:15:46 2017 -0700 update Releasing with changes discovered in 1.8.3 release process +<<<<<<< HEAD commit fe38c22595b050435dbacd35f1baae064fb7de75 Author: Bdale Garbee Date: Mon Dec 11 21:38:59 2017 -0700 @@ -2122,6 +3703,8 @@ Date: Mon Dec 11 21:37:48 2017 -0700 Merge branch 'master' into branch-1.8 +======= +>>>>>>> branch-1.9 commit 9adf8b23aac8256f230b10adcab9dd323266caaa Author: Bdale Garbee Date: Mon Dec 11 21:33:21 2017 -0700 @@ -3204,18 +4787,22 @@ Date: Mon Sep 18 21:24:52 2017 -0600 tweak Releasing based on 1.8.2 release experience +<<<<<<< HEAD commit 216ea6388a75c46891dc4687a2eb0c97dc63b136 Author: Bdale Garbee Date: Mon Sep 18 20:46:04 2017 -0600 releasing 1.8.2 +======= +>>>>>>> branch-1.9 commit 60666630789b6925d7e16160ebdc88ccd23f51de Author: Bdale Garbee Date: Mon Sep 18 20:43:14 2017 -0600 be more aggressive about removing and ignoring .mdwn files +<<<<<<< HEAD commit 1ece6e6fd3faaae3f6c6d434497eb04235939dc3 Author: Bdale Garbee Date: Mon Sep 18 20:43:14 2017 -0600 @@ -3229,6 +4816,8 @@ Date: Mon Sep 18 20:35:00 2017 -0600 Merge branch 'master' into branch-1.8 +======= +>>>>>>> branch-1.9 commit e87d56b665ca30a3e5920c23cd60c99b84341aa2 Author: Keith Packard Date: Mon Sep 18 18:51:51 2017 -0700 @@ -3465,12 +5054,15 @@ Date: Mon Aug 28 14:01:54 2017 -0600 a few tweaks to the Releasing document based on experience with 1.8.1 +<<<<<<< HEAD commit b1cf0dab1e28433e06ab02cec033951ea0149ea3 Author: Bdale Garbee Date: Mon Aug 28 12:05:17 2017 -0600 releasing 1.8.1 +======= +>>>>>>> branch-1.9 commit b68c0482d4fae8eb54cde1df0e4bcf4c5d272bad Author: Keith Packard Date: Sun Aug 27 22:49:09 2017 -0700