diff --git a/latest/Apps/maiana-update/maiana-update.fbp b/latest/Apps/maiana-update/maiana-update.fbp index 3351645..0ebebdc 100644 --- a/latest/Apps/maiana-update/maiana-update.fbp +++ b/latest/Apps/maiana-update/maiana-update.fbp @@ -47,10 +47,10 @@ MainFrame - 605,300 + 620,329 wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX ; ; forward_declare - MAIANA Transponder Manager ver 0.2 + MAIANA Transponder Manager ver 0.3 0 @@ -119,11 +119,11 @@ - + Status 1 - + 1 1 1 @@ -290,8 +290,8 @@ 0 - 150,-1 - 1 + 180,-1 + 0 m_SerialPortChoice 1 @@ -761,7 +761,7 @@ 5 - wxALIGN_RIGHT|wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 1 @@ -822,7 +822,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -883,7 +883,7 @@ 5 - wxALIGN_RIGHT|wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 1 @@ -944,7 +944,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1006,11 +1006,11 @@ - + Station Data 0 - + 1 1 1 @@ -1061,7 +1061,7 @@ wxTAB_TRAVERSAL - + 4 0 @@ -1168,7 +1168,7 @@ 0 - + 180,-1 1 m_MMSIText 1 @@ -1179,7 +1179,7 @@ Resizable 1 - 100,-1 + -1,-1 ; ; forward_declare 0 @@ -1294,7 +1294,7 @@ 0 - + 120,-1 1 m_CallsignText 1 @@ -1420,7 +1420,7 @@ 20 0 - 140,-1 + 180,-1 1 m_NameText 1 @@ -2079,7 +2079,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 1 @@ -2140,7 +2140,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxALL 0 1 @@ -2201,7 +2201,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL 0 1 @@ -2337,11 +2337,11 @@ - + FW Update 0 - + 1 1 1 @@ -2392,16 +2392,16 @@ wxTAB_TRAVERSAL - + bSizer41 wxVERTICAL none - + 5 wxEXPAND 1 - + 2 0 -1,90 @@ -2459,7 +2459,7 @@ Resizable 1 - 80,-1 + -1,-1 ; ; forward_declare 0 diff --git a/latest/Apps/maiana-update/mainframe.py b/latest/Apps/maiana-update/mainframe.py index ed2f9ef..35cf614 100644 --- a/latest/Apps/maiana-update/mainframe.py +++ b/latest/Apps/maiana-update/mainframe.py @@ -17,7 +17,7 @@ import wx.xrc class MainFrame ( wx.Frame ): def __init__( self, parent ): - wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"MAIANA Transponder Manager ver 0.2", pos = wx.DefaultPosition, size = wx.Size( 605,300 ), style = wx.CAPTION|wx.CLOSE_BOX|wx.MINIMIZE_BOX|wx.TAB_TRAVERSAL ) + wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = u"MAIANA Transponder Manager ver 0.3", pos = wx.DefaultPosition, size = wx.Size( 620,329 ), style = wx.CAPTION|wx.CLOSE_BOX|wx.MINIMIZE_BOX|wx.TAB_TRAVERSAL ) self.SetSizeHints( wx.DefaultSize, wx.DefaultSize ) @@ -37,7 +37,7 @@ class MainFrame ( wx.Frame ): m_SerialPortChoiceChoices = [] self.m_SerialPortChoice = wx.Choice( self.m_StatusPnl, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_SerialPortChoiceChoices, 0 ) self.m_SerialPortChoice.SetSelection( 0 ) - self.m_SerialPortChoice.SetMinSize( wx.Size( 150,-1 ) ) + self.m_SerialPortChoice.SetMinSize( wx.Size( 180,-1 ) ) bSizer4.Add( self.m_SerialPortChoice, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) @@ -88,22 +88,22 @@ class MainFrame ( wx.Frame ): self.m_staticText21 = wx.StaticText( self.m_StatusPnl, wx.ID_ANY, u"Breakout Board Generation", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText21.Wrap( -1 ) - gSizer1.Add( self.m_staticText21, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + gSizer1.Add( self.m_staticText21, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) self.m_breakoutLbl = wx.StaticText( self.m_StatusPnl, wx.ID_ANY, u"(unknown)", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_breakoutLbl.Wrap( -1 ) - gSizer1.Add( self.m_breakoutLbl, 0, wx.ALL, 5 ) + gSizer1.Add( self.m_breakoutLbl, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.m_staticText23 = wx.StaticText( self.m_StatusPnl, wx.ID_ANY, u"Bootloader Present", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText23.Wrap( -1 ) - gSizer1.Add( self.m_staticText23, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + gSizer1.Add( self.m_staticText23, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) self.m_bootloaderLbl = wx.StaticText( self.m_StatusPnl, wx.ID_ANY, u"(unknown)", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_bootloaderLbl.Wrap( -1 ) - gSizer1.Add( self.m_bootloaderLbl, 0, wx.ALL, 5 ) + gSizer1.Add( self.m_bootloaderLbl, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.m_StatusPnl.SetSizer( gSizer1 ) @@ -120,7 +120,9 @@ class MainFrame ( wx.Frame ): gSizer2.Add( self.m_staticText101, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - self.m_MMSIText = wx.TextCtrl( self.m_StationPnl, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.Size( 100,-1 ), 0 ) + self.m_MMSIText = wx.TextCtrl( self.m_StationPnl, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.Size( -1,-1 ), 0 ) + self.m_MMSIText.SetMinSize( wx.Size( 180,-1 ) ) + gSizer2.Add( self.m_MMSIText, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) self.m_staticText11 = wx.StaticText( self.m_StationPnl, wx.ID_ANY, u"Call Sign", wx.DefaultPosition, wx.DefaultSize, 0 ) @@ -129,6 +131,8 @@ class MainFrame ( wx.Frame ): gSizer2.Add( self.m_staticText11, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) self.m_CallsignText = wx.TextCtrl( self.m_StationPnl, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_CallsignText.SetMinSize( wx.Size( 120,-1 ) ) + gSizer2.Add( self.m_CallsignText, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) self.m_staticText12 = wx.StaticText( self.m_StationPnl, wx.ID_ANY, u"Name", wx.DefaultPosition, wx.DefaultSize, 0 ) @@ -138,7 +142,7 @@ class MainFrame ( wx.Frame ): self.m_NameText = wx.TextCtrl( self.m_StationPnl, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_NameText.SetMaxLength( 20 ) - self.m_NameText.SetMinSize( wx.Size( 140,-1 ) ) + self.m_NameText.SetMinSize( wx.Size( 180,-1 ) ) gSizer2.Add( self.m_NameText, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) @@ -187,17 +191,17 @@ class MainFrame ( wx.Frame ): self.m_staticText18 = wx.StaticText( self.m_StationPnl, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText18.Wrap( -1 ) - gSizer2.Add( self.m_staticText18, 0, wx.ALL, 5 ) + gSizer2.Add( self.m_staticText18, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) self.m_staticText19 = wx.StaticText( self.m_StationPnl, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText19.Wrap( -1 ) - gSizer2.Add( self.m_staticText19, 0, wx.ALL, 5 ) + gSizer2.Add( self.m_staticText19, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) self.m_staticText20 = wx.StaticText( self.m_StationPnl, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText20.Wrap( -1 ) - gSizer2.Add( self.m_staticText20, 0, wx.ALL, 5 ) + gSizer2.Add( self.m_staticText20, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) self.m_StationSaveBtn = wx.Button( self.m_StationPnl, wx.ID_ANY, u"Save", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_StationSaveBtn.Enable( False ) @@ -217,7 +221,7 @@ class MainFrame ( wx.Frame ): gSizer4 = wx.GridSizer( 1, 2, 0, 0 ) gSizer4.SetMinSize( wx.Size( -1,90 ) ) - self.m_staticText28 = wx.StaticText( self.m_FWUpdatePnl, wx.ID_ANY, u"Binary File:", wx.DefaultPosition, wx.Size( 80,-1 ), 0 ) + self.m_staticText28 = wx.StaticText( self.m_FWUpdatePnl, wx.ID_ANY, u"Binary File:", wx.DefaultPosition, wx.Size( -1,-1 ), 0 ) self.m_staticText28.Wrap( -1 ) gSizer4.Add( self.m_staticText28, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) diff --git a/latest/Apps/maiana-update/mainwindow.py b/latest/Apps/maiana-update/mainwindow.py index 836ecb4..3a5c012 100644 --- a/latest/Apps/maiana-update/mainwindow.py +++ b/latest/Apps/maiana-update/mainwindow.py @@ -33,7 +33,8 @@ class MainWindow(MainFrame): elif status == MaianaStatus.DFU: wx.MessageBox(b'MAIANA is currently in firmware update mode. This is the only task you can perform.', 'DFU warning', wx.OK) - self.enableUI() + #self.enableUI() + self.m_FWUpdatePnl.Enable() self.m_SerialBtn.SetLabel(b'Disconnect') self.m_StationSaveBtn.Disable() else: @@ -165,8 +166,9 @@ class MainWindow(MainFrame): self.m_BowOffsetText.SetValue('{}'.format(self.stationdata['bowoffset'])) t = self.stationdata['type'] - i = MaianaClient.VESSEL_TYPES.index(t) - self.m_VesselTypeChoice.SetSelection(i) + if t in MaianaClient.VESSEL_TYPES: + i = MaianaClient.VESSEL_TYPES.index(t) + self.m_VesselTypeChoice.SetSelection(i) return True def validateStationInputs(self): diff --git a/latest/Firmware/NMEA2000Adapter/.gitignore b/latest/Firmware/NMEA2000Adapter/.gitignore index b5e5a9c..f46ca94 100644 --- a/latest/Firmware/NMEA2000Adapter/.gitignore +++ b/latest/Firmware/NMEA2000Adapter/.gitignore @@ -18,3 +18,4 @@ Debug /Board1.3-L431/ /Board1.3-L422/ /Board2.0-L422/ +/Board6.0-L432/ diff --git a/latest/Firmware/Transponder/Inc/config.h b/latest/Firmware/Transponder/Inc/config.h index 30388da..7bb65fe 100644 --- a/latest/Firmware/Transponder/Inc/config.h +++ b/latest/Firmware/Transponder/Inc/config.h @@ -25,7 +25,7 @@ #include "TXPowerSettings.h" -#define FW_REV "4.0.2" +#define FW_REV "4.1.0" /* diff --git a/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h b/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h index 3e25bbf..d9986cf 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h +++ b/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h @@ -64,7 +64,7 @@ // Descriptions: // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. */ -#define RF_GLOBAL_XO_TUNE_1 0x11, 0x00, 0x01, 0x00, 0x2D +#define RF_GLOBAL_XO_TUNE_1 0x11, 0x00, 0x01, 0x00, 0x41 /* // Set properties: RF_GLOBAL_CONFIG_1 diff --git a/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h b/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h index c4447e3..b00b570 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h +++ b/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h @@ -68,7 +68,7 @@ // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. // GLOBAL_CLK_CFG - Clock configuration options. */ -#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x2D, 0x00 +#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x41, 0x00 /* // Set properties: RF_GLOBAL_CONFIG_1 diff --git a/latest/Firmware/Transponder/Inc/radio_config_si4460.h b/latest/Firmware/Transponder/Inc/radio_config_si4460.h index 6207ac9..1359c22 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_si4460.h +++ b/latest/Firmware/Transponder/Inc/radio_config_si4460.h @@ -62,7 +62,7 @@ // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. // GLOBAL_CLK_CFG - Clock configuration options. */ -#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x2D, 0x00 +#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x41, 0x00 /* // Set properties: RF_GLOBAL_CONFIG_1 diff --git a/latest/Firmware/Transponder/Inc/radio_config_si4467.h b/latest/Firmware/Transponder/Inc/radio_config_si4467.h index fc69f11..4d5a36c 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_si4467.h +++ b/latest/Firmware/Transponder/Inc/radio_config_si4467.h @@ -63,7 +63,7 @@ // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. // GLOBAL_CLK_CFG - Clock configuration options. */ -#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x2D, 0x00 +#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x41, 0x00 /* // Set properties: RF_GLOBAL_CONFIG_1