diy-efis/diy-efis
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build and missing files

Browse Source
This commit is contained in:
peter.nunn
2023-07-24 15:55:33 -05:00
parent 4800ebc308
commit 9eb15eca44
16 changed files with 646 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/mfd3.cfg
-2
View File
@@ -1,5 +1,3 @@
mkdir neutron
cd ..
mkdir krypton
uint16 screen-x 320
uint16 screen-y 240
diy-efis.sln
+7 -133
View File
@@ -21,16 +21,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "photon", "tools\photon\phot
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FontGen", "tools\FontGen\FontGen.vcxproj", "{9C884165-DCBF-4262-8754-E59B30088C56}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A03DF32A-E609-4026-B956-012340A1A216}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{A03DF32A-E609-4026-B956-012340A1A216}"
ProjectSection(SolutionItems) = preProject
configs\ahrs.cfg = configs\ahrs.cfg
configs\mfd3.cfg = configs\mfd3.cfg
configs\samplemenu.cfg = configs\samplemenu.cfg
configs\widget.cfg = configs\widget.cfg
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{CADEAC62-E28F-4545-83B3-2D7CA8EF0CBD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{6438D13E-3FAE-4D8F-9E4F-4E6EE70E4346}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cunit", "tests\cunit\cunit.vcxproj.vcxproj", "{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "tests\publisher\publisher.vcxproj", "{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diy-efis", "raspberry-pi\VC\diy-efis\diy-efis.vcxproj", "{3F83D2B2-31B6-4926-A4BC-7EC2C09B2E8B}"
EndProject
Global
@@ -772,132 +774,6 @@ Global
{9C884165-DCBF-4262-8754-E59B30088C56}.Release|x64.ActiveCfg = Release|Win32
{9C884165-DCBF-4262-8754-E59B30088C56}.Release|x86.ActiveCfg = Release|Win32
{9C884165-DCBF-4262-8754-E59B30088C56}.Release|x86.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - DLL|ARM.ActiveCfg = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - DLL|ARM.Build.0 = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - DLL|x64.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - DLL|x64.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - DLL|x86.ActiveCfg = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - DLL|x86.Build.0 = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib with MEMTRACE|ARM.ActiveCfg = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib with MEMTRACE|ARM.Build.0 = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib with MEMTRACE|x64.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib with MEMTRACE|x64.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib with MEMTRACE|x86.ActiveCfg = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib with MEMTRACE|x86.Build.0 = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib|ARM.ActiveCfg = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib|ARM.Build.0 = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib|x64.ActiveCfg = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib|x64.Build.0 = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib|x86.ActiveCfg = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug - Static Lib|x86.Build.0 = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Multithreaded|ARM.ActiveCfg = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Multithreaded|ARM.Build.0 = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Multithreaded|x64.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Multithreaded|x64.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Multithreaded|x86.ActiveCfg = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Multithreaded|x86.Build.0 = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Singlethreaded|ARM.ActiveCfg = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Singlethreaded|ARM.Build.0 = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Singlethreaded|x64.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Singlethreaded|x64.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Singlethreaded|x86.ActiveCfg = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug Singlethreaded|x86.Build.0 = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug|ARM.ActiveCfg = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug|x64.ActiveCfg = Debug|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug|x86.ActiveCfg = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Debug|x86.Build.0 = Debug|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - DLL|ARM.ActiveCfg = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - DLL|ARM.Build.0 = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - DLL|x64.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - DLL|x64.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - DLL|x86.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - DLL|x86.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - Static Lib|ARM.ActiveCfg = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - Static Lib|ARM.Build.0 = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - Static Lib|x64.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - Static Lib|x64.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - Static Lib|x86.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release - Static Lib|x86.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Multithreaded|ARM.ActiveCfg = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Multithreaded|ARM.Build.0 = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Multithreaded|x64.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Multithreaded|x64.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Multithreaded|x86.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Multithreaded|x86.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Singlethreaded|ARM.ActiveCfg = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Singlethreaded|ARM.Build.0 = Release|x64
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Singlethreaded|x64.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Singlethreaded|x64.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Singlethreaded|x86.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release Singlethreaded|x86.Build.0 = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release|ARM.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release|x64.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release|x86.ActiveCfg = Release|Win32
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E}.Release|x86.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - DLL|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - DLL|ARM.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - DLL|x64.ActiveCfg = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - DLL|x64.Build.0 = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - DLL|x86.ActiveCfg = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - DLL|x86.Build.0 = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib with MEMTRACE|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib with MEMTRACE|ARM.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib with MEMTRACE|x64.ActiveCfg = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib with MEMTRACE|x64.Build.0 = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib with MEMTRACE|x86.ActiveCfg = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib with MEMTRACE|x86.Build.0 = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib|ARM.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib|x64.ActiveCfg = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib|x64.Build.0 = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib|x86.ActiveCfg = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug - Static Lib|x86.Build.0 = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Multithreaded|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Multithreaded|ARM.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Multithreaded|x64.Build.0 = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Multithreaded|x86.ActiveCfg = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Multithreaded|x86.Build.0 = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Singlethreaded|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Singlethreaded|ARM.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Singlethreaded|x64.Build.0 = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Singlethreaded|x86.ActiveCfg = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug Singlethreaded|x86.Build.0 = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug|ARM.ActiveCfg = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug|x64.ActiveCfg = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug|x64.Build.0 = Debug|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug|x86.ActiveCfg = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Debug|x86.Build.0 = Debug|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - DLL|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - DLL|ARM.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - DLL|x64.ActiveCfg = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - DLL|x64.Build.0 = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - DLL|x86.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - DLL|x86.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - Static Lib|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - Static Lib|ARM.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - Static Lib|x64.ActiveCfg = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - Static Lib|x64.Build.0 = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - Static Lib|x86.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release - Static Lib|x86.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Multithreaded|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Multithreaded|ARM.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Multithreaded|x64.ActiveCfg = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Multithreaded|x64.Build.0 = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Multithreaded|x86.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Multithreaded|x86.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Singlethreaded|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Singlethreaded|ARM.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Singlethreaded|x64.ActiveCfg = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Singlethreaded|x64.Build.0 = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Singlethreaded|x86.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release Singlethreaded|x86.Build.0 = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release|ARM.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release|x64.ActiveCfg = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release|x64.Build.0 = Release|x64
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release|x86.ActiveCfg = Release|Win32
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC}.Release|x86.Build.0 = Release|Win32
{3F83D2B2-31B6-4926-A4BC-7EC2C09B2E8B}.Debug - DLL|ARM.ActiveCfg = Debug|ARM
{3F83D2B2-31B6-4926-A4BC-7EC2C09B2E8B}.Debug - DLL|ARM.Build.0 = Debug|ARM
{3F83D2B2-31B6-4926-A4BC-7EC2C09B2E8B}.Debug - DLL|x64.ActiveCfg = Debug|x64
@@ -978,8 +854,6 @@ Global
{3424CA68-F0AF-48A9-80A3-E441C11DE3E9} = {CADEAC62-E28F-4545-83B3-2D7CA8EF0CBD}
{943F213F-305D-4476-8B00-4E18BC7E0E16} = {CADEAC62-E28F-4545-83B3-2D7CA8EF0CBD}
{9C884165-DCBF-4262-8754-E59B30088C56} = {6438D13E-3FAE-4D8F-9E4F-4E6EE70E4346}
{E88E5D8B-FAA8-41FA-B0A5-77C924300C0E} = {A03DF32A-E609-4026-B956-012340A1A216}
{D06597D3-5DEA-4B57-B05A-F827DD25D2DC} = {A03DF32A-E609-4026-B956-012340A1A216}
{3F83D2B2-31B6-4926-A4BC-7EC2C09B2E8B} = {6438D13E-3FAE-4D8F-9E4F-4E6EE70E4346}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
libs/krypton/getopt.c
+498
View File
@@ -0,0 +1,498 @@
#include <crtdefs.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <stdio.h>
#include <windows.h>
#include "getopt.h"
int opterr = 1; /* if error message should be printed */
int optind = 1; /* index into parent argv vector */
int optopt = '?'; /* character checked for validity */
int optreset; /* reset getopt */
char* optarg; /* argument associated with option */
#define PRINT_ERROR ((opterr) && (*options != ':'))
#define FLAG_PERMUTE 0x01 /* permute non-options to the end of argv */
#define FLAG_ALLARGS 0x02 /* treat non-options as args to option "-1" */
#define FLAG_LONGONLY 0x04 /* operate as getopt_long_only */
/* return values */
#define BADCH (int)'?'
#define BADARG ((*options == ':') ? (int)':' : (int)'?')
#define INORDER (int)1
#define EMSG ""
static int getopt_internal(int, char* const*, const char*, const struct option*, int*, int);
static int parse_long_options(char* const*, const char*, const struct option*, int*, int);
static int gcd(int, int);
static void permute_args(int, int, int, char* const*);
static char* place = EMSG; /* option letter processing */
/* XXX: set optreset to 1 rather than these two */
static int nonopt_start = -1; /* first non option argument (for permute) */
static int nonopt_end = -1; /* first option after non options (for permute) */
/* Error messages */
static const char recargchar[] = "option requires an argument -- %c";
static const char recargstring[] = "option requires an argument -- %s";
static const char ambig[] = "ambiguous option -- %.*s";
static const char noarg[] = "option doesn't take an argument -- %.*s";
static const char illoptchar[] = "unknown option -- %c";
static const char illoptstring[] = "unknown option -- %s";
static void _vwarnx(const char* fmt, va_list ap)
{
// (void)fprintf(stderr, "%s: ", __progname);
if (fmt != NULL)
(void)vfprintf(stderr, fmt, ap);
(void)fprintf(stderr, "\n");
}
static void warnx(const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
_vwarnx(fmt, ap);
va_end(ap);
}
/*
* Compute the greatest common divisor of a and b.
*/
static int gcd(int a, int b)
{
int c;
c = a % b;
while (c != 0) {
a = b;
b = c;
c = a % b;
}
return (b);
}
/*
* Exchange the block from nonopt_start to nonopt_end with the block
* from nonopt_end to opt_end (keeping the same order of arguments
* in each block).
*/
static void permute_args(int panonopt_start, int panonopt_end, int opt_end,
char* const* nargv)
{
int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
char* swap;
/*
* compute lengths of blocks and number and size of cycles
*/
nnonopts = panonopt_end - panonopt_start;
nopts = opt_end - panonopt_end;
ncycle = gcd(nnonopts, nopts);
cyclelen = (opt_end - panonopt_start) / ncycle;
for (i = 0; i < ncycle; i++) {
cstart = panonopt_end + i;
pos = cstart;
for (j = 0; j < cyclelen; j++) {
if (pos >= panonopt_end)
pos -= nnonopts;
else
pos += nopts;
swap = nargv[pos];
/* LINTED const cast */
((char**)nargv)[pos] = nargv[cstart];
/* LINTED const cast */
((char**)nargv)[cstart] = swap;
}
}
}
/*
* getopt --
* Parse argc/argv argument vector.
*
* [eventually this will replace the BSD getopt]
*/
int getopt(int nargc, char* const* nargv, const char* options)
{
/*
* We don't pass FLAG_PERMUTE to getopt_internal() since
* the BSD getopt(3) (unlike GNU) has never done this.
*
* Furthermore, since many privileged programs call getopt()
* before dropping privileges it makes sense to keep things
* as simple (and bug-free) as possible.
*/
return (getopt_internal(nargc, nargv, options, NULL, NULL, FLAG_PERMUTE));
}
#define IDENTICAL_INTERPRETATION(_x, _y) \
(long_options[(_x)].has_arg == long_options[(_y)].has_arg && \
long_options[(_x)].flag == long_options[(_y)].flag && \
long_options[(_x)].val == long_options[(_y)].val)
/*
* parse_long_options --
* Parse long options in argc/argv argument vector.
* Returns -1 if short_too is set and the option does not match long_options.
*/
static int parse_long_options(char* const* nargv, const char* options,
const struct option* long_options, int* idx, int short_too)
{
char* current_argv, * has_equal;
size_t current_argv_len;
int i, ambiguous, match;
current_argv = place;
match = -1;
ambiguous = 0;
optind++;
if ((has_equal = strchr(current_argv, '=')) != NULL) {
/* argument found (--option=arg) */
current_argv_len = has_equal - current_argv;
has_equal++;
}
else
current_argv_len = strlen(current_argv);
for (i = 0; long_options[i].name; i++) {
/* find matching long option */
if (strncmp(current_argv, long_options[i].name,
current_argv_len))
continue;
if (strlen(long_options[i].name) == current_argv_len) {
/* exact match */
match = i;
ambiguous = 0;
break;
}
/*
* If this is a known short option, don't allow
* a partial match of a single character.
*/
if (short_too && current_argv_len == 1)
continue;
if (match == -1) /* partial match */
match = i;
else if (!IDENTICAL_INTERPRETATION(i, match))
ambiguous = 1;
}
if (ambiguous) {
/* ambiguous abbreviation */
if (PRINT_ERROR)
warnx(ambig, (int)current_argv_len,
current_argv);
optopt = 0;
return (BADCH);
}
if (match != -1) { /* option found */
if (long_options[match].has_arg == no_argument
&& has_equal) {
if (PRINT_ERROR)
warnx(noarg, (int)current_argv_len,
current_argv);
/*
* XXX: GNU sets optopt to val regardless of flag
*/
if (long_options[match].flag == NULL)
optopt = long_options[match].val;
else
optopt = 0;
return (BADARG);
}
if (long_options[match].has_arg == required_argument ||
long_options[match].has_arg == optional_argument) {
if (has_equal)
optarg = has_equal;
else if (long_options[match].has_arg ==
required_argument) {
/*
* optional argument doesn't use next nargv
*/
optarg = nargv[optind++];
}
}
if ((long_options[match].has_arg == required_argument)
&& (optarg == NULL)) {
/*
* Missing argument; leading ':' indicates no error
* should be generated.
*/
if (PRINT_ERROR)
warnx(recargstring,
current_argv);
/*
* XXX: GNU sets optopt to val regardless of flag
*/
if (long_options[match].flag == NULL)
optopt = long_options[match].val;
else
optopt = 0;
--optind;
return (BADARG);
}
}
else { /* unknown option */
if (short_too) {
--optind;
return (-1);
}
if (PRINT_ERROR)
warnx(illoptstring, current_argv);
optopt = 0;
return (BADCH);
}
if (idx)
*idx = match;
if (long_options[match].flag) {
*long_options[match].flag = long_options[match].val;
return (0);
}
else
return (long_options[match].val);
#undef IDENTICAL_INTERPRETATION
}
/*
* getopt_internal --
* Parse argc/argv argument vector. Called by user level routines.
*/
static int getopt_internal(int nargc, char* const* nargv, const char* options,
const struct option* long_options, int* idx, int flags)
{
char* oli; /* option letter list index */
int optchar, short_too;
static int posixly_correct = -1;
if (options == NULL)
return (-1);
/*
* XXX Some GNU programs (like cvs) set optind to 0 instead of
* XXX using optreset. Work around this braindamage.
*/
if (optind == 0)
optind = optreset = 1;
/*
* Disable GNU extensions if POSIXLY_CORRECT is set or options
* string begins with a '+'.
*
* CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or
* optreset != 0 for GNU compatibility.
*/
if (posixly_correct == -1 || optreset != 0)
posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
if (*options == '-')
flags |= FLAG_ALLARGS;
else if (posixly_correct || *options == '+')
flags &= ~FLAG_PERMUTE;
if (*options == '+' || *options == '-')
options++;
optarg = NULL;
if (optreset)
nonopt_start = nonopt_end = -1;
start:
if (optreset || !*place)
{ /* update scanning pointer */
optreset = 0;
if (optind >= nargc)
{ /* end of argument vector */
place = EMSG;
if (nonopt_end != -1) {
/* do permutation, if we have to */
permute_args(nonopt_start, nonopt_end,
optind, nargv);
optind -= nonopt_end - nonopt_start;
}
else if (nonopt_start != -1) {
/*
* If we skipped non-options, set optind
* to the first of them.
*/
optind = nonopt_start;
}
nonopt_start = nonopt_end = -1;
return (-1);
}
if (*(place = nargv[optind]) != '-' ||
(place[1] == '\0' && strchr(options, '-') == NULL))
{
place = EMSG; /* found non-option */
if (flags & FLAG_ALLARGS)
{
/*
* GNU extension:
* return non-option as argument to option 1
*/
optarg = nargv[optind++];
return (INORDER);
}
if (!(flags & FLAG_PERMUTE)) {
/*
* If no permutation wanted, stop parsing
* at first non-option.
*/
return (-1);
}
/* do permutation */
if (nonopt_start == -1)
nonopt_start = optind;
else if (nonopt_end != -1) {
permute_args(nonopt_start, nonopt_end,
optind, nargv);
nonopt_start = optind -
(nonopt_end - nonopt_start);
nonopt_end = -1;
}
optind++;
/* process next argument */
goto start;
}
if (nonopt_start != -1 && nonopt_end == -1)
nonopt_end = optind;
/*
* If we have "-" do nothing, if "--" we are done.
*/
if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
optind++;
place = EMSG;
/*
* We found an option (--), so if we skipped
* non-options, we have to permute.
*/
if (nonopt_end != -1) {
permute_args(nonopt_start, nonopt_end,
optind, nargv);
optind -= nonopt_end - nonopt_start;
}
nonopt_start = nonopt_end = -1;
return (-1);
}
}
/*
* Check long options if:
* 1) we were passed some
* 2) the arg is not just "-"
* 3) either the arg starts with -- we are getopt_long_only()
*/
if (long_options != NULL && place != nargv[optind] &&
(*place == '-' || (flags & FLAG_LONGONLY))) {
short_too = 0;
if (*place == '-')
place++; /* --foo long option */
else if (*place != ':' && strchr(options, *place) != NULL)
short_too = 1; /* could be short option too */
optchar = parse_long_options(nargv, options, long_options,
idx, short_too);
if (optchar != -1) {
place = EMSG;
return (optchar);
}
}
if ((optchar = (int)*place++) == (int)':' ||
(optchar == (int)'-' && *place != '\0') ||
(oli = (char*)strchr(options, optchar)) == NULL) {
/*
* If the user specified "-" and '-' isn't listed in
* options, return -1 (non-option) as per POSIX.
* Otherwise, it is an unknown option character (or ':').
*/
if (optchar == (int)'-' && *place == '\0')
return (-1);
if (!*place)
++optind;
if (PRINT_ERROR)
warnx(illoptchar, optchar);
optopt = optchar;
return (BADCH);
}
if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
/* -W long-option */
if (*place) /* no space */
/* NOTHING */;
else if (++optind >= nargc) { /* no arg */
place = EMSG;
if (PRINT_ERROR)
warnx(recargchar, optchar);
optopt = optchar;
return (BADARG);
}
else /* white space */
place = nargv[optind];
optchar = parse_long_options(nargv, options, long_options,
idx, 0);
place = EMSG;
return (optchar);
}
if (*++oli != ':') { /* doesn't take argument */
if (!*place)
++optind;
}
else { /* takes (optional) argument */
optarg = NULL;
if (*place) /* no white space */
optarg = place;
else if (oli[1] != ':') { /* arg not optional */
if (++optind >= nargc) { /* no arg */
place = EMSG;
if (PRINT_ERROR)
warnx(recargchar, optchar);
optopt = optchar;
return (BADARG);
}
else
optarg = nargv[optind];
}
place = EMSG;
++optind;
}
/* dump back option letter */
return (optchar);
}
/*
* getopt_long --
* Parse argc/argv argument vector.
*/
int getopt_long(int nargc, char* const* nargv, const char* options,
const struct option* long_options, int* idx)
{
return (getopt_internal(nargc, nargv, options, long_options, idx,
FLAG_PERMUTE));
}
/*
* getopt_long_only --
* Parse argc/argv argument vector.
*/
int getopt_long_only(int nargc, char* const* nargv, const char* options,
const struct option* long_options, int* idx)
{
return (getopt_internal(nargc, nargv, options, long_options, idx,
FLAG_PERMUTE | FLAG_LONGONLY));
}
libs/krypton/getopt.h
+47
View File
@@ -0,0 +1,47 @@
#ifndef __GETOPT_H__
#define __GETOPT_H__
#ifdef __cplusplus
extern "C" {
#endif
extern int optind; /* index of first non-option in argv */
extern int optopt; /* single option character, as parsed */
extern int opterr; /* flag to enable built-in diagnostics... */
/* (user may set to zero, to suppress) */
extern char *optarg; /* pointer to argument of current option */
extern int getopt(int nargc, char * const *nargv, const char *options);
#endif /* !defined(__GETOPT_H__) */
#if !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__)
#define __GETOPT_LONG_H__
struct option /* specification for a long form option... */
{
const char* name; /* option name, without leading hyphens */
int has_arg; /* does it take an argument? */
int* flag; /* where to save its status, or NULL */
int val; /* its associated status value */
};
enum /* permitted values for its `has_arg' field... */
{
no_argument = 0, /* option never takes an argument */
required_argument, /* option always requires an argument */
optional_argument /* option may take an argument */
};
extern int getopt_long(int nargc, char * const *nargv, const char *options,
const struct option *long_options, int *idx);
extern int getopt_long_only(int nargc, char * const *nargv, const char *options,
const struct option *long_options, int *idx);
#ifdef __cplusplus
}
#endif
#endif
libs/krypton/init.c
+10
View File
@@ -106,6 +106,12 @@ extern const char *i2c_device_s;
extern const char *screen_x_s;
extern const char *screen_y_s;
// typical for windows:
// -c 32768 -x 320 -y 240 -d COM4 diy-efis.reg
//
// then
// -x 320 -y 240 -d COM4 diy-efis.reg
result_t krypton_init(int argc, char **argv)
{
result_t result;
@@ -117,6 +123,7 @@ result_t krypton_init(int argc, char **argv)
const char *fb_size = "32768";
const char *width = "320";
const char *height = "240";
const char *device = 0;
int opt;
while ((opt = getopt(argc, argv, "hc:f:x:y:d:")) != -1)
@@ -136,6 +143,9 @@ result_t krypton_init(int argc, char **argv)
case 'y':
height = optarg;
break;
case 'd':
device = optarg;
break;
default:
return print_error(help, s_false);
}
libs/krypton/krypton.h
+66
View File
@@ -0,0 +1,66 @@
#ifndef __krypton_h__
#define __krypton_h__
/*
diy-efis
Copyright (C) 2016-2022 Kotuku Aerospace Limited
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
If a file does not contain a copyright header, either because it is incomplete
or a binary file then the above copyright notice will apply.
Portions of this repository may have further copyright notices that may be
identified in the respective files. In those cases the above copyright notice and
the GPL3 are subservient to that copyright notice.
Portions of this repository contain code fragments from the following
providers.
If any file has a copyright notice or portions of code have been used
and the original copyright notice is not yet transcribed to the repository
then the original copyright notice is to be respected.
If any material is included in the repository that is not open source
it must be removed as soon as possible after the code fragment is identified.
If you wish to use any of this code in a commercial application then
you must obtain a licence from the copyright holder. Contact
support@kotuku.aero for information on the commercial licences.
*/
#include "../../libs/neutron/neutron.h"
#include "../../libs/neutron/bsp.h"
#include "../../libs/neutron/stream.h"
#include "../../libs/muon/cli.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @function krypton_init(int argc, char **argv, krypton_parameters_t *init_params)
* @brief initialize the windows krypton library
* @param argc argument count
* @param argv startup arguments
* @return s_ok if arguments are ok
*/
extern result_t krypton_init(int argc, char **argv);
#ifdef __cplusplus
}
#endif
#endif
libs/krypton/krypton.vcxproj
+2
View File
@@ -22,6 +22,7 @@
<ClCompile Include="comm_device.c" />
<ClCompile Include="deque.c" />
<ClCompile Include="fb.c" />
<ClCompile Include="getopt.c" />
<ClCompile Include="init.c" />
<ClCompile Include="screen.c" />
</ItemGroup>
@@ -90,6 +91,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
libs/krypton/krypton.vcxproj.filters
+3
View File
@@ -30,6 +30,9 @@
<ClCompile Include="screen.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="getopt.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="deque.h">
libs/photon/photon.c
+3
View File
@@ -722,10 +722,13 @@ static const quadrants_t quadrants[4] =
}
};
#ifndef _WIN32
float roundf(float value)
{
return (float) (value < 0.0 ? ceil(value - 0.5) : floor(value + 0.5));
}
#endif
double round(double value)
{
tools/ion/ion.vcxproj
+1
View File
@@ -110,6 +110,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
tools/msh/main.c
+4 -24
View File
@@ -51,7 +51,7 @@ it must be removed as soon as possible after the code fragment is identified.
#include <termios.h>
#include <sys/stat.h>
#else
extern result_t krypton_init(const char *reg_path, bool factory_reset);
#include "../../libs/krypton/krypton.h"
#include <Windows.h>
#endif
@@ -381,31 +381,11 @@ static void shell_run_ion(void *parg)
int main(int argc, char **argv)
{
bool factory_reset;
#ifdef __linux__
if(failed(electron_init(argc, argv)))
{
printf("Unable to initialize the krypton library.");
return -1;
}
factory_reset = electron_init(argc, argv);
#else
// The command line can pass in the name of the registry used to set us up. In any
// case we need to implement some code
const char *ini_path;
if(argc > 1)
ini_path = argv[1];
else
ini_path = "diy-efis.reg";
// TODO: handle this better
bool factory_reset = false;
if(failed(krypton_init(ini_path, factory_reset)))
{
printf("Unable to initialize the krypton library.");
return -1;
}
factory_reset = krypton_init(argc, argv);
#endif
uint16_t node_id;
tools/msh/msh.vcxproj
+1
View File
@@ -123,6 +123,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
tools/muon/muon.vcxproj
+1
View File
@@ -77,6 +77,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
tools/neutron/neutron.vcxproj
+1
View File
@@ -89,6 +89,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
tools/photon/photon.vcxproj
+1
View File
@@ -104,6 +104,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
tools/proton/proton.vcxproj
+1
View File
@@ -101,6 +101,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>